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 3c4ebb3 convert tags.html (redirect) and add redirect template. new a0e2f91 Merge pull request #105 from bmarwell/jbake 3c4ebb3 is described below commit 3c4ebb3f57f1dc7dff00755f107b5ed77c0ce52a Author: Benjamin Marwell <bmarw...@apache.org> AuthorDate: Fri Oct 8 13:47:35 2021 +0200 convert tags.html (redirect) and add redirect template. --- jbake/content/tags.adoc | 7 ++ jbake/jbake.properties | 1 + jbake/templates/redirect.ftl | 54 ++++++++++ sitemap.xml | 243 ------------------------------------------- tags.html | 7 -- 5 files changed, 62 insertions(+), 250 deletions(-) diff --git a/jbake/content/tags.adoc b/jbake/content/tags.adoc new file mode 100644 index 0000000..e008c38 --- /dev/null +++ b/jbake/content/tags.adoc @@ -0,0 +1,7 @@ += Taglib +:jbake-type: redirect +:jbake-status: published +:jbake-tags: redirect, tags, taglib +:jbake-target: https://github.com/apache/shiro/blob/main/web/src/main/resources/META-INF/shiro.tld +:idprefix: +:icons: font diff --git a/jbake/jbake.properties b/jbake/jbake.properties index 78e60a8..e2e1739 100644 --- a/jbake/jbake.properties +++ b/jbake/jbake.properties @@ -10,6 +10,7 @@ archive.file=news.html index.paginate=true index.posts_per_page=5 +template.redirect.file=redirect.ftl template.download.file=download.ftl template.lend_a_hand.file=lend_a_hand.ftl diff --git a/jbake/templates/redirect.ftl b/jbake/templates/redirect.ftl new file mode 100644 index 0000000..7331393 --- /dev/null +++ b/jbake/templates/redirect.ftl @@ -0,0 +1,54 @@ +<!DOCTYPE html> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE- 2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<html lang="en"> +<head> + <meta charset="utf-8"/> + <title> + <#if (content.title)?? && (content.title)?contains("|")> + <#-- The page has a full custom title, render it directly: --> + ${content.title} + <#elseif (content.title)??> + <#-- standard title, append the project name appended for SEO: --> + ${content.title} | Apache Shiro + <#else> + <#-- No title found in the page metadata, set the default: --> + Apache Shiro | Simple. Java. Security. + </#if> + </title> + + <link rel="shortcut icon" href="<#if (content.rootpath)??>${content.rootpath}<#else></#if>favicon.ico"> + <#if (content.target)?starts_with("http") || (content.target)?starts_with("//") > + <#assign linktarget="${content.target}" /> + <#elseif (content.target)?starts_with("/") > + <#assign linktarget="${content.rootpath}${content.target}" /> + <#else> + <#-- relative link --> + <#assign linktarget="${content.target}" /> + </#if> + + <link rel=canonical href="${linktarget}"> + <meta http-equiv=refresh content="1; url=${linktarget}"> +</head> + +<body> + <h1>Redirecting...</h1> + <a href="${linktarget}">Click here if you are not redirected.</a> + <script> document.location = "${linktarget}";</script> +</body> + +</html> diff --git a/sitemap.xml b/sitemap.xml deleted file mode 100644 index b4a9c8f..0000000 --- a/sitemap.xml +++ /dev/null @@ -1,243 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" - xmlns:image="http://www.google.com/schemas/sitemap-image/1.1"> - - <url> - <loc>https://shiro.apache.org/index.html</loc> - <priority>1</priority> - <image:image> - <image:loc>https://shiro.apache.org/assets/images/apache-shiro-logo.png</image:loc> - </image:image> - </url> - <url> - <loc>https://shiro.apache.org/permissions.html</loc> - <priority>0.8</priority> - </url> - <url> - <loc>https://shiro.apache.org/webapp-tutorial.html</loc> - <priority>0.8</priority> - </url> - - <url> - <loc>https://shiro.apache.org/10-minute-tutorial.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/about.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/adoption.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/architecture.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/articles.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/authentication-features.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/authentication.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/authorization-features.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/authorization.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/cachemanager.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/caching.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/cas.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/command-line-hasher.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/commercial-support.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/community.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/concurrency.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/conferences.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/configuration.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/core.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/cryptography-features.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/cryptography.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/developer-resources.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/developers.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/documentation-help-block.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/documentation.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/download.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/events.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/features.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/forums.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/get-started.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/getting-started-block.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/graduation-resolution.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/guice.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/guides.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/how-to-contribute.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/inclusionslibrary.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/integration.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/introduction.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/issues.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/java-annotations-list.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/java-annotations.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/java-authentication-guide.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/java-authorization-guide.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/java-cryptography-guide.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/jsp-tag-library.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/license.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/mailing-lists.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/navigation.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/news.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/overview.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/powered-by-shiro.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/privacy-policy.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/realm.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/reference.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/security-reports.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/securitymanager.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/session-management-features.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/session-management.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/site.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/siteheader.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/spring.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/spring-boot.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/subject.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/support.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/team.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/terminology.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/testing.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/tools.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/tutorial.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/version-2-brainstorming.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/web-features.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/web.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/what-is-shiro.html</loc> - </url> - <url> - <loc>https://shiro.apache.org/wiki-todos.html</loc> - </url> -</urlset> \ No newline at end of file diff --git a/tags.html b/tags.html deleted file mode 100644 index 4c1c524..0000000 --- a/tags.html +++ /dev/null @@ -1,7 +0,0 @@ -<script type="text/javascript"> -<!-- -window.location = "https://github.com/apache/shiro/blob/main/web/src/main/resources/META-INF/shiro.tld" -//--> -</script> - -<input type="hidden" id="ghEditPage" value="tags.html"></input>