[jboss-cvs] JBossBlog SVN: r159 - in trunk/src: action/org/jboss/blog/session/xml/tools and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 10 06:16:30 EST 2007
Author: adamw
Date: 2007-12-10 06:16:30 -0500 (Mon, 10 Dec 2007)
New Revision: 159
Added:
trunk/src/action/org/jboss/blog/session/xml/tools/
trunk/src/action/org/jboss/blog/session/xml/tools/AtomXmlTools.java
trunk/src/action/org/jboss/blog/session/xml/tools/Rss2XmlTools.java
trunk/src/action/org/jboss/blog/session/xml/tools/XmlTools.java
trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateServiceBean.java
Removed:
trunk/src/action/org/jboss/blog/session/xml/tools/AtomTemplateTools.java
trunk/src/action/org/jboss/blog/session/xml/tools/Rss2TemplateTools.java
trunk/src/action/org/jboss/blog/session/xml/tools/TemplateTools.java
Modified:
trunk/src/action/org/jboss/blog/session/xml/XmlService.java
trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java
trunk/src/model/org/jboss/blog/model/XmlType.java
Log:
Modified: trunk/src/action/org/jboss/blog/session/xml/XmlService.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/XmlService.java 2007-12-10 11:04:38 UTC (rev 158)
+++ trunk/src/action/org/jboss/blog/session/xml/XmlService.java 2007-12-10 11:16:30 UTC (rev 159)
@@ -1,11 +1,7 @@
package org.jboss.blog.session.xml;
-import org.jboss.blog.model.Template;
-import org.jboss.blog.model.XmlType;
-
import javax.ejb.Local;
import javax.servlet.ServletResponse;
-import java.util.List;
/**
* @author <a href="mailto:adam at warski.org">Adam Warski</a>
@@ -15,9 +11,5 @@
void writeXml(String feedType, String feedName, ServletResponse response)
throws Exception;
- List<Template> getAllTemplates();
-
- List<Template> templatesOfType(XmlType type);
-
void remove();
}
Copied: trunk/src/action/org/jboss/blog/session/xml/tools (from rev 158, trunk/src/action/org/jboss/blog/session/xml/velocity/tools)
Deleted: trunk/src/action/org/jboss/blog/session/xml/tools/AtomTemplateTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/tools/AtomTemplateTools.java 2007-12-10 11:04:38 UTC (rev 158)
+++ trunk/src/action/org/jboss/blog/session/xml/tools/AtomTemplateTools.java 2007-12-10 11:16:30 UTC (rev 159)
@@ -1,16 +0,0 @@
-package org.jboss.blog.session.xml.velocity.tools;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * @author <a href="mailto:adam at warski.org">Adam Warski</a>
- */
-public class AtomTemplateTools extends TemplateTools {
- public String formatDate(Date date) {
- String noZoneDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(date);
- String zone = new SimpleDateFormat("Z").format(date);
-
- return noZoneDate + zone.substring(0, 3) + ":" + zone.substring(3, 5);
- }
-}
Added: trunk/src/action/org/jboss/blog/session/xml/tools/AtomXmlTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/tools/AtomXmlTools.java (rev 0)
+++ trunk/src/action/org/jboss/blog/session/xml/tools/AtomXmlTools.java 2007-12-10 11:16:30 UTC (rev 159)
@@ -0,0 +1,16 @@
+package org.jboss.blog.session.xml.tools;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+public class AtomXmlTools extends XmlTools {
+ public String formatDate(Date date) {
+ String noZoneDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(date);
+ String zone = new SimpleDateFormat("Z").format(date);
+
+ return noZoneDate + zone.substring(0, 3) + ":" + zone.substring(3, 5);
+ }
+}
Deleted: trunk/src/action/org/jboss/blog/session/xml/tools/Rss2TemplateTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/tools/Rss2TemplateTools.java 2007-12-10 11:04:38 UTC (rev 158)
+++ trunk/src/action/org/jboss/blog/session/xml/tools/Rss2TemplateTools.java 2007-12-10 11:16:30 UTC (rev 159)
@@ -1,13 +0,0 @@
-package org.jboss.blog.session.xml.velocity.tools;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * @author <a href="mailto:adam at warski.org">Adam Warski</a>
- */
-public class Rss2TemplateTools extends TemplateTools {
- public String formatDate(Date date) {
- return new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z").format(date);
- }
-}
Added: trunk/src/action/org/jboss/blog/session/xml/tools/Rss2XmlTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/tools/Rss2XmlTools.java (rev 0)
+++ trunk/src/action/org/jboss/blog/session/xml/tools/Rss2XmlTools.java 2007-12-10 11:16:30 UTC (rev 159)
@@ -0,0 +1,13 @@
+package org.jboss.blog.session.xml.tools;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+public class Rss2XmlTools extends XmlTools {
+ public String formatDate(Date date) {
+ return new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z").format(date);
+ }
+}
Deleted: trunk/src/action/org/jboss/blog/session/xml/tools/TemplateTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/tools/TemplateTools.java 2007-12-10 11:04:38 UTC (rev 158)
+++ trunk/src/action/org/jboss/blog/session/xml/tools/TemplateTools.java 2007-12-10 11:16:30 UTC (rev 159)
@@ -1,48 +0,0 @@
-package org.jboss.blog.session.xml.velocity.tools;
-
-import org.jboss.blog.model.Feed;
-import org.jboss.blog.model.Post;
-import org.jboss.blog.model.XmlType;
-import org.jboss.blog.session.view.LinkServiceBean;
-import org.jboss.seam.Component;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author <a href="mailto:adam at warski.org">Adam Warski</a>
- */
-public class TemplateTools {
- public String formatDate(Date date) {
- return new SimpleDateFormat("MM/dd/yy").format(date);
- }
-
- public Date feedPubDate(Feed feed, List<Post> posts) {
- if (posts.size() != 0) {
- return posts.get(0).getPublished();
- }
-
- Calendar cal = Calendar.getInstance();
- cal.setTimeInMillis(0);
-
- return cal.getTime();
- }
-
- private LinkServiceBean getLinkService() {
- return (LinkServiceBean) Component.getInstance("linkService");
- }
-
- public String feedPageLink(Feed feed) {
- return getLinkService().generateFeedPageLink(feed);
- }
-
- public String feedLink(Feed feed, XmlType type) {
- return getLinkService().generateFeedLink(feed, type);
- }
-
- public String postLink(Post post) {
- return getLinkService().generatePostLink(post);
- }
-}
Added: trunk/src/action/org/jboss/blog/session/xml/tools/XmlTools.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/tools/XmlTools.java (rev 0)
+++ trunk/src/action/org/jboss/blog/session/xml/tools/XmlTools.java 2007-12-10 11:16:30 UTC (rev 159)
@@ -0,0 +1,48 @@
+package org.jboss.blog.session.xml.tools;
+
+import org.jboss.blog.model.Feed;
+import org.jboss.blog.model.Post;
+import org.jboss.blog.model.XmlType;
+import org.jboss.blog.session.view.LinkServiceBean;
+import org.jboss.seam.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+public class XmlTools {
+ public String formatDate(Date date) {
+ return new SimpleDateFormat("MM/dd/yy").format(date);
+ }
+
+ public Date feedPubDate(Feed feed, List<Post> posts) {
+ if (posts.size() != 0) {
+ return posts.get(0).getPublished();
+ }
+
+ Calendar cal = Calendar.getInstance();
+ cal.setTimeInMillis(0);
+
+ return cal.getTime();
+ }
+
+ private LinkServiceBean getLinkService() {
+ return (LinkServiceBean) Component.getInstance("linkService");
+ }
+
+ public String feedPageLink(Feed feed) {
+ return getLinkService().generateFeedPageLink(feed);
+ }
+
+ public String feedLink(Feed feed, XmlType type) {
+ return getLinkService().generateFeedLink(feed, type);
+ }
+
+ public String postLink(Post post) {
+ return getLinkService().generatePostLink(post);
+ }
+}
Added: trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateServiceBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateServiceBean.java (rev 0)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateServiceBean.java 2007-12-10 11:16:30 UTC (rev 159)
@@ -0,0 +1,34 @@
+package org.jboss.blog.session.xml.velocity;
+
+import org.jboss.blog.model.Template;
+import org.jboss.blog.model.XmlType;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+import javax.persistence.EntityManager;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+ at Name("templateService")
+ at Scope(ScopeType.STATELESS)
+ at AutoCreate
+public class TemplateServiceBean {
+ @In
+ private EntityManager entityManager;
+
+ @SuppressWarnings("unchecked")
+ public List<Template> getAllTemplates() {
+ return entityManager.createQuery("select t from Template t order by t.name, t.type").getResultList();
+ }
+
+ @SuppressWarnings("unchecked")
+ public List<org.jboss.blog.model.Template> templatesOfType(XmlType type) {
+ return entityManager.createQuery("select t from Template t where t.type = ?1 order by t.name")
+ .setParameter(1, type).getResultList();
+ }
+}
Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java 2007-12-10 11:04:38 UTC (rev 158)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/VelocityXmlService.java 2007-12-10 11:16:30 UTC (rev 159)
@@ -30,9 +30,6 @@
@In
private FeedsService feedsService;
- @In
- private EntityManager entityManager;
-
private VelocityEngine engine;
@PostConstruct
@@ -77,17 +74,6 @@
template.merge(context, response.getWriter());
}
- @SuppressWarnings("unchecked")
- public List<org.jboss.blog.model.Template> getAllTemplates() {
- return entityManager.createQuery("select t from Template t order by t.name, t.type").getResultList();
- }
-
- @SuppressWarnings("unchecked")
- public List<org.jboss.blog.model.Template> templatesOfType(XmlType type) {
- return entityManager.createQuery("select t from Template t where t.type = ?1 order by t.name")
- .setParameter(1, type).getResultList();
- }
-
@Remove
public void remove() { }
}
Modified: trunk/src/model/org/jboss/blog/model/XmlType.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/XmlType.java 2007-12-10 11:04:38 UTC (rev 158)
+++ trunk/src/model/org/jboss/blog/model/XmlType.java 2007-12-10 11:16:30 UTC (rev 159)
@@ -1,28 +1,28 @@
package org.jboss.blog.model;
-import org.jboss.blog.session.xml.velocity.tools.TemplateTools;
-import org.jboss.blog.session.xml.velocity.tools.Rss2TemplateTools;
-import org.jboss.blog.session.xml.velocity.tools.AtomTemplateTools;
+import org.jboss.blog.session.xml.tools.Rss2XmlTools;
+import org.jboss.blog.session.xml.tools.XmlTools;
+import org.jboss.blog.session.xml.tools.AtomXmlTools;
/**
* @author <a href="mailto:adam at warski.org">Adam Warski</a>
*/
public enum XmlType {
- ATOM("application/atom+xml", AtomTemplateTools.class),
- RSS2("application/xhtml+xml", Rss2TemplateTools.class);
+ ATOM("application/atom+xml", AtomXmlTools.class),
+ RSS2("application/xhtml+xml", Rss2XmlTools.class);
private final String contentType;
- private final Class<? extends TemplateTools> tools;
+ private final Class<? extends XmlTools> tools;
public String contentType() {
return contentType;
}
- public Class<? extends TemplateTools> tools() {
+ public Class<? extends XmlTools> tools() {
return tools;
}
- XmlType(String contentType, Class<? extends TemplateTools> tools) {
+ XmlType(String contentType, Class<? extends XmlTools> tools) {
this.contentType = contentType;
this.tools = tools;
}
More information about the jboss-cvs-commits
mailing list