You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2021/10/22 10:35:27 UTC
[shiro-site] branch jbake updated (9ad68a3 -> afc41cb)
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a change to branch jbake
in repository https://gitbox.apache.org/repos/asf/shiro-site.git.
from 9ad68a3 add missing 1.8.0 docs
new 01e4f1c fix self link to page 1.
new 2fb7458 fix favicon.ico.
new afc41cb fix dead links on paging, fix anchor from tutorial.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
jbake/assets/.htaccess | 2 +-
jbake/assets/img/favicon.ico | 1 +
jbake/content/10-minute-tutorial.adoc | 4 ++--
jbake/templates/index.ftl | 26 +++++++++++++++-----------
4 files changed, 19 insertions(+), 14 deletions(-)
create mode 120000 jbake/assets/img/favicon.ico
[shiro-site] 01/03: fix self link to page 1.
Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/shiro-site.git
commit 01e4f1c440f21a30cd3da379af96a81a699c8543
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Fri Oct 22 12:26:53 2021 +0200
fix self link to page 1.
---
jbake/templates/index.ftl | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/jbake/templates/index.ftl b/jbake/templates/index.ftl
index 99f20b0..c7f4acc 100644
--- a/jbake/templates/index.ftl
+++ b/jbake/templates/index.ftl
@@ -133,7 +133,11 @@
<#else>
<li class="page-item disabled" aria-disabled="true" disabled><a class="page-link" rel="prev" href="#">Previous</a></li>
</#if>
+ <#if (currentPageNumber == 1)>
+ <li class="page-item"><a class="page-link" rel="self" href="<#if (content.rootpath)??>${content.rootpath}</#if>">${currentPageNumber}</a></li>
+ <#else>
<li class="page-item"><a class="page-link" rel="self" href="<#if (content.rootpath)??>${content.rootpath}</#if>${currentPageNumber}">${currentPageNumber}</a></li>
+ </#if>
<#if (currentPageNumber < numberOfPages)>
<li class="page-item"><a class="page-link" rel="next" href="<#if (content.rootpath)??>${content.rootpath}</#if>${currentPageNumber + 1}">Next</a></li>
<#else>
[shiro-site] 02/03: fix favicon.ico.
Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/shiro-site.git
commit 2fb745897ac4e5598e52a9c76a8a6b047bee8ef6
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Fri Oct 22 12:29:12 2021 +0200
fix favicon.ico.
---
jbake/assets/.htaccess | 2 +-
jbake/assets/img/favicon.ico | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/jbake/assets/.htaccess b/jbake/assets/.htaccess
index a5502c9..c83bd00 100644
--- a/jbake/assets/.htaccess
+++ b/jbake/assets/.htaccess
@@ -1,4 +1,4 @@
-RedirectMatch ^/favicon.ico /assets/images/favicon.ico
+RedirectMatch ^/favicon.ico /img/favicon.ico
RedirectMatch ^/shiro-all(.*) /static/current/shiro-all/$1
RedirectMatch ^/shiro-core(.*) /static/current/shiro-core/$1
diff --git a/jbake/assets/img/favicon.ico b/jbake/assets/img/favicon.ico
new file mode 120000
index 0000000..cf3a36c
--- /dev/null
+++ b/jbake/assets/img/favicon.ico
@@ -0,0 +1 @@
+../favicon.ico
\ No newline at end of file
[shiro-site] 03/03: fix dead links on paging,
fix anchor from tutorial.
Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a commit to branch jbake
in repository https://gitbox.apache.org/repos/asf/shiro-site.git
commit afc41cbbeed527d8750ae44821ec1fe40e1f8ca7
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Fri Oct 22 12:34:52 2021 +0200
fix dead links on paging, fix anchor from tutorial.
---
jbake/content/10-minute-tutorial.adoc | 4 ++--
jbake/templates/index.ftl | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/jbake/content/10-minute-tutorial.adoc b/jbake/content/10-minute-tutorial.adoc
index a23a44c..c752d9e 100644
--- a/jbake/content/10-minute-tutorial.adoc
+++ b/jbake/content/10-minute-tutorial.adoc
@@ -30,7 +30,7 @@ At least that's what we strive for.
A lot 😉.
But we don't want to bloat the QuickStart.
Please check out our link:features.html[Features] page if you'd like to see what it can do for you.
-Also, if you're curious on how we got started and why we exist, please see the link:what-is-shiro.html[Shiro History and Mission] page.
+Also, if you're curious on how we got started and why we exist, please see the link:/what-is-shiro.html[Shiro History and Mission] page.
Ok.
Now let's actually do something!
@@ -80,7 +80,7 @@ In almost all environments, you can obtain the currently executing user via the
Subject currentUser = SecurityUtils.getSubject();
----
-Using link:static/current/apidocs/org/apache/shiro/SecurityUtils.html[`SecurityUtils`].link:static/current/apidocs/org/apache/shiro/SecurityUtils.html#getSubject--[`getSubject()`], we can obtain the currently executing link:static/current/apidocs/org/apache/shiro/subject/Subject.html[`Subject`].
+Using link:static/current/apidocs/org/apache/shiro/SecurityUtils.html[`SecurityUtils`].link:static/current/apidocs/org/apache/shiro/SecurityUtils.html#getSubject()[`getSubject()`], we can obtain the currently executing link:static/current/apidocs/org/apache/shiro/subject/Subject.html[`Subject`].
A _Subject_ is just a security-specific "view" of an application User.
We actually wanted to call it 'User' since that "just makes sense", but we decided against it: too many applications have existing APIs that already have their own User classes/frameworks, and we didn't want to conflict with those.
Also, in the security world, the term `Subject` is actually the recognized nomenclature.
diff --git a/jbake/templates/index.ftl b/jbake/templates/index.ftl
index c7f4acc..6ff80c4 100644
--- a/jbake/templates/index.ftl
+++ b/jbake/templates/index.ftl
@@ -17,8 +17,8 @@
<ul>
<li><a href="https://www.infoq.com/articles/apache-shiro">What is Apache Shiro?</a></li>
- <li><a href="10-minute-tutorial.html">10 Minute Tutorial</a></li>
- <li><a href="articles.html">More articles...</a></li>
+ <li><a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>10-minute-tutorial.html">10 Minute Tutorial</a></li>
+ <li><a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>articles.html">More articles...</a></li>
</ul>
</div>
@@ -39,7 +39,7 @@
</div>
<div class="card-body shadow-sm pb-2">
<p>Support logins across one or more pluggable data sources (LDAP, JDBC, Active Directory...</p>
- <a href="authentication-features.html"><span class="more">Read More >>></span></a>
+ <a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>authentication-features.html"><span class="more">Read More >>></span></a>
</div>
</div>
@@ -49,7 +49,7 @@
</div>
<div class="card-body shadow-sm pb-2">
<p>Perform access control based on roles or fine grained permissions, also using plug...</p>
- <a href="authorization-features.html"><span class="more">Read More >>></span></a>
+ <a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>authorization-features.html"><span class="more">Read More >>></span></a>
</div>
</div>
</div>
@@ -61,7 +61,7 @@
</div>
<div class="card-body shadow-sm pb-2">
<p>Secure data with the easiest possible Cryptography API’s available, giving you...</p>
- <a href="cryptography-features.html"><span class="more">Read More >>></span></a>
+ <a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>cryptography-features.html"><span class="more">Read More >>></span></a>
</div>
</div>
@@ -71,7 +71,7 @@
</div>
<div class="card-body shadow-sm pb-2">
<p>Use sessions in any environment, even outside web or EJB containers. Easily...</p>
- <a href="session-management-features.html"><span class="more">Read More >>></span></a>
+ <a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>session-management-features.html"><span class="more">Read More >>></span></a>
</div>
</div>
</div>
@@ -83,7 +83,7 @@
</div>
<div class="card-body shadow-sm pb-2">
<p>Save development time with innovative approaches that easily handle web specific...</p>
- <a href="web-features.html"><span class="more">Read More >>></span></a>
+ <a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>web-features.html"><span class="more">Read More >>></span></a>
</div>
</div>
@@ -93,7 +93,7 @@
</div>
<div class="card-body shadow-sm pb-2">
<p>API’s giving you power and simplicty beyond what Java provides by default...</p>
- <a href="integration.html"><span class="more">Read More >>></span></a>
+ <a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>integration.html"><span class="more">Read More >>></span></a>
</div>
</div>
</div>
@@ -155,15 +155,15 @@
<div class="card-body">
<div>
- <a href="java-authentication-guide.html"><h4 class="popular-guides">Java Authentication Guide</h4></a>
+ <a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>java-authentication-guide.html"><h4 class="popular-guides">Java Authentication Guide</h4></a>
<p><small>Learn how Shiro securely verifies identities.</small></p>
</div>
<div>
- <a href="java-authorization-guide.html"><h4 class="popular-guides">Java Authorization Guide</h4></a>
+ <a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>java-authorization-guide.html"><h4 class="popular-guides">Java Authorization Guide</h4></a>
<p><small>Learn how Shiro handles permissions, roles and users.</small></p>
</div>
<div>
- <a href="webapp-tutorial.html"><h4 class="popular-guides">Web App Tutorial</h4></a>
+ <a href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>webapp-tutorial.html"><h4 class="popular-guides">Web App Tutorial</h4></a>
<p><small>Step-by-step tutorial for securing a web application with Apache Shiro.</small></p>
</div>
<div>