Modified: shiro/site/publish/web-features.html URL: http://svn.apache.org/viewvc/shiro/site/publish/web-features.html?rev=1745609&r1=1745608&r2=1745609&view=diff ============================================================================== --- shiro/site/publish/web-features.html (original) +++ shiro/site/publish/web-features.html Thu May 26 14:05:53 2016 @@ -33,6 +33,17 @@ <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" /> + <!--[if lt IE 9]> + <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" /> + <![endif]--> + + <style> + .github-fork-ribbon.right-top:before { + background-color: #3254a0; + } + </style> + <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script> <script type="text/javascript" src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script> <script type="text/javascript"> @@ -45,6 +56,8 @@ </head> <body> + <a class="github-fork-ribbon right-top" href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on GitHub</a> + <div id="top-bar"></div> <div class="wrapper">
Modified: shiro/site/publish/web.html URL: http://svn.apache.org/viewvc/shiro/site/publish/web.html?rev=1745609&r1=1745608&r2=1745609&view=diff ============================================================================== --- shiro/site/publish/web.html (original) +++ shiro/site/publish/web.html Thu May 26 14:05:53 2016 @@ -33,6 +33,17 @@ <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" /> + <!--[if lt IE 9]> + <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" /> + <![endif]--> + + <style> + .github-fork-ribbon.right-top:before { + background-color: #3254a0; + } + </style> + <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script> <script type="text/javascript" src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script> <script type="text/javascript"> @@ -45,6 +56,8 @@ </head> <body> + <a class="github-fork-ribbon right-top" href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on GitHub</a> + <div id="top-bar"></div> <div class="wrapper"> Modified: shiro/site/publish/webapp-tutorial.html URL: http://svn.apache.org/viewvc/shiro/site/publish/webapp-tutorial.html?rev=1745609&r1=1745608&r2=1745609&view=diff ============================================================================== --- shiro/site/publish/webapp-tutorial.html (original) +++ shiro/site/publish/webapp-tutorial.html Thu May 26 14:05:53 2016 @@ -33,6 +33,17 @@ <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" /> + <!--[if lt IE 9]> + <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" /> + <![endif]--> + + <style> + .github-fork-ribbon.right-top:before { + background-color: #3254a0; + } + </style> + <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script> <script type="text/javascript" src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script> <script type="text/javascript"> @@ -45,6 +56,8 @@ </head> <body> + <a class="github-fork-ribbon right-top" href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on GitHub</a> + <div id="top-bar"></div> <div class="wrapper"> Modified: shiro/site/publish/what-is-shiro.html URL: http://svn.apache.org/viewvc/shiro/site/publish/what-is-shiro.html?rev=1745609&r1=1745608&r2=1745609&view=diff ============================================================================== --- shiro/site/publish/what-is-shiro.html (original) +++ shiro/site/publish/what-is-shiro.html Thu May 26 14:05:53 2016 @@ -33,6 +33,17 @@ <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" /> + <!--[if lt IE 9]> + <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" /> + <![endif]--> + + <style> + .github-fork-ribbon.right-top:before { + background-color: #3254a0; + } + </style> + <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script> <script type="text/javascript" src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script> <script type="text/javascript"> @@ -45,6 +56,8 @@ </head> <body> + <a class="github-fork-ribbon right-top" href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on GitHub</a> + <div id="top-bar"></div> <div class="wrapper"> Modified: shiro/site/publish/wiki-todos.html URL: http://svn.apache.org/viewvc/shiro/site/publish/wiki-todos.html?rev=1745609&r1=1745608&r2=1745609&view=diff ============================================================================== --- shiro/site/publish/wiki-todos.html (original) +++ shiro/site/publish/wiki-todos.html Thu May 26 14:05:53 2016 @@ -33,6 +33,17 @@ <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.css" /> + <!--[if lt IE 9]> + <link rel="stylesheet" href="./assets/css/gh-pages/gh-fork-ribbon.ie.css" /> + <![endif]--> + + <style> + .github-fork-ribbon.right-top:before { + background-color: #3254a0; + } + </style> + <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js";></script> <script type="text/javascript" src="./assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script> <script type="text/javascript"> @@ -45,6 +56,8 @@ </head> <body> + <a class="github-fork-ribbon right-top" href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on GitHub</a> + <div id="top-bar"></div> <div class="wrapper"> Modified: shiro/site/trunk/documentation.html URL: http://svn.apache.org/viewvc/shiro/site/trunk/documentation.html?rev=1745609&r1=1745608&r2=1745609&view=diff ============================================================================== --- shiro/site/trunk/documentation.html (original) +++ shiro/site/trunk/documentation.html Thu May 26 14:05:53 2016 @@ -28,11 +28,11 @@ </ul> <h3><a name="Documentation-CurrentRelease"></a>Current Release</h3> -<p>Apache Shiro 1.2.4 (<a href="download.html" title="Download">Download</a>)</p> +<p>Apache Shiro 1.2.5 (<a href="download.html" title="Download">Download</a>)</p> <ul> - <li><a class="external-link" href="static/1.2.4/apidocs">API</a> (JavaDoc)</li> - <li><a class="external-link" href="static/1.2.4/xref/">Browse Source</a> (XREF)</li> - <li><a class="external-link" href="static/1.2.4/">Maven Static Site</a></li> + <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="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310950&version=12323469&styleName=Html&projectId=12310950";>Release Notes</a></li> --> Modified: shiro/site/trunk/download.html URL: http://svn.apache.org/viewvc/shiro/site/trunk/download.html?rev=1745609&r1=1745608&r2=1745609&view=diff ============================================================================== --- shiro/site/trunk/download.html (original) +++ shiro/site/trunk/download.html Thu May 26 14:05:53 2016 @@ -27,7 +27,7 @@ </tr> </table> -<p>Apache Shiro 1.2.4 is the current stable release (Java 1.6+ JVM).</p> +<p>Apache Shiro 1.2.5 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.4)</a> + <a href="#latest">Latest Stable Release (1.2.5)</a> <ul> - <li><a href="#latestBinary">1.2.4. Binary Distribution</a></li> - <li><a href="#latestSource">1.2.4 Source Code Distribution</a></li> - <li><a href="#latestGit">1.2.4 Git Source repository</a></li> + <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> </ul> </li> <li><a href="#previous">Previous Releases</a> @@ -64,9 +64,9 @@ </div> -<h2><a name="latest"></a>Latest Stable Release (1.2.4)</h2> +<h2><a name="latest"></a>Latest Stable Release (1.2.5)</h2> -<h3><a name="latestBinary"></a>1.2.4 Binary Distribution</h3> +<h3><a name="latestBinary"></a>1.2.5 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.4/shiro-all-1.2.4.jar"; + href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-all/1.2.5/shiro-all-1.2.5.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.4/shiro-core-1.2.4.jar"; + href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-core/1.2.5/shiro-core-1.2.5.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"><dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-core</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency></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.4/shiro-web-1.2.4.jar"; + href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-web/1.2.5/shiro-web-1.2.5.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"><dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-web</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency></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.4/shiro-aspectj-1.2.4.jar"; + href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-aspectj/1.2.5/shiro-aspectj-1.2.5.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"><dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-aspectj</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency></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.4/shiro-cas-1.2.4.jar"; + href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-cas/1.2.5/shiro-cas-1.2.5.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"><dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-cas</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency></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.4/shiro-ehcache-1.2.4.jar"; + href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-ehcache/1.2.5/shiro-ehcache-1.2.5.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"><dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-ehcache</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency></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.4/shiro-features-1.2.4-features.xml"; + href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-features/1.2.5/shiro-features-1.2.5-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"><dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-features</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency></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.4/shiro-guice-1.2.4.jar"; + href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-guice/1.2.5/shiro-guice-1.2.5.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"><dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-guice</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency></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.4/shiro-quartz-1.2.4.jar"; + href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-quartz/1.2.5/shiro-quartz-1.2.5.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"><dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-quartz</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency></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.4/shiro-spring-1.2.4.jar"; + href="http://repo1.maven.org/maven2/org/apache/shiro/shiro-spring/1.2.5/shiro-spring-1.2.5.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"><dependency> <groupId>org.apache.shiro</groupId> <artifactId>shiro-spring</artifactId> - <version>1.2.4</version> + <version>1.2.5</version> </dependency></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.4/shiro-tools-hasher-1.2.4-cli.jar"; + href="http://repo1.maven.org/maven2/org/apache/shiro/tools/shiro-tools-hasher/1.2.5/shiro-tools-hasher-1.2.5-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.4-cli.jar +java -jar shiro-tools-hasher-1.2.5-cli.jar </pre> </div> </div> @@ -622,27 +622,27 @@ customizeMacroTable('TBL1365578679386', //--> </script> -<h3><a name="latestSource"></a>1.2.4 Source Code Distribution</h3> +<h3><a name="latestSource"></a>1.2.5 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.4/shiro-root-1.2.4-source-release.zip";>zip</a> +<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> (<a class="external-link" - href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.4/shiro-root-1.2.4-source-release.zip.asc";>pgp</a>, <a + href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip.asc";>pgp</a>, <a class="external-link" - href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.4/shiro-root-1.2.4-source-release.zip.md5";>md5</a>, <a + href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip.md5";>md5</a>, <a class="external-link" - href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.4/shiro-root-1.2.4-source-release.zip.sha1";>sha1</a>) + href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.5/shiro-root-1.2.5-source-release.zip.sha1";>sha1</a>) </p> -<h3><a name="latestGit"></a>1.2.4 Git Source repository</h3> +<h3><a name="latestGit"></a>1.2.5 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.4 -b shiro-root-1.2.4 +git checkout shiro-root-1.2.5 -b shiro-root-1.2.5 </pre> </div> </div> Modified: shiro/site/trunk/news.html URL: http://svn.apache.org/viewvc/shiro/site/trunk/news.html?rev=1745609&r1=1745608&r2=1745609&view=diff ============================================================================== --- shiro/site/trunk/news.html (original) +++ shiro/site/trunk/news.html Thu May 26 14:05:53 2016 @@ -26,6 +26,26 @@ The Apache Shiro Team <div class="blog-post-listing"> <div class="logo-heading-block"> + Apache Shiro 1.2.5 released + </div> + + <div class="wiki-content"> + <p>The Shiro team is pleased to announce the release of Apache Shiro version 1.2.5. 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?projectId=12310950&version=12332994";>7 bug fixes</a> since the 1.2.4 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.4 released </div> Modified: shiro/site/trunk/static/.htaccess URL: http://svn.apache.org/viewvc/shiro/site/trunk/static/.htaccess?rev=1745609&r1=1745608&r2=1745609&view=diff ============================================================================== --- shiro/site/trunk/static/.htaccess (original) +++ shiro/site/trunk/static/.htaccess Thu May 26 14:05:53 2016 @@ -1 +1 @@ -RedirectMatch 1.1.0(.*) 1.2.4/$1 \ No newline at end of file +RedirectMatch 1.1.0(.*) 1.2.5/$1 \ No newline at end of file
