You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2016/07/05 16:04:39 UTC

svn commit: r1751504 - in /shiro/site: publish/ publish/static/ trunk/ trunk/static/

Author: bdemers
Date: Tue Jul  5 16:04:38 2016
New Revision: 1751504

URL: http://svn.apache.org/viewvc?rev=1751504&view=rev
Log:
site updates for shiro-1.2.6

Modified:
    shiro/site/publish/10-minute-tutorial.html
    shiro/site/publish/documentation.html
    shiro/site/publish/download.html
    shiro/site/publish/news.html
    shiro/site/publish/static/.htaccess
    shiro/site/publish/static/current
    shiro/site/publish/static/latest
    shiro/site/publish/webapp-tutorial.html
    shiro/site/trunk/10-minute-tutorial.html
    shiro/site/trunk/documentation.html
    shiro/site/trunk/download.html
    shiro/site/trunk/news.html
    shiro/site/trunk/static/.htaccess

Modified: shiro/site/publish/10-minute-tutorial.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/10-minute-tutorial.html?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/publish/10-minute-tutorial.html (original)
+++ shiro/site/publish/10-minute-tutorial.html Tue Jul  5 16:04:38 2016
@@ -143,13 +143,13 @@
 <ol>
     <li>Ensure you have JDK 1.6+ and Maven 3.0.3+ installed.</li>
     <li>Download the lastest "Source Code Distribution" from the <a href="download.html" title="Download">Download</a>
-        page. In this example, we're using the 1.2.5 release distribution.
+        page. In this example, we're using the 1.2.6 release distribution.
     </li>
     <li>Unzip the source package:
         <div class="code panel" style="border-width: 1px;">
             <div class="codeContent panelContent">
 <pre class="code-java">
-&gt; unzip shiro-root-1.2.5-source-release.zip
+&gt; unzip shiro-root-1.2.6-source-release.zip
 </pre>
             </div>
         </div>
@@ -158,7 +158,7 @@
         <div class="code panel" style="border-width: 1px;">
             <div class="codeContent panelContent">
 <pre class="code-java">
-&gt; cd shiro-root-1.2.5/samples/quickstart
+&gt; cd shiro-root-1.2.6/samples/quickstart
 </pre>
             </div>
         </div>

Modified: shiro/site/publish/documentation.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/documentation.html?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/publish/documentation.html (original)
+++ shiro/site/publish/documentation.html Tue Jul  5 16:04:38 2016
@@ -106,11 +106,11 @@
 </ul>
 
 <h3><a name="Documentation-CurrentRelease"></a>Current Release</h3>
-<p>Apache Shiro 1.2.5 (<a href="download.html" title="Download">Download</a>)</p>
+<p>Apache Shiro 1.2.6 (<a href="download.html" title="Download">Download</a>)</p>
 <ul>
-    <li><a class="external-link" href="static/1.2.5/apidocs">API</a> (JavaDoc)</li>
-    <li><a class="external-link" href="static/1.2.5/xref/">Browse Source</a> (XREF)</li>
-    <li><a class="external-link" href="static/1.2.5/">Maven Static Site</a></li>
+    <li><a class="external-link" href="static/1.2.6/apidocs">API</a> (JavaDoc)</li>
+    <li><a class="external-link" href="static/1.2.6/xref/">Browse Source</a> (XREF)</li>
+    <li><a class="external-link" href="static/1.2.6/">Maven Static Site</a></li>
 <!--    <li><a class="external-link"
            href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310950&version=12323469&amp;styleName=Html&amp;projectId=12310950">Release
         Notes</a></li> -->

Modified: shiro/site/publish/download.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/download.html?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/publish/download.html (original)
+++ shiro/site/publish/download.html Tue Jul  5 16:04:38 2016
@@ -105,7 +105,7 @@
 </tr>
 </table>
 
-<p>Apache Shiro 1.2.5 is the current stable release (Java 1.6+ JVM).</p>
+<p>Apache Shiro 1.2.6 is the current stable release (Java 1.6+ JVM).</p>
 
 <p>To download Shiro please follow the instructions below.</p>
 
@@ -121,11 +121,11 @@
 <div>
     <ul>
         <li>
-            <a href="#latest">Latest Stable Release (1.2.5)</a>
+            <a href="#latest">Latest Stable Release (1.2.6)</a>
             <ul>
