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/08 17:07:43 UTC
[shiro-site] branch jbake updated: convert redirect pages and move
robots.txt.
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
The following commit(s) were added to refs/heads/jbake by this push:
new eff5507 convert redirect pages and move robots.txt.
new d48e1f1 Merge pull request #107 from bmarwell/jbake
eff5507 is described below
commit eff55077ef48288aa31d9cc0acce0a4bd1f7e65a
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Fri Oct 8 19:06:51 2021 +0200
convert redirect pages and move robots.txt.
---
authentication-guide.html.vtl | 3 ---
banner.html.vtl | 2 --
confluence-auto-export.html.vtl | 2 --
robots.txt => jbake/assets/robots.txt | 0
jbake/content/authentication-guide.adoc | 7 +++++++
jbake/content/banner.adoc | 13 +++++++++++++
jbake/content/confluence-auto-export.adoc | 7 +++++++
jbake/content/performing-a-release.adoc | 7 +++++++
jbake/content/quickstart.adoc | 7 +++++++
jbake/content/sessionmanager.adoc | 7 +++++++
jbake/content/shiro-web/index.adoc | 13 +++++++++++++
jbake/templates/redirect.ftl | 7 ++++++-
performing-a-release.html.vtl | 2 --
quickstart.html.vtl | 2 --
sessionmanager.html.vtl | 2 --
shiro-web/index.html.vtl | 1 -
templates/macros/redirect.vtl | 11 -----------
17 files changed, 67 insertions(+), 26 deletions(-)
diff --git a/authentication-guide.html.vtl b/authentication-guide.html.vtl
deleted file mode 100644
index 45bd5d0..0000000
--- a/authentication-guide.html.vtl
+++ /dev/null
@@ -1,3 +0,0 @@
-#redirect('java-authentication-guide.html', 'Authentication Guide')
-
-<input type="hidden" id="ghEditPage" value="authentication-guide.html.vtl"></input>
diff --git a/banner.html.vtl b/banner.html.vtl
deleted file mode 100644
index a9953d4..0000000
--- a/banner.html.vtl
+++ /dev/null
@@ -1,2 +0,0 @@
-#redirect('index.html', 'Main Page')
-<input type="hidden" id="ghEditPage" value="banner.html.vtl"></input>
diff --git a/confluence-auto-export.html.vtl b/confluence-auto-export.html.vtl
deleted file mode 100644
index 663f0f8..0000000
--- a/confluence-auto-export.html.vtl
+++ /dev/null
@@ -1,2 +0,0 @@
-#redirect("index.html" ,"index.html")
-<input type="hidden" id="ghEditPage" value="confluence-auto-export.html.vtl"></input>
diff --git a/robots.txt b/jbake/assets/robots.txt
similarity index 100%
rename from robots.txt
rename to jbake/assets/robots.txt
diff --git a/jbake/content/authentication-guide.adoc b/jbake/content/authentication-guide.adoc
new file mode 100644
index 0000000..2921ad8
--- /dev/null
+++ b/jbake/content/authentication-guide.adoc
@@ -0,0 +1,7 @@
+= Authentication Guide
+:jbake-type: redirect
+:jbake-status: published
+:jbake-tags: redirect, java, authentication, guide
+:jbake-target: /java-authentication-guide.html
+:idprefix:
+:icons: font
diff --git a/jbake/content/banner.adoc b/jbake/content/banner.adoc
new file mode 100644
index 0000000..8e5e5d2
--- /dev/null
+++ b/jbake/content/banner.adoc
@@ -0,0 +1,13 @@
+= Banner
+:jbake-type: redirect
+:jbake-status: published
+:jbake-tags: redirect, tags, taglib
+:jbake-target: /index.html
+:idprefix:
+:icons: font
+
+[NOTICE]
+.Redirection Notice
+====
+This page link is outdated. It should redirect you to link:${linktarget}[].
+====
diff --git a/jbake/content/confluence-auto-export.adoc b/jbake/content/confluence-auto-export.adoc
new file mode 100644
index 0000000..18a8d9a
--- /dev/null
+++ b/jbake/content/confluence-auto-export.adoc
@@ -0,0 +1,7 @@
+= Confluence Auto Export
+:jbake-type: redirect
+:jbake-status: published
+:jbake-tags: redirect, cwiki, wiki, confluence, placeholder, legacy
+:jbake-target: /index.html
+:idprefix:
+:icons: font
diff --git a/jbake/content/performing-a-release.adoc b/jbake/content/performing-a-release.adoc
new file mode 100644
index 0000000..0a6b0e4
--- /dev/null
+++ b/jbake/content/performing-a-release.adoc
@@ -0,0 +1,7 @@
+= Performing a release
+:jbake-type: redirect
+:jbake-status: published
+:jbake-tags: redirect, release, developer, guide
+:jbake-target: https://cwiki.apache.org/confluence/display/SHIRO/Performing+a+Release
+:idprefix:
+:icons: font
diff --git a/jbake/content/quickstart.adoc b/jbake/content/quickstart.adoc
new file mode 100644
index 0000000..1c58cff
--- /dev/null
+++ b/jbake/content/quickstart.adoc
@@ -0,0 +1,7 @@
+= Apache Shiro Quickstart
+:jbake-type: redirect
+:jbake-status: published
+:jbake-tags: redirect, quickstart, guide
+:jbake-target: /10-minute-tutorial.html
+:idprefix:
+:icons: font
diff --git a/jbake/content/sessionmanager.adoc b/jbake/content/sessionmanager.adoc
new file mode 100644
index 0000000..f659320
--- /dev/null
+++ b/jbake/content/sessionmanager.adoc
@@ -0,0 +1,7 @@
+= Session Manager
+:jbake-type: redirect
+:jbake-status: published
+:jbake-tags: redirect, session, manager
+:jbake-target: /session-management.html
+:idprefix:
+:icons: font
diff --git a/jbake/content/shiro-web/index.adoc b/jbake/content/shiro-web/index.adoc
new file mode 100644
index 0000000..8683809
--- /dev/null
+++ b/jbake/content/shiro-web/index.adoc
@@ -0,0 +1,13 @@
+= Shiro-Web Current Javadoc Index
+:jbake-type: redirect
+:jbake-status: published
+:jbake-tags: redirect, javadoc, shiro-web
+:jbake-target: /static/current/shiro-web/index.html
+:idprefix:
+:icons: font
+
+[NOTICE]
+.Redirection Notice
+====
+This page should redirect to ${content.target}.
+====
diff --git a/jbake/templates/redirect.ftl b/jbake/templates/redirect.ftl
index 7331393..0316dc0 100644
--- a/jbake/templates/redirect.ftl
+++ b/jbake/templates/redirect.ftl
@@ -42,13 +42,18 @@
</#if>
<link rel=canonical href="${linktarget}">
- <meta http-equiv=refresh content="1; url=${linktarget}">
+ <meta http-equiv=refresh content="3; url=${linktarget}">
</head>
<body>
<h1>Redirecting...</h1>
+
+ <p>This page has been moved. You are being redirected.</p>
+
<a href="${linktarget}">Click here if you are not redirected.</a>
<script> document.location = "${linktarget}";</script>
+
+ <@content.body?interpret />
</body>
</html>
diff --git a/performing-a-release.html.vtl b/performing-a-release.html.vtl
deleted file mode 100644
index 9e0ebe0..0000000
--- a/performing-a-release.html.vtl
+++ /dev/null
@@ -1,2 +0,0 @@
-#redirect('https://cwiki.apache.org/confluence/display/SHIRO/Performing+a+Release', 'https://cwiki.apache.org/confluence/display/SHIRO/Performing+a+Release')
-<input type="hidden" id="ghEditPage" value="performing-a-release.html.vtl"></input>
diff --git a/quickstart.html.vtl b/quickstart.html.vtl
deleted file mode 100644
index 3b61166..0000000
--- a/quickstart.html.vtl
+++ /dev/null
@@ -1,2 +0,0 @@
-#redirect('10-minute-tutorial.html', '10 Minute Tutorial')
-<input type="hidden" id="ghEditPage" value="quickstart.html.vtl"></input>
diff --git a/sessionmanager.html.vtl b/sessionmanager.html.vtl
deleted file mode 100644
index c927801..0000000
--- a/sessionmanager.html.vtl
+++ /dev/null
@@ -1,2 +0,0 @@
-#redirect('session-management.html', 'Session Management')
-<input type="hidden" id="ghEditPage" value="sessionmanager.html.vtl"></input>
diff --git a/shiro-web/index.html.vtl b/shiro-web/index.html.vtl
deleted file mode 100644
index 472f409..0000000
--- a/shiro-web/index.html.vtl
+++ /dev/null
@@ -1 +0,0 @@
-#redirect("https://shiro.apache.org/static/current/shiro-web/index.html" ,"Shiro-Web")
diff --git a/templates/macros/redirect.vtl b/templates/macros/redirect.vtl
deleted file mode 100644
index 08e0fda..0000000
--- a/templates/macros/redirect.vtl
+++ /dev/null
@@ -1,11 +0,0 @@
-#macro(redirect $newHref, $title)
-<p>This page has been moved. You are being redirected.</p>
-
-#warning('Redirection Notice', "This page should redirect to <a href=""$newHref"" title=""$title"">$title</a>.")
-
-<script type="text/javascript">
- <!--
- window.location = "$newHref"
- //-->
-</script>
-#end
\ No newline at end of file