[jboss-cvs] JBossBlog SVN: r320 - in trunk: resources/templates and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: adamw
Date: 2008-06-27 10:24:49 -0400 (Fri, 27 Jun 2008)
New Revision: 320

Removed:
   trunk/view/error.xhtml
Modified:
   trunk/resources/WEB-INF/pages.xml
   trunk/resources/templates/rss2_standard.vm
   trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java
   trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateBootstrap.java
Log:
Bringing back rss2 feeds

Modified: trunk/resources/WEB-INF/pages.xml
===================================================================
--- trunk/resources/WEB-INF/pages.xml	2008-06-10 10:16:58 UTC (rev 319)
+++ trunk/resources/WEB-INF/pages.xml	2008-06-27 14:24:49 UTC (rev 320)
@@ -425,7 +425,7 @@
 
     <!-- Exceptions -->
 
-    <!-- add in 2.0.2: log="false" -->
+    <!-- TODO add in 2.0.2: log="false" -->
     <exception class="org.jboss.blog.session.exceptions.FeedNotFoundRuntimeException">
         <redirect view-id="/error/feed_error.xhtml">
             <message>The requested feed hasn't been found.</message>

Modified: trunk/resources/templates/rss2_standard.vm
===================================================================
--- trunk/resources/templates/rss2_standard.vm	2008-06-10 10:16:58 UTC (rev 319)
+++ trunk/resources/templates/rss2_standard.vm	2008-06-27 14:24:49 UTC (rev 320)
@@ -6,7 +6,6 @@
         <channel>
                 <title>$feed.title</title>
                 <link>$tools.feedPageLink($feed)</link>
-                <description>$feed.description</description>
                 <language>en</language>
                 <docs>http://blogs.law.harvard.edu/tech/rss</docs>
                 <generator>JBoss Feeds</generator>
@@ -20,7 +19,7 @@
                         <description><![CDATA[$post.content]]></description>
                         <guid>$tools.postLink($post)</guid>
                         <pubDate>$tools.formatDate($post.published)</pubDate>
-                        <dc:creator>$post.author</dc:creator>
+                        <dc:creator>$post.effectiveAuthor</dc:creator>
                 </item>
                 #end
 

Modified: trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java	2008-06-10 10:16:58 UTC (rev 319)
+++ trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java	2008-06-27 14:24:49 UTC (rev 320)
@@ -73,7 +73,7 @@
     }
 
     public XmlType[] getTemplateTypes() {
-        return new XmlType[] { XmlType.ATOM };
+        return new XmlType[] { XmlType.ATOM, XmlType.RSS2 };
     }
 
     @Observer("org.jboss.blog.feed.accept")

Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateBootstrap.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateBootstrap.java	2008-06-10 10:16:58 UTC (rev 319)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateBootstrap.java	2008-06-27 14:24:49 UTC (rev 320)
@@ -36,4 +36,22 @@
             entityManager.flush();
         }
     }
+
+    @Observer("org.jboss.blog.postBlogInit")
+    @Transactional
+    public void initRss2Template() throws IOException {
+        if (((Long) entityManager.createQuery("select count(t) from Template t").getSingleResult()) == 0) {
+            String templateText = GeneralTools.readInputStream(
+                    this.getClass().getResourceAsStream("/templates/rss2_standard.vm"));
+
+            Template rss2Template = new Template();
+            rss2Template.setType(XmlType.RSS2);
+            rss2Template.setLastModified(new Date());
+            rss2Template.setName("0_rss2_standard");
+            rss2Template.setText(templateText);
+
+            entityManager.persist(rss2Template);
+            entityManager.flush();
+        }
+    }
 }

Deleted: trunk/view/error.xhtml
===================================================================
--- trunk/view/error.xhtml	2008-06-10 10:16:58 UTC (rev 319)
+++ trunk/view/error.xhtml	2008-06-27 14:24:49 UTC (rev 320)
@@ -1,16 +0,0 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:s="http://jboss.com/products/seam/taglib"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:h="http://java.sun.com/jsf/html"
-                template="layout/template.xhtml">
-    <ui:define name="header">
-        Error
-    </ui:define>
-
-    <ui:define name="body">
-        <p>Something bad happened :-(</p>
-    </ui:define>
-</ui:composition>