-                <li><a href="#latestBinary">1.2.5 Binary Distribution</a></li>
-                <li><a href="#latestSource">1.2.5 Source Code Distribution</a></li>
-                <li><a href="#latestGit">1.2.5 Git Source repository</a></li>
+                <li><a href="#latestBinary">1.2.6 Binary Distribution</a></li>
+                <li><a href="#latestSource">1.2.6 Source Code Distribution</a></li>
+                <li><a href="#latestGit">1.2.6 Git Source repository</a></li>
             </ul>
         </li>
         <li><a href="#previous">Previous Releases</a>
@@ -142,9 +142,9 @@
 </div>
 
 
-<h2><a name="latest"></a>Latest Stable Release (1.2.5)</h2>
+<h2><a name="latest"></a>Latest Stable Release (1.2.6)</h2>
 
-<h3><a name="latestBinary"></a>1.2.5 Binary Distribution</h3>
+<h3><a name="latestBinary"></a>1.2.6 Binary Distribution</h3>
 
 <p>Associated documentation can be found <a href="documentation.html" title="Documentation">here</a></p>
 
@@ -164,7 +164,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-all/1.2.5/shiro-all-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-all/1.2.6/shiro-all-1.2.6.jar"
                                                                     rel="nofollow">shiro-all</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"><b>Not Recommended</b></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Includes all binary functionality for Shiro (without
@@ -176,7 +176,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-core/1.2.5/shiro-core-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-core/1.2.6/shiro-core-1.2.6.jar"
                                                                     rel="nofollow">shiro-core</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -184,7 +184,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-core&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -198,7 +198,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-web/1.2.5/shiro-web-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-web/1.2.6/shiro-web-1.2.6.jar"
                                                                     rel="nofollow">shiro-web</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -206,7 +206,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-web&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -215,7 +215,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-aspectj/1.2.5/shiro-aspectj-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-aspectj/1.2.6/shiro-aspectj-1.2.6.jar"
                                                                     rel="nofollow">shiro-aspectj</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -223,7 +223,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-aspectj&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -236,7 +236,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-cas/1.2.5/shiro-cas-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-cas/1.2.6/shiro-cas-1.2.6.jar"
                                                                     rel="nofollow">shiro-cas</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -244,7 +244,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-cas&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -256,7 +256,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-ehcache/1.2.5/shiro-ehcache-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-ehcache/1.2.6/shiro-ehcache-1.2.6.jar"
                                                                     rel="nofollow">shiro-ehcache</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -264,7 +264,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-ehcache&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -276,7 +276,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-features/1.2.5/shiro-features-1.2.5-features.xml"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-features/1.2.6/shiro-features-1.2.6-features.xml"
                                                                     rel="nofollow">shiro-features</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -284,7 +284,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-features&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -296,7 +296,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-guice/1.2.5/shiro-guice-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-guice/1.2.6/shiro-guice-1.2.6.jar"
                                                                     rel="nofollow">shiro-guice</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -304,7 +304,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-guice&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -317,7 +317,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-quartz/1.2.5/shiro-quartz-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-quartz/1.2.6/shiro-quartz-1.2.6.jar"
                                                                     rel="nofollow">shiro-quartz</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -325,7 +325,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-quartz&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -338,7 +338,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-spring/1.2.5/shiro-spring-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-spring/1.2.6/shiro-spring-1.2.6.jar"
                                                                     rel="nofollow">shiro-spring</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -346,7 +346,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-spring&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -359,7 +359,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/tools/shiro-tools-hasher/1.2.5/shiro-tools-hasher-1.2.5-cli.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/tools/shiro-tools-hasher/1.2.6/shiro-tools-hasher-1.2.6-cli.jar"
                                                                     rel="nofollow">shiro-tools-hasher-cli</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"><b>Not Relevant</b></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> A command-line program to perform hashing (MD5, SHA,
@@ -369,7 +369,7 @@
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">
-java -jar shiro-tools-hasher-1.2.5-cli.jar
+java -jar shiro-tools-hasher-1.2.6-cli.jar
 </pre>
                         </div>
                     </div>
