Modified: shiro/site/publish/news.html URL: http://svn.apache.org/viewvc/shiro/site/publish/news.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/news.html (original) +++ shiro/site/publish/news.html Tue Oct 25 16:48:27 2016 @@ -35,6 +35,7 @@ <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="description" content="Apache Shiro is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management."> <meta name="google-site-verification" content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw"> @@ -50,29 +51,44 @@ <link rel="icon" type="image/vnd.microsoft.icon" href="./assets/images/favicon.ico"> <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";> - <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css"> - <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> + <!-- site styles and --> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <script type="text/javascript" src="./assets/js/shiro-site.js"></script> + <!-- github ribbon --> <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]--> + <script src="https://code.jquery.com/jquery-3.1.1.min.js"; integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> + + <!-- bootstrap --> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap-theme.min.css"> + <script src="./assets/bootstrap/js/bootstrap.min.js"></script> + + + <!-- Google Analytics --> + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-XXXXX-Y', 'auto'); + ga('send', 'pageview'); + </script> + <!-- End Google Analytics --> + + + <!-- syntax highlighting --> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css"; integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" crossorigin="anonymous" /> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js"; integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" crossorigin="anonymous"></script> - - <script type="text/javascript" src="./assets/js/shiro-site.js"></script> - <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>hljs.initHighlightingOnLoad();</script> + <script type="text/javascript"> - // initialize plugins - jQuery(function() { - //Google Analytics - jQuery.trackPage('UA-11551827-1'); - }); $( document ).ready(function() { addPageEditLink(); @@ -81,27 +97,97 @@ </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"> + <div class="container" style="max-width: 1200px;"> + + <a class="github-fork-ribbon right-top" href="https://github.com/apache/shiro"; title="Fork me on GitHub">Fork me on GitHub</a> + + + + <div class="masthead"> + <p class="lead"> + <a href="./index.html"> + <img src="./assets/images/apache-shiro-logo.png" style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"> + </a> + <span class="tagline">Simple. Java. Security.</span> + </p> + </div> + + - <div id="header"> - <a href="./index.html"><div id="logo"></div></a> - <ul class="navigation"> + <nav class="navbar navbar-default" role="navigation"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" + data-target="#navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav"> <li><a href="./get-started.html">Get Started</a></li> <li><a href="./documentation.html">Docs</a></li> <li><a href="./web-features.html">Web Apps</a></li> - <li><a href="./integration.html">Integrations</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Integrations <b class="caret"></b> + </a> + + <ul class="dropdown-menu"> + <li><a href="./spring.html">Spring</a></li> + <li><a href="./guice.html">Guice</a></li> + <li class="divider"></li> + <li><a href="./integration.html">Third-Party Integrations</a></li> + </ul> + </li> + <li><a href="./features.html">Features</a></li> - <li><a href="./community.html">Community</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Community <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="./forums.html">Community Forums</a></li> + <li><a href="./mailing-lists.html">Mailing Lists</a></li> + <li><a href="./articles.html">Articles</a></li> + <li><a href="./news.html">News</a></li> + <li><a href="./events.html">Events</a></li> + <li class="divider"></li> + <li><a href="./community.html">More</a></li> + </ul> + </li> + + </ul> + + <ul class="nav navbar-nav navbar-right"> + <li class="dropdown"> + <a href="http://www.apache.org/"; class="dropdown-toggle" data-toggle="dropdown"> + Apache Software Foundation <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/";>Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/";>License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li> + <li><a href="http://www.apache.org/security/";>Security</a></li> + </ul> + </li> </ul> </div> + <!-- /.navbar-collapse --> + </nav> - <div id="content"> - + <h1><a name="News-ApacheShiroNews"></a>Apache Shiro News</h1> <p>Stay up to date with the latest news on the Apache Shiro Security Framework</p> @@ -517,27 +603,23 @@ The Apache Shiro Team <input type="hidden" id="ghEditPage" value="news.html"></input> - - </div> - - </div><!--END WRAPPER--> + +</div> - <div id="footer"> + <div class="footer-padding"></div> + <footer class="custom-footer"> <div class="wrapper"> <a href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> | <a href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a> <p>Copyright © 2008-2016 The Apache Software Foundation</p> - - <div class="editThisPage"> - </div> - + <div class="editThisPage"></div> <div class="footer-shield"></div> </div> <!--END FOOTER WRAPPER--> - </div> <!--END FOOTER--> + </footer> <!--END FOOTER--> </body> </html>
Modified: shiro/site/publish/overview.html URL: http://svn.apache.org/viewvc/shiro/site/publish/overview.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/overview.html (original) +++ shiro/site/publish/overview.html Tue Oct 25 16:48:27 2016 @@ -35,6 +35,7 @@ <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="description" content="Apache Shiro is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management."> <meta name="google-site-verification" content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw"> @@ -50,29 +51,44 @@ <link rel="icon" type="image/vnd.microsoft.icon" href="./assets/images/favicon.ico"> <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";> - <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css"> - <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> + <!-- site styles and --> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <script type="text/javascript" src="./assets/js/shiro-site.js"></script> + <!-- github ribbon --> <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]--> + <script src="https://code.jquery.com/jquery-3.1.1.min.js"; integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> + + <!-- bootstrap --> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap-theme.min.css"> + <script src="./assets/bootstrap/js/bootstrap.min.js"></script> + + + <!-- Google Analytics --> + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-XXXXX-Y', 'auto'); + ga('send', 'pageview'); + </script> + <!-- End Google Analytics --> + + + <!-- syntax highlighting --> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css"; integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" crossorigin="anonymous" /> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js"; integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" crossorigin="anonymous"></script> - - <script type="text/javascript" src="./assets/js/shiro-site.js"></script> - <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>hljs.initHighlightingOnLoad();</script> + <script type="text/javascript"> - // initialize plugins - jQuery(function() { - //Google Analytics - jQuery.trackPage('UA-11551827-1'); - }); $( document ).ready(function() { addPageEditLink(); @@ -81,27 +97,97 @@ </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"> + <div class="container" style="max-width: 1200px;"> + + <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="header"> - <a href="./index.html"><div id="logo"></div></a> - <ul class="navigation"> + <div class="masthead"> + <p class="lead"> + <a href="./index.html"> + <img src="./assets/images/apache-shiro-logo.png" style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"> + </a> + <span class="tagline">Simple. Java. Security.</span> + </p> + </div> + + + + <nav class="navbar navbar-default" role="navigation"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" + data-target="#navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav"> <li><a href="./get-started.html">Get Started</a></li> <li><a href="./documentation.html">Docs</a></li> <li><a href="./web-features.html">Web Apps</a></li> - <li><a href="./integration.html">Integrations</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Integrations <b class="caret"></b> + </a> + + <ul class="dropdown-menu"> + <li><a href="./spring.html">Spring</a></li> + <li><a href="./guice.html">Guice</a></li> + <li class="divider"></li> + <li><a href="./integration.html">Third-Party Integrations</a></li> + </ul> + </li> + <li><a href="./features.html">Features</a></li> - <li><a href="./community.html">Community</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Community <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="./forums.html">Community Forums</a></li> + <li><a href="./mailing-lists.html">Mailing Lists</a></li> + <li><a href="./articles.html">Articles</a></li> + <li><a href="./news.html">News</a></li> + <li><a href="./events.html">Events</a></li> + <li class="divider"></li> + <li><a href="./community.html">More</a></li> + </ul> + </li> + + </ul> + + <ul class="nav navbar-nav navbar-right"> + <li class="dropdown"> + <a href="http://www.apache.org/"; class="dropdown-toggle" data-toggle="dropdown"> + Apache Software Foundation <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/";>Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/";>License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li> + <li><a href="http://www.apache.org/security/";>Security</a></li> + </ul> + </li> </ul> </div> + <!-- /.navbar-collapse --> + </nav> - <div id="content"> - <a name="Overview-OverviewofApacheShiro"></a> + <a name="Overview-OverviewofApacheShiro"></a> <h1><a href="#overview-of-apache-shiro" name="overview-of-apache-shiro">Overview of Apache Shiro</a></h1> <a name="Overview-Introduction"></a> <h2><a href="#introduction" name="introduction">Introduction</a></h2> @@ -183,27 +269,23 @@ Subject currentUser = SecurityUtils.getS <p>In this sense a Realm is essentially a security-specific <a href="https://en.wikipedia.org/wiki/Data_access_object";>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> <p>Like other internal components, the Shiro <code>SecurityManager</code> manages how Realms are used to acquire security data and then represented as <code>Subject</code> instances.<br/><input type="hidden" id="ghEditPage" value="overview.md"></input></p> - - </div> + +</div> - </div><!--END WRAPPER--> - - <div id="footer"> + <div class="footer-padding"></div> + <footer class="custom-footer"> <div class="wrapper"> <a href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> | <a href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a> <p>Copyright © 2008-2016 The Apache Software Foundation</p> - - <div class="editThisPage"> - </div> - + <div class="editThisPage"></div> <div class="footer-shield"></div> </div> <!--END FOOTER WRAPPER--> - </div> <!--END FOOTER--> + </footer> <!--END FOOTER--> </body> </html> Modified: shiro/site/publish/performing-a-release.html URL: http://svn.apache.org/viewvc/shiro/site/publish/performing-a-release.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/performing-a-release.html (original) +++ shiro/site/publish/performing-a-release.html Tue Oct 25 16:48:27 2016 @@ -35,6 +35,7 @@ <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="description" content="Apache Shiro is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management."> <meta name="google-site-verification" content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw"> @@ -50,29 +51,44 @@ <link rel="icon" type="image/vnd.microsoft.icon" href="./assets/images/favicon.ico"> <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";> - <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css"> - <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> + <!-- site styles and --> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <script type="text/javascript" src="./assets/js/shiro-site.js"></script> + <!-- github ribbon --> <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]--> + <script src="https://code.jquery.com/jquery-3.1.1.min.js"; integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> + + <!-- bootstrap --> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap-theme.min.css"> + <script src="./assets/bootstrap/js/bootstrap.min.js"></script> + + + <!-- Google Analytics --> + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-XXXXX-Y', 'auto'); + ga('send', 'pageview'); + </script> + <!-- End Google Analytics --> + + + <!-- syntax highlighting --> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css"; integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" crossorigin="anonymous" /> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js"; integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" crossorigin="anonymous"></script> - - <script type="text/javascript" src="./assets/js/shiro-site.js"></script> - <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>hljs.initHighlightingOnLoad();</script> + <script type="text/javascript"> - // initialize plugins - jQuery(function() { - //Google Analytics - jQuery.trackPage('UA-11551827-1'); - }); $( document ).ready(function() { addPageEditLink(); @@ -81,48 +97,102 @@ </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"> + <div class="container" style="max-width: 1200px;"> + + <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="header"> - <a href="./index.html"><div id="logo"></div></a> - <ul class="navigation"> + <div class="masthead"> + <p class="lead"> + <a href="./index.html"> + <img src="./assets/images/apache-shiro-logo.png" style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"> + </a> + <span class="tagline">Simple. Java. Security.</span> + </p> + </div> + + + + <nav class="navbar navbar-default" role="navigation"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" + data-target="#navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav"> <li><a href="./get-started.html">Get Started</a></li> <li><a href="./documentation.html">Docs</a></li> <li><a href="./web-features.html">Web Apps</a></li> - <li><a href="./integration.html">Integrations</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Integrations <b class="caret"></b> + </a> + + <ul class="dropdown-menu"> + <li><a href="./spring.html">Spring</a></li> + <li><a href="./guice.html">Guice</a></li> + <li class="divider"></li> + <li><a href="./integration.html">Third-Party Integrations</a></li> + </ul> + </li> + <li><a href="./features.html">Features</a></li> - <li><a href="./community.html">Community</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Community <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="./forums.html">Community Forums</a></li> + <li><a href="./mailing-lists.html">Mailing Lists</a></li> + <li><a href="./articles.html">Articles</a></li> + <li><a href="./news.html">News</a></li> + <li><a href="./events.html">Events</a></li> + <li class="divider"></li> + <li><a href="./community.html">More</a></li> + </ul> + </li> + + </ul> + + <ul class="nav navbar-nav navbar-right"> + <li class="dropdown"> + <a href="http://www.apache.org/"; class="dropdown-toggle" data-toggle="dropdown"> + Apache Software Foundation <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/";>Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/";>License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li> + <li><a href="http://www.apache.org/security/";>Security</a></li> + </ul> + </li> </ul> </div> + <!-- /.navbar-collapse --> + </nav> - <div id="content"> - <p>This page has been moved. You are being redirected.</p> + <p>This page has been moved. You are being redirected.</p> -<div class="panelMacro"> - <table class="noteMacro"> - <colgroup span="1"> - <col span="1" width="24"> - <col span="1"> - </colgroup> - <tbody> - <tr> - <td colspan="1" rowspan="1" valign="top"> - <i class="fa fa-warning"></i> - </td> - - <td colspan="1" rowspan="1"> - <b>Redirection Notice</b> - <br clear="none"> - This page should redirect to <a href="https://cwiki.apache.org/confluence/display/SHIRO/Performing+a+Release"; title="https://cwiki.apache.org/confluence/display/SHIRO/Performing+a+Release";>https://cwiki.apache.org/confluence/display/SHIRO/Performing+a+Release</a>. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-warning"> + <span class="glyphicon glyphicon-warning-sign"></span> <strong>Redirection Notice</strong> + <hr class="message-inner-separator"> + <p>This page should redirect to <a href="https://cwiki.apache.org/confluence/display/SHIRO/Performing+a+Release"; title="https://cwiki.apache.org/confluence/display/SHIRO/Performing+a+Release";>https://cwiki.apache.org/confluence/display/SHIRO/Performing+a+Release</a>.</p> </div> <script type="text/javascript"> @@ -132,27 +202,23 @@ </script> <input type="hidden" id="ghEditPage" value="performing-a-release.html.vtl"></input> - - </div> - - </div><!--END WRAPPER--> + +</div> - <div id="footer"> + <div class="footer-padding"></div> + <footer class="custom-footer"> <div class="wrapper"> <a href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> | <a href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a> <p>Copyright © 2008-2016 The Apache Software Foundation</p> - - <div class="editThisPage"> - </div> - + <div class="editThisPage"></div> <div class="footer-shield"></div> </div> <!--END FOOTER WRAPPER--> - </div> <!--END FOOTER--> + </footer> <!--END FOOTER--> </body> </html> Modified: shiro/site/publish/permissions.html URL: http://svn.apache.org/viewvc/shiro/site/publish/permissions.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/permissions.html (original) +++ shiro/site/publish/permissions.html Tue Oct 25 16:48:27 2016 @@ -35,6 +35,7 @@ <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="description" content="Apache Shiro is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management."> <meta name="google-site-verification" content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw"> @@ -50,29 +51,44 @@ <link rel="icon" type="image/vnd.microsoft.icon" href="./assets/images/favicon.ico"> <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";> - <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css"> - <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> + <!-- site styles and --> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <script type="text/javascript" src="./assets/js/shiro-site.js"></script> + <!-- github ribbon --> <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]--> + <script src="https://code.jquery.com/jquery-3.1.1.min.js"; integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> + + <!-- bootstrap --> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap-theme.min.css"> + <script src="./assets/bootstrap/js/bootstrap.min.js"></script> + + + <!-- Google Analytics --> + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-XXXXX-Y', 'auto'); + ga('send', 'pageview'); + </script> + <!-- End Google Analytics --> + + + <!-- syntax highlighting --> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css"; integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" crossorigin="anonymous" /> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js"; integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" crossorigin="anonymous"></script> - - <script type="text/javascript" src="./assets/js/shiro-site.js"></script> - <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>hljs.initHighlightingOnLoad();</script> + <script type="text/javascript"> - // initialize plugins - jQuery(function() { - //Google Analytics - jQuery.trackPage('UA-11551827-1'); - }); $( document ).ready(function() { addPageEditLink(); @@ -81,27 +97,97 @@ </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"> + <div class="container" style="max-width: 1200px;"> + + <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="header"> - <a href="./index.html"><div id="logo"></div></a> - <ul class="navigation"> + <div class="masthead"> + <p class="lead"> + <a href="./index.html"> + <img src="./assets/images/apache-shiro-logo.png" style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"> + </a> + <span class="tagline">Simple. Java. Security.</span> + </p> + </div> + + + + <nav class="navbar navbar-default" role="navigation"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" + data-target="#navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav"> <li><a href="./get-started.html">Get Started</a></li> <li><a href="./documentation.html">Docs</a></li> <li><a href="./web-features.html">Web Apps</a></li> - <li><a href="./integration.html">Integrations</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Integrations <b class="caret"></b> + </a> + + <ul class="dropdown-menu"> + <li><a href="./spring.html">Spring</a></li> + <li><a href="./guice.html">Guice</a></li> + <li class="divider"></li> + <li><a href="./integration.html">Third-Party Integrations</a></li> + </ul> + </li> + <li><a href="./features.html">Features</a></li> - <li><a href="./community.html">Community</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Community <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="./forums.html">Community Forums</a></li> + <li><a href="./mailing-lists.html">Mailing Lists</a></li> + <li><a href="./articles.html">Articles</a></li> + <li><a href="./news.html">News</a></li> + <li><a href="./events.html">Events</a></li> + <li class="divider"></li> + <li><a href="./community.html">More</a></li> + </ul> + </li> + + </ul> + + <ul class="nav navbar-nav navbar-right"> + <li class="dropdown"> + <a href="http://www.apache.org/"; class="dropdown-toggle" data-toggle="dropdown"> + Apache Software Foundation <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/";>Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/";>License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li> + <li><a href="http://www.apache.org/security/";>Security</a></li> + </ul> + </li> </ul> </div> + <!-- /.navbar-collapse --> + </nav> - <div id="content"> - + <!-- spacer allows enough room to display the header --> <div id="spacer" style="width: 0; height: 60px; float: left"></div> @@ -274,27 +360,23 @@ printer:print:epsoncolor <h2><a href="#lend-a-hand-with-documentation" name="lend-a-hand-with-documentation">Lend a hand with documentation</a></h2> <p>While we hope this documentation helps you with the work you’re doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you’d like to help the Shiro project, please consider corrected, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.</p> <p>The easiest way to contribute your documentation is to send it to the <a href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p> -<input type="hidden" id="ghEditPage" value="permissions.md"></input> - </div> +<input type="hidden" id="ghEditPage" value="permissions.md"></input> +</div> - </div><!--END WRAPPER--> - - <div id="footer"> + <div class="footer-padding"></div> + <footer class="custom-footer"> <div class="wrapper"> <a href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> | <a href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a> <p>Copyright © 2008-2016 The Apache Software Foundation</p> - - <div class="editThisPage"> - </div> - + <div class="editThisPage"></div> <div class="footer-shield"></div> </div> <!--END FOOTER WRAPPER--> - </div> <!--END FOOTER--> + </footer> <!--END FOOTER--> </body> </html> Modified: shiro/site/publish/powered-by-shiro.html URL: http://svn.apache.org/viewvc/shiro/site/publish/powered-by-shiro.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/powered-by-shiro.html (original) +++ shiro/site/publish/powered-by-shiro.html Tue Oct 25 16:48:27 2016 @@ -35,6 +35,7 @@ <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="description" content="Apache Shiro is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management."> <meta name="google-site-verification" content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw"> @@ -50,29 +51,44 @@ <link rel="icon" type="image/vnd.microsoft.icon" href="./assets/images/favicon.ico"> <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";> - <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css"> - <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> + <!-- site styles and --> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <script type="text/javascript" src="./assets/js/shiro-site.js"></script> + <!-- github ribbon --> <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]--> + <script src="https://code.jquery.com/jquery-3.1.1.min.js"; integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> + + <!-- bootstrap --> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap-theme.min.css"> + <script src="./assets/bootstrap/js/bootstrap.min.js"></script> + + + <!-- Google Analytics --> + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-XXXXX-Y', 'auto'); + ga('send', 'pageview'); + </script> + <!-- End Google Analytics --> + + + <!-- syntax highlighting --> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css"; integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" crossorigin="anonymous" /> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js"; integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" crossorigin="anonymous"></script> - - <script type="text/javascript" src="./assets/js/shiro-site.js"></script> - <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>hljs.initHighlightingOnLoad();</script> + <script type="text/javascript"> - // initialize plugins - jQuery(function() { - //Google Analytics - jQuery.trackPage('UA-11551827-1'); - }); $( document ).ready(function() { addPageEditLink(); @@ -81,27 +97,97 @@ </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"> + <div class="container" style="max-width: 1200px;"> + + <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="header"> - <a href="./index.html"><div id="logo"></div></a> - <ul class="navigation"> + <div class="masthead"> + <p class="lead"> + <a href="./index.html"> + <img src="./assets/images/apache-shiro-logo.png" style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"> + </a> + <span class="tagline">Simple. Java. Security.</span> + </p> + </div> + + + + <nav class="navbar navbar-default" role="navigation"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" + data-target="#navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav"> <li><a href="./get-started.html">Get Started</a></li> <li><a href="./documentation.html">Docs</a></li> <li><a href="./web-features.html">Web Apps</a></li> - <li><a href="./integration.html">Integrations</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Integrations <b class="caret"></b> + </a> + + <ul class="dropdown-menu"> + <li><a href="./spring.html">Spring</a></li> + <li><a href="./guice.html">Guice</a></li> + <li class="divider"></li> + <li><a href="./integration.html">Third-Party Integrations</a></li> + </ul> + </li> + <li><a href="./features.html">Features</a></li> - <li><a href="./community.html">Community</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Community <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="./forums.html">Community Forums</a></li> + <li><a href="./mailing-lists.html">Mailing Lists</a></li> + <li><a href="./articles.html">Articles</a></li> + <li><a href="./news.html">News</a></li> + <li><a href="./events.html">Events</a></li> + <li class="divider"></li> + <li><a href="./community.html">More</a></li> + </ul> + </li> + + </ul> + + <ul class="nav navbar-nav navbar-right"> + <li class="dropdown"> + <a href="http://www.apache.org/"; class="dropdown-toggle" data-toggle="dropdown"> + Apache Software Foundation <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/";>Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/";>License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li> + <li><a href="http://www.apache.org/security/";>Security</a></li> + </ul> + </li> </ul> </div> + <!-- /.navbar-collapse --> + </nav> - <div id="content"> - <a name="PoweredbyShiro-OrganizationsusingApacheShiro"></a> + <a name="PoweredbyShiro-OrganizationsusingApacheShiro"></a> <h1><a href="#organizations-using-apache-shiro" name="organizations-using-apache-shiro">Organizations using Apache Shiro</a></h1> <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> <a name="PoweredbyShiro-Stormpath"></a> @@ -129,27 +215,23 @@ <p><a class="external-link" href="http://www.apache.org";>Your Company Name</a> - Your company description</p> <ul><li>Any details you can share</li><li>...</li></ul> <input type="hidden" id="ghEditPage" value="powered-by-shiro.md"></input> - - </div> + +</div> - </div><!--END WRAPPER--> - - <div id="footer"> + <div class="footer-padding"></div> + <footer class="custom-footer"> <div class="wrapper"> <a href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> | <a href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a> <p>Copyright © 2008-2016 The Apache Software Foundation</p> - - <div class="editThisPage"> - </div> - + <div class="editThisPage"></div> <div class="footer-shield"></div> </div> <!--END FOOTER WRAPPER--> - </div> <!--END FOOTER--> + </footer> <!--END FOOTER--> </body> </html> Modified: shiro/site/publish/privacy-policy.html URL: http://svn.apache.org/viewvc/shiro/site/publish/privacy-policy.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/privacy-policy.html (original) +++ shiro/site/publish/privacy-policy.html Tue Oct 25 16:48:27 2016 @@ -35,6 +35,7 @@ <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="description" content="Apache Shiro is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management."> <meta name="google-site-verification" content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw"> @@ -50,29 +51,44 @@ <link rel="icon" type="image/vnd.microsoft.icon" href="./assets/images/favicon.ico"> <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";> - <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css"> - <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> + <!-- site styles and --> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <script type="text/javascript" src="./assets/js/shiro-site.js"></script> + <!-- github ribbon --> <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]--> + <script src="https://code.jquery.com/jquery-3.1.1.min.js"; integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> + + <!-- bootstrap --> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap-theme.min.css"> + <script src="./assets/bootstrap/js/bootstrap.min.js"></script> + + + <!-- Google Analytics --> + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-XXXXX-Y', 'auto'); + ga('send', 'pageview'); + </script> + <!-- End Google Analytics --> + + + <!-- syntax highlighting --> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css"; integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" crossorigin="anonymous" /> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js"; integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" crossorigin="anonymous"></script> - - <script type="text/javascript" src="./assets/js/shiro-site.js"></script> - <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>hljs.initHighlightingOnLoad();</script> + <script type="text/javascript"> - // initialize plugins - jQuery(function() { - //Google Analytics - jQuery.trackPage('UA-11551827-1'); - }); $( document ).ready(function() { addPageEditLink(); @@ -81,27 +97,97 @@ </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"> + <div class="container" style="max-width: 1200px;"> + + <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="header"> - <a href="./index.html"><div id="logo"></div></a> - <ul class="navigation"> + <div class="masthead"> + <p class="lead"> + <a href="./index.html"> + <img src="./assets/images/apache-shiro-logo.png" style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"> + </a> + <span class="tagline">Simple. Java. Security.</span> + </p> + </div> + + + + <nav class="navbar navbar-default" role="navigation"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" + data-target="#navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav"> <li><a href="./get-started.html">Get Started</a></li> <li><a href="./documentation.html">Docs</a></li> <li><a href="./web-features.html">Web Apps</a></li> - <li><a href="./integration.html">Integrations</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Integrations <b class="caret"></b> + </a> + + <ul class="dropdown-menu"> + <li><a href="./spring.html">Spring</a></li> + <li><a href="./guice.html">Guice</a></li> + <li class="divider"></li> + <li><a href="./integration.html">Third-Party Integrations</a></li> + </ul> + </li> + <li><a href="./features.html">Features</a></li> - <li><a href="./community.html">Community</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Community <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="./forums.html">Community Forums</a></li> + <li><a href="./mailing-lists.html">Mailing Lists</a></li> + <li><a href="./articles.html">Articles</a></li> + <li><a href="./news.html">News</a></li> + <li><a href="./events.html">Events</a></li> + <li class="divider"></li> + <li><a href="./community.html">More</a></li> + </ul> + </li> + + </ul> + + <ul class="nav navbar-nav navbar-right"> + <li class="dropdown"> + <a href="http://www.apache.org/"; class="dropdown-toggle" data-toggle="dropdown"> + Apache Software Foundation <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/";>Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/";>License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li> + <li><a href="http://www.apache.org/security/";>Security</a></li> + </ul> + </li> </ul> </div> + <!-- /.navbar-collapse --> + </nav> - <div id="content"> - <a name="PrivacyPolicy-ApacheShiroPrivacyPolicy"></a> + <a name="PrivacyPolicy-ApacheShiroPrivacyPolicy"></a> <h1><a href="#apache-shiro-privacy-policy" name="apache-shiro-privacy-policy">Apache Shiro Privacy Policy</a></h1> <p>Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:</p> <ul> @@ -114,27 +200,23 @@ <p>Part of this information is gathered using a tracking cookie set by the Google Analytics service and handled by Google as described in their privacy policy. See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.</p> <p>We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.</p> <p>By using this website, you consent to the collection of this data in the manner and for the purpose described above.<br/><input type="hidden" id="ghEditPage" value="privacy-policy.md"></input></p> - - </div> + +</div> - </div><!--END WRAPPER--> - - <div id="footer"> + <div class="footer-padding"></div> + <footer class="custom-footer"> <div class="wrapper"> <a href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> | <a href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a> <p>Copyright © 2008-2016 The Apache Software Foundation</p> - - <div class="editThisPage"> - </div> - + <div class="editThisPage"></div> <div class="footer-shield"></div> </div> <!--END FOOTER WRAPPER--> - </div> <!--END FOOTER--> + </footer> <!--END FOOTER--> </body> </html> Modified: shiro/site/publish/quickstart.html URL: http://svn.apache.org/viewvc/shiro/site/publish/quickstart.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/quickstart.html (original) +++ shiro/site/publish/quickstart.html Tue Oct 25 16:48:27 2016 @@ -35,6 +35,7 @@ <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="description" content="Apache Shiro is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management."> <meta name="google-site-verification" content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw"> @@ -50,29 +51,44 @@ <link rel="icon" type="image/vnd.microsoft.icon" href="./assets/images/favicon.ico"> <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";> - <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css"> - <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> + <!-- site styles and --> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <script type="text/javascript" src="./assets/js/shiro-site.js"></script> + <!-- github ribbon --> <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]--> + <script src="https://code.jquery.com/jquery-3.1.1.min.js"; integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> + + <!-- bootstrap --> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap-theme.min.css"> + <script src="./assets/bootstrap/js/bootstrap.min.js"></script> + + + <!-- Google Analytics --> + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-XXXXX-Y', 'auto'); + ga('send', 'pageview'); + </script> + <!-- End Google Analytics --> + + + <!-- syntax highlighting --> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css"; integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" crossorigin="anonymous" /> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js"; integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" crossorigin="anonymous"></script> - - <script type="text/javascript" src="./assets/js/shiro-site.js"></script> - <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>hljs.initHighlightingOnLoad();</script> + <script type="text/javascript"> - // initialize plugins - jQuery(function() { - //Google Analytics - jQuery.trackPage('UA-11551827-1'); - }); $( document ).ready(function() { addPageEditLink(); @@ -81,48 +97,102 @@ </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"> + <div class="container" style="max-width: 1200px;"> + + <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="header"> - <a href="./index.html"><div id="logo"></div></a> - <ul class="navigation"> + <div class="masthead"> + <p class="lead"> + <a href="./index.html"> + <img src="./assets/images/apache-shiro-logo.png" style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"> + </a> + <span class="tagline">Simple. Java. Security.</span> + </p> + </div> + + + + <nav class="navbar navbar-default" role="navigation"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" + data-target="#navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav"> <li><a href="./get-started.html">Get Started</a></li> <li><a href="./documentation.html">Docs</a></li> <li><a href="./web-features.html">Web Apps</a></li> - <li><a href="./integration.html">Integrations</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Integrations <b class="caret"></b> + </a> + + <ul class="dropdown-menu"> + <li><a href="./spring.html">Spring</a></li> + <li><a href="./guice.html">Guice</a></li> + <li class="divider"></li> + <li><a href="./integration.html">Third-Party Integrations</a></li> + </ul> + </li> + <li><a href="./features.html">Features</a></li> - <li><a href="./community.html">Community</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Community <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="./forums.html">Community Forums</a></li> + <li><a href="./mailing-lists.html">Mailing Lists</a></li> + <li><a href="./articles.html">Articles</a></li> + <li><a href="./news.html">News</a></li> + <li><a href="./events.html">Events</a></li> + <li class="divider"></li> + <li><a href="./community.html">More</a></li> + </ul> + </li> + + </ul> + + <ul class="nav navbar-nav navbar-right"> + <li class="dropdown"> + <a href="http://www.apache.org/"; class="dropdown-toggle" data-toggle="dropdown"> + Apache Software Foundation <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/";>Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/";>License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li> + <li><a href="http://www.apache.org/security/";>Security</a></li> + </ul> + </li> </ul> </div> + <!-- /.navbar-collapse --> + </nav> - <div id="content"> - <p>This page has been moved. You are being redirected.</p> + <p>This page has been moved. You are being redirected.</p> -<div class="panelMacro"> - <table class="noteMacro"> - <colgroup span="1"> - <col span="1" width="24"> - <col span="1"> - </colgroup> - <tbody> - <tr> - <td colspan="1" rowspan="1" valign="top"> - <i class="fa fa-warning"></i> - </td> - - <td colspan="1" rowspan="1"> - <b>Redirection Notice</b> - <br clear="none"> - This page should redirect to <a href="10-minute-tutorial.html" title="10 Minute Tutorial">10 Minute Tutorial</a>. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-warning"> + <span class="glyphicon glyphicon-warning-sign"></span> <strong>Redirection Notice</strong> + <hr class="message-inner-separator"> + <p>This page should redirect to <a href="10-minute-tutorial.html" title="10 Minute Tutorial">10 Minute Tutorial</a>.</p> </div> <script type="text/javascript"> @@ -132,27 +202,23 @@ </script> <input type="hidden" id="ghEditPage" value="quickstart.html.vtl"></input> - - </div> - - </div><!--END WRAPPER--> + +</div> - <div id="footer"> + <div class="footer-padding"></div> + <footer class="custom-footer"> <div class="wrapper"> <a href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> | <a href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a> <p>Copyright © 2008-2016 The Apache Software Foundation</p> - - <div class="editThisPage"> - </div> - + <div class="editThisPage"></div> <div class="footer-shield"></div> </div> <!--END FOOTER WRAPPER--> - </div> <!--END FOOTER--> + </footer> <!--END FOOTER--> </body> </html> Modified: shiro/site/publish/realm.html URL: http://svn.apache.org/viewvc/shiro/site/publish/realm.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/realm.html (original) +++ shiro/site/publish/realm.html Tue Oct 25 16:48:27 2016 @@ -35,6 +35,7 @@ <head> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="description" content="Apache Shiro is a powerful and easy-to-use Java security framework that performs authentication, authorization, cryptography, and session management."> <meta name="google-site-verification" content="QIax6uT5UX3enoU0G8Pz2pXbQ45KaQuHZ3nCh9V27mw"> @@ -50,29 +51,44 @@ <link rel="icon" type="image/vnd.microsoft.icon" href="./assets/images/favicon.ico"> <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css";> - <link rel="stylesheet" type="text/css" href="./assets/css/normalize.css"> - <link rel="stylesheet" type="text/css" href="./assets/css/confluence.css" media="screen"> + <!-- site styles and --> <link rel="stylesheet" type="text/css" href="./assets/css/style.css"> + <script type="text/javascript" src="./assets/js/shiro-site.js"></script> + <!-- github ribbon --> <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]--> + <script src="https://code.jquery.com/jquery-3.1.1.min.js"; integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> + + <!-- bootstrap --> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap.min.css"> + <link rel="stylesheet" href="./assets/bootstrap/css/bootstrap-theme.min.css"> + <script src="./assets/bootstrap/js/bootstrap.min.js"></script> + + + <!-- Google Analytics --> + <script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-XXXXX-Y', 'auto'); + ga('send', 'pageview'); + </script> + <!-- End Google Analytics --> + + + <!-- syntax highlighting --> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css"; integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" crossorigin="anonymous" /> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js"; integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" crossorigin="anonymous"></script> - - <script type="text/javascript" src="./assets/js/shiro-site.js"></script> - <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>hljs.initHighlightingOnLoad();</script> + <script type="text/javascript"> - // initialize plugins - jQuery(function() { - //Google Analytics - jQuery.trackPage('UA-11551827-1'); - }); $( document ).ready(function() { addPageEditLink(); @@ -81,27 +97,97 @@ </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"> + <div class="container" style="max-width: 1200px;"> + + <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="header"> - <a href="./index.html"><div id="logo"></div></a> - <ul class="navigation"> + <div class="masthead"> + <p class="lead"> + <a href="./index.html"> + <img src="./assets/images/apache-shiro-logo.png" style="height:100px; width:auto; vertical-align: bottom; margin-top: 20px;"> + </a> + <span class="tagline">Simple. Java. Security.</span> + </p> + </div> + + + + <nav class="navbar navbar-default" role="navigation"> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" + data-target="#navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav"> <li><a href="./get-started.html">Get Started</a></li> <li><a href="./documentation.html">Docs</a></li> <li><a href="./web-features.html">Web Apps</a></li> - <li><a href="./integration.html">Integrations</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Integrations <b class="caret"></b> + </a> + + <ul class="dropdown-menu"> + <li><a href="./spring.html">Spring</a></li> + <li><a href="./guice.html">Guice</a></li> + <li class="divider"></li> + <li><a href="./integration.html">Third-Party Integrations</a></li> + </ul> + </li> + <li><a href="./features.html">Features</a></li> - <li><a href="./community.html">Community</a></li> + + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + Community <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li><a href="./forums.html">Community Forums</a></li> + <li><a href="./mailing-lists.html">Mailing Lists</a></li> + <li><a href="./articles.html">Articles</a></li> + <li><a href="./news.html">News</a></li> + <li><a href="./events.html">Events</a></li> + <li class="divider"></li> + <li><a href="./community.html">More</a></li> + </ul> + </li> + + </ul> + + <ul class="nav navbar-nav navbar-right"> + <li class="dropdown"> + <a href="http://www.apache.org/"; class="dropdown-toggle" data-toggle="dropdown"> + Apache Software Foundation <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="http://www.apache.org/";>Apache Homepage</a></li> + <li><a href="http://www.apache.org/licenses/";>License</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li> + <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> + <li><a href="http://www.apache.org/foundation/sponsorship.html";>Donate</a></li> + <li><a href="http://www.apache.org/security/";>Security</a></li> + </ul> + </li> </ul> </div> + <!-- /.navbar-collapse --> + </nav> - <div id="content"> - <h1><a name="Realm-ApacheShiroRealms"></a>Apache Shiro Realms</h1> + <h1><a name="Realm-ApacheShiroRealms"></a>Apache Shiro Realms</h1> <ul> <li> <p><a href="#Realm-RealmConfiguration">Realm Configuration</a></p> @@ -141,24 +227,10 @@ </ul> <p>A <code>Realm</code> is a component that can access application-specific security data such as users, roles, and permissions. The <code>Realm</code> translates this application-specific data into a format that Shiro understands so Shiro can in turn provide a single easy-to-understand <a href="subject.html" title="Subject">Subject</a> programming API no matter how many data sources exist or how application-specific your data might be.</p> <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 <code>Realm</code> 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> -<div class="panelMacro"> - <table class="tipMacro"> - <colgroup span="1"> - <col span="1" width="24"> - <col span="1"> - </colgroup> - <tbody><tr> - <td colspan="1" rowspan="1" valign="top"> - <i class="fa fa-check-square-o"></i> - </td> - <td colspan="1" rowspan="1"> - <b>Tip</b> - <br clear="none"> - A Realm is essentially a security-specific <a class="external-link" href="http://en.wikipedia.org/wiki/Data_Access_Object"; rel="nofollow">DAO</a> - </td> - </tr> - </tbody> - </table> +<div class="alert alert-success"> + <span class="glyphicon glyphicon-ok"></span> <strong>Tip</strong> + <hr class="message-inner-separator"> + <p>A Realm is essentially a security-specific <a class="external-link" href="http://en.wikipedia.org/wiki/Data_Access_Object"; rel="nofollow">DAO</a></p> </div> <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 <code>Realm</code> can perform <em>both</em> authentication and authorization operations.</p> <a name="Realm-RealmConfiguration"></a> @@ -177,26 +249,10 @@ securityManager.realms = $fooRealm, $bar <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> <a name="Realm-ImplicitAssignment"></a> <h3><a href="#implicit-assignment" name="implicit-assignment">Implicit Assignment</a></h3> -<div class="panelMacro"> - <table class="warningMacro"> - <colgroup span="1"> - <col span="1" width="24"> - <col span="1"> - </colgroup> - <tbody> - <tr> - <td colspan="1" rowspan="1" valign="top"> - <i class="fa fa-exclamation-circle"></i> - </td> - - <td colspan="1" rowspan="1"> - <b>Not Preferred</b> - <br clear="none"> - Implicit assignment can cause unexpected behavior if you change the order in which realms are defined. It is recommended that you avoid this approach and use Explicit Assignment, which has deterministic behavior. It is likely Implicit Assignment will be deprecated/removed from a future Shiro release. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-danger"> + <span class="glyphicon glyphicon-exclamation-sign"></span> <strong>Not Preferred</strong> + <hr class="message-inner-separator"> + <p>Implicit assignment can cause unexpected behavior if you change the order in which realms are defined. It is recommended that you avoid this approach and use Explicit Assignment, which has deterministic behavior. It is likely Implicit Assignment will be deprecated/removed from a future Shiro release.</p> </div> <p>If for some reason you don’t want to explicitly configure the <code>securityManager.realms</code> property, you can allow Shiro to detect all configured realms and assign them to the <code>securityManager</code> directly.</p> <p>Using this approach, realms are assigned to the <code>securityManager</code> instance in the <em>order that they are defined</em>.</p> @@ -232,52 +288,18 @@ barRealm = com.company.another.Realm </ol> <p>This is the highest-level workflow for all Realm <code>getAuthenticationInfo</code> implementations. Realms are free to do whatever they want during this method, such as record the attempt in an audit log, update data records, or anything else that makes sense for the authentication attempt for that data store.</p> <p>The only thing required is that, if the credentials match for the given principal(s), that a non-null <code>AuthenticationInfo</code> instance is returned that represents Subject account information from that data source.</p> -<div class="panelMacro"> - <table class="infoMacro"> - <colgroup span="1"> - <col span="1" width="24"> - <col span="1"> - </colgroup> - - - <tbody> - <tr> - <td colspan="1" rowspan="1" valign="top"> - <i class="fa fa-info-circle"></i> - </td> - - <td colspan="1" rowspan="1"> - <b>Save Time</b> - <br clear="none"> - Implementing `<a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/Realm.html">Realm</a>` interface directly might be time consuming and error prone. Most people choose to subclass the <a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/AuthorizingRealm.html">AuthorizingRealm</a> abstract class instead of starting from scratch. This class implements common authentication and authorization workflow to save you time and effort. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-info"> + <span class="glyphicon glyphicon-info-sign"></span> <strong>Save Time</strong> + <hr class="message-inner-separator"> + <p>Implementing `<a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/Realm.html">Realm</a>` interface directly might be time consuming and error prone. Most people choose to subclass the <a class="external-link" href="static/current/apidocs/org/apache/shiro/realm/AuthorizingRealm.html">AuthorizingRealm</a> abstract class instead of starting from scratch. This class implements common authentication and authorization workflow to save you time and effort.</p> </div> <a name="Realm-CredentialsMatching"></a> <h3><a href="#credentials-matching" name="credentials-matching">Credentials Matching</a></h3> <p>In the above realm authentication workflow, a Realm has to verify that the <a href="subject.html" title="Subject">Subject</a>’s submitted credentials (e.g. password) must match the credentials stored in the data store. If they match, authentication is considered successful, and the system has verified the end-user’s identity.</p> -<div class="panelMacro"> - <table class="noteMacro"> - <colgroup span="1"> - <col span="1" width="24"> - <col span="1"> - </colgroup> - <tbody> - <tr> - <td colspan="1" rowspan="1" valign="top"> - <i class="fa fa-warning"></i> - </td> - - <td colspan="1" rowspan="1"> - <b>Realm Credentials Matching</b> - <br clear="none"> - It is each Realm's responsibility to match submitted credentials with those stored in the Realm's backing data store, and not the `Authenticator's` responsibility. Each `Realm` has intimate knowledge of credentials format and storage and can perform detailed credentials matching, whereas the `Authenticator` is a generic workflow component. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-warning"> + <span class="glyphicon glyphicon-warning-sign"></span> <strong>Realm Credentials Matching</strong> + <hr class="message-inner-separator"> + <p>It is each Realm's responsibility to match submitted credentials with those stored in the Realm's backing data store, and not the `Authenticator's` responsibility. Each `Realm` has intimate knowledge of credentials format and storage and can perform detailed credentials matching, whereas the `Authenticator` is a generic workflow component.</p> </div> <p>The credentials matching process is nearly identical in all applications and usually only differs by the data compared. To ensure this process is pluggable and customizable if necessary, the <a href="static/current/apidocs/org/apache/shiro/realm/AuthenticatingRealm.html">AuthenticatingRealm</a> and its subclasses support the concept of a <a href="static/current/apidocs/org/apache/shiro/authc/credential/CredentialsMatcher.html">CredentialsMatcher</a> to perform the credentials comparison.</p> <p>After discovering account data, it and the submitted <code>AuthenticationToken</code> are presented to a <code>CredentialsMatcher</code> to see if what was submitted matches what is stored in the data store.</p> @@ -365,27 +387,23 @@ myRealm.credentialsMatcher = $credential <p>While we hope this documentation helps you with the work you’re doing with Apache Shiro, the community is improving and expanding the documentation all the time. If you’d like to help the Shiro project, please consider corrected, expanding, or adding documentation where you see a need. Every little bit of help you provide expands the community and in turn improves Shiro.</p> <p>The easiest way to contribute your documentation is to send it to the <a href="http://shiro-user.582556.n2.nabble.com/";>User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p> <input type="hidden" id="ghEditPage" value="realm.md.vtl"></input> - - </div> - - </div><!--END WRAPPER--> + +</div> - <div id="footer"> + <div class="footer-padding"></div> + <footer class="custom-footer"> <div class="wrapper"> <a href="http://www.apache.org/foundation/contributing.html";>Donate to the ASF</a> | <a href="http://www.apache.org/licenses/LICENSE-2.0.html";>License</a> <p>Copyright © 2008-2016 The Apache Software Foundation</p> - - <div class="editThisPage"> - </div> - + <div class="editThisPage"></div> <div class="footer-shield"></div> </div> <!--END FOOTER WRAPPER--> - </div> <!--END FOOTER--> + </footer> <!--END FOOTER--> </body> </html>
