Modified: shiro/site/publish/tutorial.html URL: http://svn.apache.org/viewvc/shiro/site/publish/tutorial.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/tutorial.html (original) +++ shiro/site/publish/tutorial.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> @@ -129,28 +215,10 @@ <a name="Tutorial-Setup"></a> <h3><a href="#setup" name="setup">Setup</a></h3> <p>In this simple example, we’ll create a very simple command-line application that will run and quickly exit, just so you can get a feel for Shiro’s API.</p> -<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>Any Application</b> - <br clear="none"> - Apache Shiro was designed from day one to support <em>any</em> application - from the smallest command-line applications to the largest clustered web applications. Even though we're creating a simple app for this tutorial, know that the same usage patterns apply no matter how your application is created or where it is deployed. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-info"> + <span class="glyphicon glyphicon-info-sign"></span> <strong>Any Application</strong> + <hr class="message-inner-separator"> + <p>Apache Shiro was designed from day one to support <em>any</em> application - from the smallest command-line applications to the largest clustered web applications. Even though we're creating a simple app for this tutorial, know that the same usage patterns apply no matter how your application is created or where it is deployed.</p> </div> <p>This tutorial requires Java 1.5 or later. We’ll also be using Apache <a href="http://maven.apache.org";>Maven</a> as our build tool, but of course this is not required to use Apache Shiro. You may acquire Shiro’s .jars and incorporate them in any way you like into your application, for example maybe using Apache <a href="http://ant.apache.org";>Ant</a> and <a href="http://ant.apache.org/ivy";>Ivy</a>.</p> <p>For this tutorial, please ensure that you are using Maven 2.2.1 or later. You should be able to type <code>mvn --version</code> in a command prompt and see something similar to the following:</p> @@ -281,24 +349,10 @@ lhazlewood:~/projects/shiro-tutorial\$ <h4><a href="#configuration" name="configuration">Configuration</a></h4> <p>While we could instantiate a <code>SecurityManager</code> class directly, Shiro’s <code>SecurityManager</code> implementations have enough configuration options and internal components that make this a pain to do in Java source code - it would be much easier to configure the <code>SecurityManager</code> with a flexible text-based configuration format.</p> <p>To that end, Shiro provides a default âcommon denominatorâ solution via text-based <a href="https://en.wikipedia.org/wiki/INI_file";>INI</a> configuration. People are pretty tired of using bulky XML files these days, and INI is easy to read, simple to use, and requires very few dependencies. Youâll also see later that with a simple understanding of object graph navigation, INI can be used effectively to configure simple object graphs like the SecurityManager.</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>Many Configuration Options</b> - <br clear="none"> - Shiro's <code>SecurityManager</code> implementations and all supporting components are all JavaBeans compatible. This allows Shiro to be configured with practically any configuration format such as XML (Spring, JBoss, Guice, etc), <a class="external-link" href="http://www.yaml.org/"; rel="nofollow">YAML</a>, JSON, Groovy Builder markup, and more. INI is just Shiro's 'common denominator' format that allows configuration in any environment in case other options are not available. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-success"> + <span class="glyphicon glyphicon-ok"></span> <strong>Many Configuration Options</strong> + <hr class="message-inner-separator"> + <p>Shiro's <code>SecurityManager</code> implementations and all supporting components are all JavaBeans compatible. This allows Shiro to be configured with practically any configuration format such as XML (Spring, JBoss, Guice, etc), <a class="external-link" href="http://www.yaml.org/"; rel="nofollow">YAML</a>, JSON, Groovy Builder markup, and more. INI is just Shiro's 'common denominator' format that allows configuration in any environment in case other options are not available.</p> </div> <a name="Tutorial-%7B%7Bshiro.ini%7D%7D"></a> <h5><a href="#shiro-ini" name="shiro-ini">shiro.ini</a></h5> @@ -409,24 +463,10 @@ session.setAttribute( "someKey" } </code></pre> <p>There are many different types of exceptions you can check, or throw your own for custom conditions Shiro might not account for. See the <a href="static/current/apidocs/org/apache/shiro/authc/AuthenticationException.html">AuthenticationException JavaDoc</a> for more.</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>Handy Hint</b> - <br clear="none"> - Security best practice is to give generic login failure messages to users because you do not want to aid an attacker trying to break into your system. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-success"> + <span class="glyphicon glyphicon-ok"></span> <strong>Handy Hint</strong> + <hr class="message-inner-separator"> + <p>Security best practice is to give generic login failure messages to users because you do not want to aid an attacker trying to break into your system.</p> </div> <p>Ok, so by now, we have a logged in user. What else can we do?</p> <p>Let’s say who they are:</p> @@ -553,27 +593,23 @@ public class Tutorial { <p>Hopefully this introduction tutorial helped you understand how to set-up Shiro in a basic application as well Shiro’s primary design concepts, the <code>Subject</code> and <code>SecurityManager</code>.</p> <p>But this was a fairly simple application. You might have asked yourself, “What if I don’t want to use INI user accounts and instead want to connect to a more complex user data source?”</p> <p>To answer that question requires a little deeper understanding of Shiro’s architecture and supporting configuration mechanisms. We’ll cover Shiro’s <a href="architecture.html" title="Architecture">Architecture</a> next.</p> -<input type="hidden" id="ghEditPage" value="tutorial.md.vtl"></input> - </div> - - </div><!--END WRAPPER--> +<input type="hidden" id="ghEditPage" value="tutorial.md.vtl"></input> +</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/version-2-brainstorming.html URL: http://svn.apache.org/viewvc/shiro/site/publish/version-2-brainstorming.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/version-2-brainstorming.html (original) +++ shiro/site/publish/version-2-brainstorming.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"> - <ul> + <ul> <li><a href="#Version2Brainstorming-RenameAuthenticationInfotoAccount">Rename AuthenticationInfo to Account</a></li> <li><a href="#Version2Brainstorming-Realmrefactoring">Realm refactoring</a></li> <li><a href="#Version2Brainstorming-Splitshirocoreintomodules">Split shiro-core into modules</a></li> @@ -249,27 +335,23 @@ if (response.hasException()) { <a name="Version2Brainstorming-Webmodulerepackaging."></a> <h3>Web module repackaging.</h3> <p>The Web module is largely Servlet-specific at the moment. As such, its packaging should reflect this, in the same way that all other support modules are named, e.g.<br/>module name: <code>shiro-servlet</code><br/>package base: <code>org.apache.shiro.servlet.*</code><br/><input type="hidden" id="ghEditPage" value="version-2-brainstorming.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/web-features.html URL: http://svn.apache.org/viewvc/shiro/site/publish/web-features.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/web-features.html (original) +++ shiro/site/publish/web-features.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: 200px; float: left"></div> @@ -128,27 +214,23 @@ <p><strong>JSP Tag support</strong><br/>The JSP tags allow you to easily control page output based on the current user’s state and access rights.</p></li> <li> <p><strong>Transparent HttpSession support</strong><br/>If you are using Shiro’s native sessions, we have implemented HTTP Session API and the Servlet 2.5 API so you don’t have to change any of your existing web code to use Shiro.<br/><input type="hidden" id="ghEditPage" value="web-features.md"></input></p></li> -</ul> - </div> +</ul> +</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/web.html URL: http://svn.apache.org/viewvc/shiro/site/publish/web.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/web.html (original) +++ shiro/site/publish/web.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"> - + <!-- spacer allows enough room to display the header --> <div id="spacer" style="width: 0; height: 60px; float: left"></div> @@ -256,28 +342,10 @@ <a name="Web-Configuration"></a> <h2><a href="#configuration" name="configuration">Configuration</a></h2> <p>The simplest way to integrate Shiro into any web application is to configure a Servlet ContextListener and Filter in web.xml that understands how to read Shiro’s INI configuration. The bulk of the INI config format itself is defined in the Configuration pages’s <a href="configuration.html#Configuration-INISections">INI Sections</a> section, but we’ll cover some additional web-specific sections here.</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>Using Spring?</b> - <br clear="none"> - Spring Framework users will not perform this setup. If you use Spring, you will want to read about <a href="spring.html#[[#]]#Spring-WebApplications">Spring-specific web configuration</a> instead. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-info"> + <span class="glyphicon glyphicon-info-sign"></span> <strong>Using Spring?</strong> + <hr class="message-inner-separator"> + <p>Spring Framework users will not perform this setup. If you use Spring, you will want to read about <a href="spring.html#[[#]]#Spring-WebApplications">Spring-specific web configuration</a> instead.</p> </div> <a name="Web-%7B%7Bweb.xml%7D%7D"></a> <h3><a href="#web-xml" name="web-xml">web.xml</a></h3> @@ -318,24 +386,10 @@ <li> <p>Finally, the <code>filter-mapping</code> definition ensures that all requests are filtered by the <code>ShiroFilter</code>, recommended for most web applications to ensure that any request can be secured.</p></li> </ul> -<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>ShiroFilter filter-mapping</b> - <br clear="none"> - It is usually desirable to define the `ShiroFilter filter-mapping` before any other `filter-mapping` declarations to ensure that Shiro can function in those filters as well. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-success"> + <span class="glyphicon glyphicon-ok"></span> <strong>ShiroFilter filter-mapping</strong> + <hr class="message-inner-separator"> + <p>It is usually desirable to define the `ShiroFilter filter-mapping` before any other `filter-mapping` declarations to ensure that Shiro can function in those filters as well.</p> </div> <a name="Web-Custom%7B%7BWebEnvironment%7D%7DClass"></a> <h5>Custom <code>WebEnvironment</code> Class</h5> @@ -405,26 +459,10 @@ ... </code></pre> <p>Unqualified (schemeless or ‘non-prefixed’) <code>configPath</code> values are assumed to be <code>ServletContext</code> resource paths, resolvable via the rules defined by the<br/><code>ServletContext.</code><a href="http://docs.oracle.com/javaee/6/api/javax/servlet/ServletContext.html#getResource-java.lang.String-";><code>getResource</code></a> method.</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>ServletContext resource paths - Shiro 1.2+</b> - <br clear="none"> - ServletContext resource paths are available in Shiro 1.2 and later. In 1.1 and earlier, all <code>configPath</code> definitions must specify a <code>classpath:</code>, <code>file:</code> or <code>url:</code> prefix. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-warning"> + <span class="glyphicon glyphicon-warning-sign"></span> <strong>ServletContext resource paths - Shiro 1.2+</strong> + <hr class="message-inner-separator"> + <p>ServletContext resource paths are available in Shiro 1.2 and later. In 1.1 and earlier, all <code>configPath</code> definitions must specify a <code>classpath:</code>, <code>file:</code> or <code>url:</code> prefix.</p> </div> <p>You may also specify other non-<code>ServletContext</code> resource locations by using <code>classpath:</code>, <code>url:</code>, or <code>file:</code> prefixes indicating classpath, url, or filesystem locations respectively. For example:</p> <pre><code class="xml">... @@ -490,33 +528,16 @@ </code></pre> <p>This line states that “Any request to my application’s path of <code>/account</code> or any of it’s sub paths (<code>/account/foo</code>, <code>/account/bar/baz</code>, etc) will trigger the ‘ssl, authc’ filter chain”. We’ll cover filter chains below.</p> <p>Note that all path expressions are relative to your application’s context root. This means that if you deploy your application one day to, say, <code>www.somehost.com/myapp</code> and then later deploy it to <code>www.anotherhost.com</code> (no ‘myapp’ sub-path), the pattern matching will still work. All paths are relative to the <a href="http://docs.oracle.com/javaee/1.3/api/javax/servlet/http/HttpServletRequest.html#getContextPath--";>HttpServletRequest.getContextPath()</a> value.</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>Order Matters!</b> - <br clear="none"> - URL path expressions are evaluated against an incoming request in the order they are defined and the <em>FIRST MATCH WINS</em>. For example, let's asume that there are the following chain definitions: +<div class="alert alert-warning"> + <span class="glyphicon glyphicon-warning-sign"></span> <strong>Order Matters!</strong> + <hr class="message-inner-separator"> + <p>URL path expressions are evaluated against an incoming request in the order they are defined and the <em>FIRST MATCH WINS</em>. For example, let's asume that there are the following chain definitions: -<pre><code class="ini"> -/account/** = ssl, authc +<pre><code class="ini">/account/** = ssl, authc /account/signup = anon </code></pre> <p>If an incoming request is intended to reach <code>/account/signup/index.html</code> (accessible by all 'anon'ymous users), <em>it will never be handled!</em>. The reason is that the <code>/account/**</code> pattern matched the incoming request first and 'short-circuited' all remaining definitions.</p> -<p>Always remember to define your filter chains based on a <em>FIRST MATCH WINS</em> policy!</p> - </td> - </tr> - </tbody> - </table> +<p>Always remember to define your filter chains based on a <em>FIRST MATCH WINS</em> policy!</p></p> </div> <a name="Web-FilterChainDefinitions"></a> <h5><a href="#filter-chain-definitions" name="filter-chain-definitions">Filter Chain Definitions</a></h5> @@ -530,25 +551,11 @@ </ul> <p>And because filter tokens define chains (aka a List), remember that order matters! Define your comma-delimited list in the order that you want the request to flow through the chain.</p> <p>Finally, each filter is free to handle the response however it wants if its necessary conditions are not met (e.g. perform a redirect, respond with an HTTP error code, direct rendering, etc). Otherwise it is expected to allow the request to continue through the chain on to the final destination view.</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"> - Being able to react to path specific configuration, i.e. the <code>[optional_configN]</code> part of a filter token, is a unique feature available to Shiro filters. -<p>If you want to create your own <code>javax.servlet.Filter</code> implementation that can also do this, make sure your filter subclasses <a class="external-link" href="static/current/apidocs/org/apache/shiro/web/filter/PathMatchingFilter.html">org.apache.shiro.web.filter.PathMatchingFilter</a></p> - </td> - </tr> - </tbody> - </table> +<div class="alert alert-success"> + <span class="glyphicon glyphicon-ok"></span> <strong>Tip</strong> + <hr class="message-inner-separator"> + <p>Being able to react to path specific configuration, i.e. the <code>[optional_configN]</code> part of a filter token, is a unique feature available to Shiro filters. +<p>If you want to create your own <code>javax.servlet.Filter</code> implementation that can also do this, make sure your filter subclasses <a class="external-link" href="static/current/apidocs/org/apache/shiro/web/filter/PathMatchingFilter.html">org.apache.shiro.web.filter.PathMatchingFilter</a></p></p> </div> <a name="Web-AvailableFilters"></a> <h6><a href="#available-filters" name="available-filters">Available Filters</a></h6> @@ -711,28 +718,10 @@ securityManager.sessionManager = $sessio <li><code>sessionIdCookieEnabled</code> (a boolean)</li> <li><code>sessionIdCookie</code>, a <a href="static/current/apidocs/org/apache/shiro/web/servlet/Cookie.html">Cookie</a> instance.</li> </ul> -<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>Cookie as a template</b> - <br clear="none"> - The <code>sessionIdCookie</code> property is essentially a template - you configure the <code>Cookie</code> instance properties, and this template will be used to set the actual HTTP `Cookie` header at runtime with an appropriate session ID value. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-info"> + <span class="glyphicon glyphicon-info-sign"></span> <strong>Cookie as a template</strong> + <hr class="message-inner-separator"> + <p>The <code>sessionIdCookie</code> property is essentially a template - you configure the <code>Cookie</code> instance properties, and this template will be used to set the actual HTTP `Cookie` header at runtime with an appropriate session ID value.</p> </div> <a name="Web-SessionCookieConfiguration"></a> <h6><a href="#session-cookie-configuration" name="session-cookie-configuration">Session Cookie Configuration</a></h6> @@ -744,28 +733,10 @@ securityManager.sessionManager.sessionId </code></pre> <p>See the <a href="static/current/apidocs/org/apache/shiro/web/servlet/SimpleCookie.html">SimpleCookie JavaDoc</a> for additional properties.</p> <p>The cookie’s default name is <code>JSESSIONID</code> in accordance with the servlet specification. Additionally, Shiro’s cookie supports the <a href="https://en.wikipedia.org/wiki/HTTP_cookie#HttpOnly_cookie";><code>HttpOnly</code></a> flag. The <code>sessionIdCookie</code> sets <code>HttpOnly</code> to <code>true</code> by default for extra security.</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>Note</b> - <br clear="none"> - Shiro's <code>Cookie</code> concept supports the <code>HttpOnly</code> flag even in Servlet 2.4 and 2.5 environments (whereas the Servlet API only supports it natively in 2.6 or later). - </td> - </tr> - </tbody> - </table> +<div class="alert alert-info"> + <span class="glyphicon glyphicon-info-sign"></span> <strong>Note</strong> + <hr class="message-inner-separator"> + <p>Shiro's <code>Cookie</code> concept supports the <code>HttpOnly</code> flag even in Servlet 2.4 and 2.5 environments (whereas the Servlet API only supports it natively in 2.6 or later).</p> </div> <a name="Web-DisablingtheSessionCookie"></a> <h6><a href="#disabling-the-session-cookie" name="disabling-the-session-cookie">Disabling the Session Cookie</a></h6> @@ -782,24 +753,10 @@ securityManager.sessionManager.sessionId <pre><code class="java">boolean isRememberMe(); </code></pre> <p>If this method returns <code>true</code>, Shiro will remember the end-user’s identity across sessions.</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>UsernamePasswordToken and RememberMe</b> - <br clear="none"> - The frequently-used <code>UsernamePasswordToken</code> already implements the <code>RememberMeAuthenticationToken</code> interface and supports rememberMe logins. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-success"> + <span class="glyphicon glyphicon-ok"></span> <strong>UsernamePasswordToken and RememberMe</strong> + <hr class="message-inner-separator"> + <p>The frequently-used <code>UsernamePasswordToken</code> already implements the <code>RememberMeAuthenticationToken</code> interface and supports rememberMe logins.</p> </div> <a name="Web-ProgrammaticSupport"></a> <h3><a href="#programmatic-support" name="programmatic-support">Programmatic Support</a></h3> @@ -999,27 +956,23 @@ securityManager.rememberMeManager = $rem <a name="Web-Lendahandwithdocumentation"></a> <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>.<br/><input type="hidden" id="ghEditPage" value="web.md.vtl"></input></p> - </div> - - </div><!--END WRAPPER--> +<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>.<br/><input type="hidden" id="ghEditPage" value="web.md.vtl"></input></p> +</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/webapp-tutorial.html URL: http://svn.apache.org/viewvc/shiro/site/publish/webapp-tutorial.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/webapp-tutorial.html (original) +++ shiro/site/publish/webapp-tutorial.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 href="#securing-web-applications-with-apache-shiro" name="securing-web-applications-with-apache-shiro">Securing Web Applications with Apache Shiro</a></h1> + <h1><a href="#securing-web-applications-with-apache-shiro" name="securing-web-applications-with-apache-shiro">Securing Web Applications with Apache Shiro</a></h1> <p>This document is an introductory step-by-step tutorial to securing a web application with Apache Shiro. It assumes an introductory knowledge of Shiro, and assumes familiarity with at least the following two introductory documents:</p> <ul> <li><a href="https://www.infoq.com/articles/apache-shiro";>Application Security with Apache Shiro</a></li> @@ -698,27 +784,23 @@ You may edit the user! <h3><a href="#fixes-and-pull-requests" name="fixes-and-pull-requests">Fixes and Pull Requests</a></h3> <p>Please send any fixes for errata as a <a href="https://help.github.com/articles/creating-a-pull-request/";>GitHub Pull Request</a> to the <code>https://github.com/lhazlewood/apache-shiro-tutorial-webapp</code> repository. We appreciate it!!!</p> <input type="hidden" id="ghEditPage" value="webapp-tutorial.md"></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/what-is-shiro.html URL: http://svn.apache.org/viewvc/shiro/site/publish/what-is-shiro.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/what-is-shiro.html (original) +++ shiro/site/publish/what-is-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="WhatisShiro-WhatisShiro%3F"></a> + <a name="WhatisShiro-WhatisShiro%3F"></a> <h1><a href="#what-is-shiro-" name="what-is-shiro-">What is Shiro?</a></h1> <p>Apache Shiro is an application security framework that provides application developers very clean and simple ways of supporting four cornerstones of security in their applications: authentication, authorization, enterprise session management and cryptography.</p> <a name="WhatisShiro-MissionStatement"></a> @@ -152,27 +238,23 @@ <p>Well, that’s how the JSecurity project and then Apache Shiro was started. We’re always looking to improve. Since Shiro is open-source, please think about joining the project or helping out, even if you just offer suggestions. Anything is appreciated!</p> <p>Best regards,</p> <p>Les Hazlewood<br/><input type="hidden" id="ghEditPage" value="what-is-shiro.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>