@@ -700,27 +700,27 @@ customizeMacroTable('TBL1365578679386',
 //-->
 </script>
 
-<h3><a name="latestSource"></a>1.2.5 Source Code Distribution</h3>
+<h3><a name="latestSource"></a>1.2.6 Source Code Distribution</h3>
 
 <p>The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:</p>
 
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip">zip</a>
+<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.6/shiro-root-1.2.6-source-release.zip">zip</a>
     (<a class="external-link"
-        href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip.asc">pgp</a>, <a
+        href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.6/shiro-root-1.2.6-source-release.zip.asc">pgp</a>, <a
             class="external-link"
-            href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip.md5">md5</a>, <a
+            href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.6/shiro-root-1.2.6-source-release.zip.md5">md5</a>, <a
             class="external-link"
-            href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip.sha1">sha1</a>)
+            href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.6/shiro-root-1.2.6-source-release.zip.sha1">sha1</a>)
 </p>
 
-<h3><a name="latestGit"></a>1.2.5 Git Source repository</h3>
+<h3><a name="latestGit"></a>1.2.6 Git Source repository</h3>
 
 <p>The source can be cloned anonymously from Git with this command:</p>
 <div class="code panel" style="border-width: 1px;">
     <div class="codeContent panelContent">
 <pre class="code-java">
 git clone https:<span class="code-comment">//github.com/apache/shiro.git</span>
-git checkout shiro-root-1.2.5 -b shiro-root-1.2.5
+git checkout shiro-root-1.2.6 -b shiro-root-1.2.6
 </pre>
     </div>
 </div>

Modified: shiro/site/publish/news.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/news.html?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/publish/news.html (original)
+++ shiro/site/publish/news.html Tue Jul  5 16:04:38 2016
@@ -104,6 +104,27 @@ The Apache Shiro Team
 
 <div class="blog-post-listing">
     <div class="logo-heading-block">
+        Apache Shiro 1.2.6 released
+    </div>
+
+    <div class="wiki-content">
+        <p>The Shiro team is pleased to announce the release of Apache Shiro version 1.2.6. This is a bug fix release for 1.2.x.</p>
+
+        <p>This release includes <a class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12335836&projectId=12310950">2 bug fixes</a> since the 1.2.5 release and is available for <a href="download.html" title="Download">Download</a> now.</p>
+
+        <p>Release binaries (.jars) are also available through Maven Central and source bundles through Apache distribution mirrors. </p>
+
+        <p>For more information on <a class="external-link" href="http://shiro.apache.org/documentation.html" rel="nofollow">Shiro, please read the documentation.</a></p>
+
+        <p>Enjoy!</p>
+
+        <p>The Apache Shiro Team</p>
+    </div>
+</div>
+
+
+<div class="blog-post-listing">
+    <div class="logo-heading-block">
         Apache Shiro 1.2.5 released
     </div>
 

Modified: shiro/site/publish/static/.htaccess
URL: http://svn.apache.org/viewvc/shiro/site/publish/static/.htaccess?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/publish/static/.htaccess (original)
+++ shiro/site/publish/static/.htaccess Tue Jul  5 16:04:38 2016
@@ -1 +1 @@
-RedirectMatch 1.1.0(.*) 1.2.5/$1
\ No newline at end of file
+RedirectMatch 1.1.0(.*) 1.2.6/$1
\ No newline at end of file

Modified: shiro/site/publish/static/current
URL: http://svn.apache.org/viewvc/shiro/site/publish/static/current?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/publish/static/current (original)
+++ shiro/site/publish/static/current Tue Jul  5 16:04:38 2016
@@ -1 +1 @@
-link 1.2.5
\ No newline at end of file
+link 1.2.6
\ No newline at end of file

Modified: shiro/site/publish/static/latest
URL: http://svn.apache.org/viewvc/shiro/site/publish/static/latest?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/publish/static/latest (original)
+++ shiro/site/publish/static/latest Tue Jul  5 16:04:38 2016
@@ -1 +1 @@
-link 1.2.5
\ No newline at end of file
+link 1.2.6
\ No newline at end of file

Modified: shiro/site/publish/webapp-tutorial.html
URL: http://svn.apache.org/viewvc/shiro/site/publish/webapp-tutorial.html?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/publish/webapp-tutorial.html (original)
+++ shiro/site/publish/webapp-tutorial.html Tue Jul  5 16:04:38 2016
@@ -373,7 +373,7 @@ shiro.loginUrl = /login.jsp
 <pre><code>$ mvn jetty:run
 </code></pre><p>Try visiting <a href="http://localhost:8080">localhost:8080</a>. Once there, click the new <code>/account</code> link and watch it redirect you to force you to log in. Once logged in, return to the home page and see the content change again now that you&rsquo;re authenticated. You can visit the account page and the home page as often as you want, until you log out. Nice!</p><p>Hit <code>ctl-C</code> to shut down the web app.</p><p><a id="step6"></a></p><h2>Step 6: Role-Based Access Control</h2><p>In addition to controlling access based on authentication, it is often a requirement to restrict access to certain parts of the application based on what role(s) are assigned to the current <code>Subject</code>.</p><p>Perform the following git checkout command to load the <code>step5</code> branch:</p>
 <pre><code>$ git checkout step6
-</code></pre><h3>Step 6a: Add Roles</h3><p>In order to perform Role-Based Access Control, we need Roles to exist.</p><p>The fastest way to do that in this tutorial is to populate some Groups within Stormpath (in Stormpath, a Stormpath Group can serve the same purpose of a Role).</p><p>To do this, log in to the UI and navigate as follows:</p><p><strong>Directories &gt; Apache Shiro Tutorial Webapp Directory &gt; Groups</strong></p><p>Add the following three groups:</p>
+</code></pre><h3>Step 6a: Add Roles</h3><p>In order to perform Role-Based Access Control, we need Roles to exist.</p><p>The fastest way to do that in this tutorial is to populate some Groups within Stormpath (in Stormpath, a Stormpath Group can serve the same purpose of a Role).</p><p>To do this, log in to the UI and navigate as follows:</p><p><strong>Directories &gt; My Application Directory &gt; Groups</strong></p><p>Add the following three groups:</p>
 <ul>
   <li>Captains</li>
   <li>Officers</li>

Modified: shiro/site/trunk/10-minute-tutorial.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/10-minute-tutorial.html?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/trunk/10-minute-tutorial.html (original)
+++ shiro/site/trunk/10-minute-tutorial.html Tue Jul  5 16:04:38 2016
@@ -65,13 +65,13 @@
 <ol>
     <li>Ensure you have JDK 1.6+ and Maven 3.0.3+ installed.</li>
     <li>Download the lastest "Source Code Distribution" from the <a href="download.html" title="Download">Download</a>
-        page. In this example, we're using the 1.2.5 release distribution.
+        page. In this example, we're using the 1.2.6 release distribution.
     </li>
     <li>Unzip the source package:
         <div class="code panel" style="border-width: 1px;">
             <div class="codeContent panelContent">
 <pre class="code-java">
-&gt; unzip shiro-root-1.2.5-source-release.zip
+&gt; unzip shiro-root-1.2.6-source-release.zip
 </pre>
             </div>
         </div>
@@ -80,7 +80,7 @@
         <div class="code panel" style="border-width: 1px;">
             <div class="codeContent panelContent">
 <pre class="code-java">
-&gt; cd shiro-root-1.2.5/samples/quickstart
+&gt; cd shiro-root-1.2.6/samples/quickstart
 </pre>
             </div>
         </div>

Modified: shiro/site/trunk/documentation.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/documentation.html?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/trunk/documentation.html (original)
+++ shiro/site/trunk/documentation.html Tue Jul  5 16:04:38 2016
@@ -28,11 +28,11 @@
 </ul>
 
 <h3><a name="Documentation-CurrentRelease"></a>Current Release</h3>
-<p>Apache Shiro 1.2.5 (<a href="download.html" title="Download">Download</a>)</p>
+<p>Apache Shiro 1.2.6 (<a href="download.html" title="Download">Download</a>)</p>
 <ul>
-    <li><a class="external-link" href="static/1.2.5/apidocs">API</a> (JavaDoc)</li>
-    <li><a class="external-link" href="static/1.2.5/xref/">Browse Source</a> (XREF)</li>
-    <li><a class="external-link" href="static/1.2.5/">Maven Static Site</a></li>
+    <li><a class="external-link" href="static/1.2.6/apidocs">API</a> (JavaDoc)</li>
+    <li><a class="external-link" href="static/1.2.6/xref/">Browse Source</a> (XREF)</li>
+    <li><a class="external-link" href="static/1.2.6/">Maven Static Site</a></li>
 <!--    <li><a class="external-link"
            href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310950&version=12323469&amp;styleName=Html&amp;projectId=12310950">Release
         Notes</a></li> -->

Modified: shiro/site/trunk/download.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/download.html?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/trunk/download.html (original)
+++ shiro/site/trunk/download.html Tue Jul  5 16:04:38 2016
@@ -27,7 +27,7 @@
 </tr>
 </table>
 
-<p>Apache Shiro 1.2.5 is the current stable release (Java 1.6+ JVM).</p>
+<p>Apache Shiro 1.2.6 is the current stable release (Java 1.6+ JVM).</p>
 
 <p>To download Shiro please follow the instructions below.</p>
 
@@ -43,11 +43,11 @@
 <div>
     <ul>
         <li>
-            <a href="#latest">Latest Stable Release (1.2.5)</a>
+            <a href="#latest">Latest Stable Release (1.2.6)</a>
             <ul>
-                <li><a href="#latestBinary">1.2.5 Binary Distribution</a></li>
-                <li><a href="#latestSource">1.2.5 Source Code Distribution</a></li>
-                <li><a href="#latestGit">1.2.5 Git Source repository</a></li>
+                <li><a href="#latestBinary">1.2.6 Binary Distribution</a></li>
+                <li><a href="#latestSource">1.2.6 Source Code Distribution</a></li>
+                <li><a href="#latestGit">1.2.6 Git Source repository</a></li>
             </ul>
         </li>
         <li><a href="#previous">Previous Releases</a>
@@ -64,9 +64,9 @@
 </div>
 
 
-<h2><a name="latest"></a>Latest Stable Release (1.2.5)</h2>
+<h2><a name="latest"></a>Latest Stable Release (1.2.6)</h2>
 
-<h3><a name="latestBinary"></a>1.2.5 Binary Distribution</h3>
+<h3><a name="latestBinary"></a>1.2.6 Binary Distribution</h3>
 
 <p>Associated documentation can be found <a href="documentation.html" title="Documentation">here</a></p>
 
@@ -86,7 +86,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-all/1.2.5/shiro-all-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-all/1.2.6/shiro-all-1.2.6.jar"
                                                                     rel="nofollow">shiro-all</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"><b>Not Recommended</b></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> Includes all binary functionality for Shiro (without
@@ -98,7 +98,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-core/1.2.5/shiro-core-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-core/1.2.6/shiro-core-1.2.6.jar"
                                                                     rel="nofollow">shiro-core</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -106,7 +106,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-core&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -120,7 +120,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-web/1.2.5/shiro-web-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-web/1.2.6/shiro-web-1.2.6.jar"
                                                                     rel="nofollow">shiro-web</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -128,7 +128,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-web&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -137,7 +137,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-aspectj/1.2.5/shiro-aspectj-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-aspectj/1.2.6/shiro-aspectj-1.2.6.jar"
                                                                     rel="nofollow">shiro-aspectj</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -145,7 +145,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-aspectj&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -158,7 +158,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-cas/1.2.5/shiro-cas-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-cas/1.2.6/shiro-cas-1.2.6.jar"
                                                                     rel="nofollow">shiro-cas</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -166,7 +166,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-cas&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -178,7 +178,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-ehcache/1.2.5/shiro-ehcache-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-ehcache/1.2.6/shiro-ehcache-1.2.6.jar"
                                                                     rel="nofollow">shiro-ehcache</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -186,7 +186,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-ehcache&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -198,7 +198,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-features/1.2.5/shiro-features-1.2.5-features.xml"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-features/1.2.6/shiro-features-1.2.6-features.xml"
                                                                     rel="nofollow">shiro-features</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -206,7 +206,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-features&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -218,7 +218,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-guice/1.2.5/shiro-guice-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-guice/1.2.6/shiro-guice-1.2.6.jar"
                                                                     rel="nofollow">shiro-guice</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -226,7 +226,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-guice&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -239,7 +239,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-quartz/1.2.5/shiro-quartz-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-quartz/1.2.6/shiro-quartz-1.2.6.jar"
                                                                     rel="nofollow">shiro-quartz</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -247,7 +247,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-quartz&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -260,7 +260,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-spring/1.2.5/shiro-spring-1.2.5.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-spring/1.2.6/shiro-spring-1.2.6.jar"
                                                                     rel="nofollow">shiro-spring</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd">
                     <div class="code panel" style="border-width: 1px;">
@@ -268,7 +268,7 @@
 <pre class="code-java">&lt;dependency&gt;
   &lt;groupId&gt;org.apache.shiro&lt;/groupId&gt;
   &lt;artifactId&gt;shiro-spring&lt;/artifactId&gt;
-  &lt;version&gt;1.2.5&lt;/version&gt;
+  &lt;version&gt;1.2.6&lt;/version&gt;
 &lt;/dependency&gt;</pre>
                         </div>
                     </div>
@@ -281,7 +281,7 @@
             </tr>
             <tr>
                 <td colspan="1" rowspan="1" class="confluenceTd"><a class="external-link"
-                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/tools/shiro-tools-hasher/1.2.5/shiro-tools-hasher-1.2.5-cli.jar"
+                                                                    href="http://repo1.maven.org/maven2/org/apache/shiro/tools/shiro-tools-hasher/1.2.6/shiro-tools-hasher-1.2.6-cli.jar"
                                                                     rel="nofollow">shiro-tools-hasher-cli</a></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"><b>Not Relevant</b></td>
                 <td colspan="1" rowspan="1" class="confluenceTd"> A command-line program to perform hashing (MD5, SHA,
@@ -291,7 +291,7 @@
                     <div class="code panel" style="border-width: 1px;">
                         <div class="codeContent panelContent">
 <pre class="code-java">
-java -jar shiro-tools-hasher-1.2.5-cli.jar
+java -jar shiro-tools-hasher-1.2.6-cli.jar
 </pre>
                         </div>
                     </div>
@@ -622,27 +622,27 @@ customizeMacroTable('TBL1365578679386',
 //-->
 </script>
 
-<h3><a name="latestSource"></a>1.2.5 Source Code Distribution</h3>
+<h3><a name="latestSource"></a>1.2.6 Source Code Distribution</h3>
 
 <p>The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:</p>
 
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip">zip</a>
+<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.6/shiro-root-1.2.6-source-release.zip">zip</a>
     (<a class="external-link"
-        href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip.asc">pgp</a>, <a
+        href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.6/shiro-root-1.2.6-source-release.zip.asc">pgp</a>, <a
             class="external-link"
-            href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip.md5">md5</a>, <a
+            href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.6/shiro-root-1.2.6-source-release.zip.md5">md5</a>, <a
             class="external-link"
-            href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip.sha1">sha1</a>)
+            href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.6/shiro-root-1.2.6-source-release.zip.sha1">sha1</a>)
 </p>
 
-<h3><a name="latestGit"></a>1.2.5 Git Source repository</h3>
+<h3><a name="latestGit"></a>1.2.6 Git Source repository</h3>
 
 <p>The source can be cloned anonymously from Git with this command:</p>
 <div class="code panel" style="border-width: 1px;">
     <div class="codeContent panelContent">
 <pre class="code-java">
 git clone https:<span class="code-comment">//github.com/apache/shiro.git</span>
-git checkout shiro-root-1.2.5 -b shiro-root-1.2.5
+git checkout shiro-root-1.2.6 -b shiro-root-1.2.6
 </pre>
     </div>
 </div>

Modified: shiro/site/trunk/news.html
URL: http://svn.apache.org/viewvc/shiro/site/trunk/news.html?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/trunk/news.html (original)
+++ shiro/site/trunk/news.html Tue Jul  5 16:04:38 2016
@@ -26,6 +26,27 @@ The Apache Shiro Team
 
 <div class="blog-post-listing">
     <div class="logo-heading-block">
+        Apache Shiro 1.2.6 released
+    </div>
+
+    <div class="wiki-content">
+        <p>The Shiro team is pleased to announce the release of Apache Shiro version 1.2.6. This is a bug fix release for 1.2.x.</p>
+
+        <p>This release includes <a class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12335836&projectId=12310950">2 bug fixes</a> since the 1.2.5 release and is available for <a href="download.html" title="Download">Download</a> now.</p>
+
+        <p>Release binaries (.jars) are also available through Maven Central and source bundles through Apache distribution mirrors. </p>
+
+        <p>For more information on <a class="external-link" href="http://shiro.apache.org/documentation.html" rel="nofollow">Shiro, please read the documentation.</a></p>
+
+        <p>Enjoy!</p>
+
+        <p>The Apache Shiro Team</p>
+    </div>
+</div>
+
+
+<div class="blog-post-listing">
+    <div class="logo-heading-block">
         Apache Shiro 1.2.5 released
     </div>
 

Modified: shiro/site/trunk/static/.htaccess
URL: http://svn.apache.org/viewvc/shiro/site/trunk/static/.htaccess?rev=1751504&r1=1751503&r2=1751504&view=diff
==============================================================================
--- shiro/site/trunk/static/.htaccess (original)
+++ shiro/site/trunk/static/.htaccess Tue Jul  5 16:04:38 2016
@@ -1 +1 @@
-RedirectMatch 1.1.0(.*) 1.2.5/$1
\ No newline at end of file
+RedirectMatch 1.1.0(.*) 1.2.6/$1
\ No newline at end of file