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 2022/02/11 08:05:58 UTC

[shiro-site] 01/01: [SHIRO-855] provide a valid feed.

This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a commit to branch SHIRO-855_valid_feed
in repository https://gitbox.apache.org/repos/asf/shiro-site.git

commit 29aafb4633d16f8fa41150a38a103a0350fb0116
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Fri Feb 11 09:05:04 2022 +0100

    [SHIRO-855] provide a valid feed.
---
 pom.xml                                            |   2 +-
 src/site/assets/images/favicon128.png              | Bin 0 -> 11821 bytes
 ...o-video-and-slide-from-sf-jug-presentation.adoc |   2 +-
 ...-shiro-integration-for-grails-113-released.adoc |   2 +-
 src/site/templates/feed.ftl                        |  77 ++++++++++++++-------
 5 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 92c9ac8..611349b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
           <dependency>
             <groupId>org.jbake</groupId>
             <artifactId>jbake-core</artifactId>
-            <version>2.7.0-rc.4</version>
+            <version>2.7.0-rc.5</version>
           </dependency>
           <dependency>
             <groupId>org.asciidoctor</groupId>
diff --git a/src/site/assets/images/favicon128.png b/src/site/assets/images/favicon128.png
new file mode 100644
index 0000000..cf7a456
Binary files /dev/null and b/src/site/assets/images/favicon128.png differ
diff --git a/src/site/content/blog/2011/01/06/apache-shiro-video-and-slide-from-sf-jug-presentation.adoc b/src/site/content/blog/2011/01/06/apache-shiro-video-and-slide-from-sf-jug-presentation.adoc
index 5e873cb..4fa392c 100644
--- a/src/site/content/blog/2011/01/06/apache-shiro-video-and-slide-from-sf-jug-presentation.adoc
+++ b/src/site/content/blog/2011/01/06/apache-shiro-video-and-slide-from-sf-jug-presentation.adoc
@@ -1,6 +1,6 @@
 = Apache Shiro video and slide from SF JUG (Presentation)
 Alex Salazar
-:jbake-date: 2011-01-13
+:jbake-date: 2011-01-06
 :jbake-type: post
 :jbake-status: published
 :jbake-tags: blog, guide
diff --git a/src/site/content/blog/2011/02/10/apache-shiro-integration-for-grails-113-released.adoc b/src/site/content/blog/2011/02/10/apache-shiro-integration-for-grails-113-released.adoc
index ef395c9..04a11c1 100644
--- a/src/site/content/blog/2011/02/10/apache-shiro-integration-for-grails-113-released.adoc
+++ b/src/site/content/blog/2011/02/10/apache-shiro-integration-for-grails-113-released.adoc
@@ -1,6 +1,6 @@
 = Apache Shiro integration for Grails 1.1.3 released
 Alex Salazar
-:jbake-date: 2011-02-28
+:jbake-date: 2011-02-10
 :jbake-type: post
 :jbake-status: published
 :jbake-tags: blog, guide
diff --git a/src/site/templates/feed.ftl b/src/site/templates/feed.ftl
index 2ce2cb7..838f7c9 100644
--- a/src/site/templates/feed.ftl
+++ b/src/site/templates/feed.ftl
@@ -1,27 +1,54 @@
-<?xml version="1.0"? encoding="UTF-8" ?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>Apache Shiro | The Apache Software Foundation</title>
-    <link>${config.site_host}</link>
-    <atom:link href="${config.site_host}/${config.feed_file}" rel="self" type="application/rss+xml" />
-    <description>Apache Shiro | News, Blog, Updates | The Apache Software Foundation</description>
-    <language>en-gb</language>
-    <pubDate>${published_date?string("EEE, d MMM yyyy HH:mm:ss Z")}</pubDate>
-    <lastBuildDate>${published_date?string("EEE, d MMM yyyy HH:mm:ss Z")}</lastBuildDate>
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title>Apache Shiro | The Apache Software Foundation</title>
+  <subtitle>Simple. Java. Security.</subtitle>
+  <link href="https://shiro.apache.org/"/>
+  <link rel="self" href="${config.site_host}/${config.feed_file}" />
+  <updated>${published_date?datetime?iso_utc}</updated>
+  <#assign authors = data.get('authors.yaml').authors>
+  <#--
+    needed because data doesn't return a hash but an object.
+    The names are likely to contain a space (for now).
+  -->
+  <#assign authornames = authors?keys?filter(key -> key.contains(" "))>
 
-    <#list published_posts as post>
-    <item>
-      <title><#escape x as x?xml>${post.title}</#escape></title>
-      <link>${config.site_host}/${post.uri}</link>
-      <pubDate>${post.date?string("EEE, d MMM yyyy HH:mm:ss Z")}</pubDate>
-      <guid isPermaLink="false">${post.uri}</guid>
-      	<description>
-	<#escape x as x?xml>	
-	${post.body}
-	</#escape>
-	</description>
-    </item>
-    </#list>
+  <#list authornames as authorname>
+  <author>
+    <name>${authorname}</name>
+    <#if (authors[authorname].email)??>
+    <email>${authors[authorname].email}</email>
+    </#if>
+    <#if (authors[authorname].twitter)??>
+    <uri>https://twitter.com/${authors[authorname].twitter}</uri>
+    </#if>
+  </author>
+  </#list>
+  <id>https://shiro.apache.org/</id>
+  <generator uri="https://jbake.org/">JBake.org</generator>
+  <icon>/images/favicon128.png</icon>
+  <logo>/images/apache-shiro-logo.png</logo>
 
-  </channel> 
-</rss>
+  <#list published_posts[0..*12] as post>
+  <entry>
+    <title>${post.title}</title>
+    <link href="${config.site_host}/${post.uri}"/>
+    <id>${config.site_host}/${post.uri}</id>
+    <updated>${post.date?date?string.iso_s_nz}</updated>
+    <#if (post.description??)>
+    <summary>${post.description}</summary>
+    </#if>
+    <#if (post.author??)>
+    <author>
+      <name>${post.author}</name>
+    </author>
+    </#if>
+    <content type="html">
+      <#escape x as x?xml>
+      ${post.body}
+      </#escape>
+    </content>
+  </entry>
+
+  </#list>
+
+</feed>