Modified: shiro/site/publish/subject.html URL: http://svn.apache.org/viewvc/shiro/site/publish/subject.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/subject.html (original) +++ shiro/site/publish/subject.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="Subject-UnderstandingSubjectsinApacheShiro"></a> + <a name="Subject-UnderstandingSubjectsinApacheShiro"></a> <h1><a href="#understanding-subjects-in-apache-shiro" name="understanding-subjects-in-apache-shiro">Understanding Subjects in Apache Shiro</a></h1> <p>Without question, the most important concept in Apache Shiro is the <code>Subject</code>. ‘Subject’ is just a security term that means a security-specific ‘view’ of an application user. A Shiro <code>Subject</code> instance represents both security state and operations for a <em>single</em> application user.</p> <p>These operations include:</p> @@ -193,26 +279,10 @@ log.info( "User [" + currentUs <a name="Subject-CustomSubjectInstances"></a> <h2><a href="#custom-subject-instances" name="custom-subject-instances">Custom Subject Instances</a></h2> <p>A new feature added in Shiro 1.0 is the ability to construct custom/ad-hoc subject instances for use in special situations.</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>Special Use Only!</b> - <br clear="none"> - You should almost always acquire the currently executing Subject by calling <code>SecurityUtils.getSubject();</code> Creating custom <code>Subject</code> instances should only be done in special cases. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-warning"> + <span class="glyphicon glyphicon-warning-sign"></span> <strong>Special Use Only!</strong> + <hr class="message-inner-separator"> + <p>You should almost always acquire the currently executing Subject by calling <code>SecurityUtils.getSubject();</code> Creating custom <code>Subject</code> instances should only be done in special cases.</p> </div> <p>Some ‘special cases’ when this can be useful:</p> <ul> @@ -225,24 +295,10 @@ log.info( "User [" + currentUs <li> <p>Daemon/background process work - when a daemon or background process executes, it might need to execute as a particular user.</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>Tip</b> - <br clear="none"> - If you already have access to a <code>Subject</code> instance and want it to be available to other threads, you should use the <code>Subject.associateWith</code>* methods instead of creating a new Subject instance. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-success"> + <span class="glyphicon glyphicon-ok"></span> <strong>Tip</strong> + <hr class="message-inner-separator"> + <p>If you already have access to a <code>Subject</code> instance and want it to be available to other threads, you should use the <code>Subject.associateWith</code>* methods instead of creating a new Subject instance.</p> </div> <p>Ok, so assuming you still need to create custom subject instances, let’s see how to do it:</p> <a name="Subject-Subject.Builder"></a> @@ -329,26 +385,10 @@ return subject.execute(new Callable() { <a name="Subject-ManualAssociation"></a> <h4><a href="#manual-association" name="manual-association">Manual Association</a></h4> <p>While the <code>Subject.execute</code>* methods automatically clean up the thread state after they return, there might be some scenarios where you want to manage the <code>ThreadState</code> yourself. This is almost always done in framework-level development when integrating w/ Shiro and is rarely used even in bootstrap/daemon scenarios (where the <code>Subject.execute(callable)</code> example above is more frequent).</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>Guarantee Cleanup</b> - <br clear="none"> - The most important thing about this mechanism is that you must <em>always</em> guarantee the current thread is cleaned up after logic is executed to ensure there is no thread state corruption in a reusable or pooled thread environment. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-warning"> + <span class="glyphicon glyphicon-warning-sign"></span> <strong>Guarantee Cleanup</strong> + <hr class="message-inner-separator"> + <p>The most important thing about this mechanism is that you must <em>always</em> guarantee the current thread is cleaned up after logic is executed to ensure there is no thread state corruption in a reusable or pooled thread environment.</p> </div> <p>Guaranteeing cleanup is best done in a <code>try/finally</code> block:</p> <pre><code class="java">Subject subject = new Subject.Builder()... @@ -363,26 +403,10 @@ try { } </code></pre> <p>Interestingly enough, this is exactly what the <code>Subject.execute</code>* methods do - they just perform this logic automatically before and after <code>Callable</code> or <code>Runnable</code> execution. It is also nearly identical logic performed by Shiro’s <code>ShiroFilter</code> for web applications (<code>ShiroFilter</code> uses web-specific <code>ThreadState</code> implementations outside the scope of this section).</p> -<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>Web Use</b> - <br clear="none"> - Don't use the above <code>ThreadState</code> code example in a thread that is processing a web request. Web-specific ThreadState implementations are used during web requests instead. Instead, ensure the <code>ShiroFilter</code> intercepts web requests to ensure Subject building/binding/cleanup is done properly. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-danger"> + <span class="glyphicon glyphicon-exclamation-sign"></span> <strong>Web Use</strong> + <hr class="message-inner-separator"> + <p>Don't use the above <code>ThreadState</code> code example in a thread that is processing a web request. Web-specific ThreadState implementations are used during web requests instead. Instead, ensure the <code>ShiroFilter</code> intercepts web requests to ensure Subject building/binding/cleanup is done properly.</p> </div> <a name="Subject-ADifferentThread"></a> <h4><a href="#a-different-thread" name="a-different-thread">A Different Thread</a></h4> @@ -404,50 +428,32 @@ work = subject.associateWith(work); Executor executor = new java.util.concurrent.Executors.newCachedThreadPool(); //execute the work on a different thread as the built Subject: executor.execute(work); </code></pre> -<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>Automatic Cleanup</b> - <br clear="none"> - The <code>associateWith</code>* methods perform necessary thread cleanup automatically to ensure threads remain clean in a pooled environment. - </td> - </tr> - </tbody> - </table> +<div class="alert alert-success"> + <span class="glyphicon glyphicon-ok"></span> <strong>Automatic Cleanup</strong> + <hr class="message-inner-separator"> + <p>The <code>associateWith</code>* methods perform necessary thread cleanup automatically to ensure threads remain clean in a pooled environment.</p> </div> <a name="Subject-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="subject.md.vtl"></input></p> - - </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/support.html URL: http://svn.apache.org/viewvc/shiro/site/publish/support.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/support.html (original) +++ shiro/site/publish/support.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>Apache Shiro Community Support"</h1> + <h1>Apache Shiro Community Support"</h1> <p>The Shiro project offers support through its community of users, contributors, and project committers.</p> <p>We encourage everyone to participate and use the available community support tools below.</p> <ul> @@ -109,27 +195,23 @@ <li><a href="forums.html" title="Forums">Forums</a></li> <li><a href="issues.html">Issues and Bug Tracking</a><br/><input type="hidden" id="ghEditPage" value="support.md"></input></li> </ul> - - </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/tags.html URL: http://svn.apache.org/viewvc/shiro/site/publish/tags.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/tags.html (original) +++ shiro/site/publish/tags.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"> - <script type="text/javascript"> + <script type="text/javascript"> <!-- window.location = "https://github.com/apache/shiro/blob/master/web/src/main/resources/META-INF/shiro.tld"; //--> @@ -109,27 +195,23 @@ window.location = "https://github.com/ap <input type="hidden" id="ghEditPage" value="tags.html"></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/team.html URL: http://svn.apache.org/viewvc/shiro/site/publish/team.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/team.html (original) +++ shiro/site/publish/team.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,50 +97,116 @@ </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="#apache-shiro-team" name="apache-shiro-team">Apache Shiro Team</a></h1> + <h1><a href="#apache-shiro-team" name="apache-shiro-team">Apache Shiro Team</a></h1> <p>TODO: list dev team members here</p> <input type="hidden" id="ghEditPage" value="team.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/terminology.html URL: http://svn.apache.org/viewvc/shiro/site/publish/terminology.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/terminology.html (original) +++ shiro/site/publish/terminology.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="Terminology-ApacheShiroTerminology"></a> + <a name="Terminology-ApacheShiroTerminology"></a> <h1><a href="#apache-shiro-terminology" name="apache-shiro-terminology">Apache Shiro Terminology</a></h1> <p>Please just take 2 minutes to read and understand this - it is <em>really</em> important. Really. The terms and concepts here are referred to everywhere in the documentation and it will <em>greatly</em> simplify your understanding of Shiro and security in general.</p> <p>Security can be really confusing because of the terminology used. We’ll make life easier by clarifying some core concepts and you’ll see how nicely the Shiro API reflects them:</p> @@ -178,27 +264,23 @@ <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 class="external-link" href="http://shiro-user.582556.n2.nabble.com/"; rel="nofollow">User Forum</a> or the <a href="mailing-lists.html" title="Mailing Lists">User Mailing List</a>.</p> <input type="hidden" id="ghEditPage" value="terminology.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/testing.html URL: http://svn.apache.org/viewvc/shiro/site/publish/testing.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/testing.html (original) +++ shiro/site/publish/testing.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="Testing-TestingwithApacheShiro"></a> + <a name="Testing-TestingwithApacheShiro"></a> <h1><a href="#testing-with-apache-shiro" name="testing-with-apache-shiro">Testing with Apache Shiro</a></h1> <p>This part of the documentation explains how to enable Shiro in unit tests.</p> <a name="Testing-Whattoknowfortests"></a> @@ -196,27 +282,11 @@ public abstract class AbstractShiroTest } } </code></pre> -<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>Testing & Frameworks</b> - <br clear="none"> - The code in the <code>AbstractShiroTest</code> class uses Shiro's <code>ThreadState</code> concept and a static SecurityManager. These techniques are useful in tests and in framework code, but rarely ever used in application code. -<p>Most end-users working with Shiro who need to ensure thread-state consistency will almost always use Shiro's automatic management mechanisms, namely the `Subject.associateWith` and the `Subject.execute` methods. These methods are covered in the reference on <a href="subject.html#Subject-ThreadAssociation">Subject thread association</a>).</p> - </td> - </tr> - </tbody> - </table> +<div class="alert alert-warning"> + <span class="glyphicon glyphicon-warning-sign"></span> <strong>Testing & Frameworks</strong> + <hr class="message-inner-separator"> + <p>The code in the <code>AbstractShiroTest</code> class uses Shiro's <code>ThreadState</code> concept and a static SecurityManager. These techniques are useful in tests and in framework code, but rarely ever used in application code. +<p>Most end-users working with Shiro who need to ensure thread-state consistency will almost always use Shiro's automatic management mechanisms, namely the `Subject.associateWith` and the `Subject.execute` methods. These methods are covered in the reference on <a href="subject.html#Subject-ThreadAssociation">Subject thread association</a>).</p></p> </div> <a name="Testing-UnitTesting"></a> <h2><a href="#unit-testing" name="unit-testing">Unit Testing</a></h2> @@ -328,27 +398,23 @@ public class ExampleShiroIntegrationTest <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="testing.md.vtl"></input></p> - - </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/tools.html URL: http://svn.apache.org/viewvc/shiro/site/publish/tools.html?rev=1766556&r1=1766555&r2=1766556&view=diff ============================================================================== --- shiro/site/publish/tools.html (original) +++ shiro/site/publish/tools.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,114 @@ </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> - </ul> - </div> - <div id="content"> + <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> - <p><a href="command-line-hasher.html">Command Line Hasher</a><br/><input type="hidden" id="ghEditPage" value="tools.md"></input></p> - + <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><!--END WRAPPER--> - <div id="footer"> + <p><a href="command-line-hasher.html">Command Line Hasher</a><br/><input type="hidden" id="ghEditPage" value="tools.md"></input></p> + +</div> + + <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>
