[jboss-cvs] JBossBlog SVN: r165 - in trunk/src/action/org/jboss/blog/session: feed/type and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 7 12:41:09 EST 2008
Author: adamw
Date: 2008-01-07 12:41:09 -0500 (Mon, 07 Jan 2008)
New Revision: 165
Added:
trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java
Modified:
trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java
trunk/src/action/org/jboss/blog/session/feed/mod/RemoteFeedModBean.java
trunk/src/action/org/jboss/blog/session/feed/type/FeedTypes.java
trunk/src/action/org/jboss/blog/session/scanner/AnnotationScanner.java
trunk/src/action/org/jboss/blog/session/scanner/Init.java
Log:
Modified: trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java 2008-01-07 16:29:09 UTC (rev 164)
+++ trunk/src/action/org/jboss/blog/session/feed/mod/AggregatedFeedModBean.java 2008-01-07 17:41:09 UTC (rev 165)
@@ -4,7 +4,6 @@
import org.jboss.blog.model.feed.Feed;
import org.jboss.blog.model.Post;
import org.jboss.blog.service.FeedsService;
-import org.jboss.blog.session.feed.FeedModBean;
import org.jboss.blog.session.feed.InvalidFeedTypeException;
import org.jboss.blog.session.view.LinkServiceBean;
import org.jboss.blog.tools.GeneralTools;
Copied: trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java (from rev 164, trunk/src/action/org/jboss/blog/session/feed/FeedModBean.java)
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java (rev 0)
+++ trunk/src/action/org/jboss/blog/session/feed/mod/FeedModBean.java 2008-01-07 17:41:09 UTC (rev 165)
@@ -0,0 +1,80 @@
+package org.jboss.blog.session.feed.mod;
+
+import org.jboss.blog.model.feed.Feed;
+import org.jboss.blog.model.Post;
+import org.jboss.blog.model.Template;
+import org.jboss.blog.model.XmlType;
+import org.jboss.blog.session.merge.MergeServiceBean;
+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 org.jboss.seam.faces.FacesMessages;
+
+import javax.faces.application.FacesMessage;
+import javax.persistence.EntityManager;
+import java.io.Serializable;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+ at Scope(ScopeType.CONVERSATION)
+ at Name("feedMod")
+ at AutoCreate
+public class FeedModBean implements Serializable {
+ private Feed feed;
+
+ @In
+ private EntityManager entityManager;
+
+ @In
+ private FacesMessages facesMessages;
+
+ @In
+ private MergeServiceBean mergeService;
+
+ public void initNewFeed(Feed feed) {
+ this.feed = feed;
+ feed.setMaxPostsInFeed(10);
+ feed.setMaxPostsOnPage(10);
+ feed.setTemplates(new HashMap<XmlType, Template>());
+ }
+
+ public Feed getFeed() {
+ return feed;
+ }
+
+ public void setFeed(Feed feed) {
+ this.feed = feed;
+ }
+
+ public XmlType[] getTemplateTypes() {
+ return new XmlType[] { XmlType.ATOM };
+ }
+
+ public void saveNew() {
+ entityManager.persist(feed);
+
+ for (Post post : feed.getPosts()) {
+ mergeService.savePost(feed, post);
+ }
+
+ entityManager.flush();
+
+ facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.feed.added", getFeed().getName());
+ }
+
+ public void saveExisting() {
+ entityManager.flush();
+
+ facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.feed.updated", getFeed().getName());
+ }
+
+ public void delete() {
+ entityManager.remove(getFeed());
+
+ facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.feed.deleted", getFeed().getName());
+ }
+}
Modified: trunk/src/action/org/jboss/blog/session/feed/mod/RemoteFeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/mod/RemoteFeedModBean.java 2008-01-07 16:29:09 UTC (rev 164)
+++ trunk/src/action/org/jboss/blog/session/feed/mod/RemoteFeedModBean.java 2008-01-07 17:41:09 UTC (rev 165)
@@ -2,7 +2,6 @@
import org.jboss.blog.model.feed.Feed;
import org.jboss.blog.model.feed.RemoteFeed;
-import org.jboss.blog.session.feed.FeedModBean;
import org.jboss.blog.session.feed.InvalidFeedTypeException;
import org.jboss.blog.session.parser.ParserException;
import org.jboss.blog.session.parser.ParserService;
Modified: trunk/src/action/org/jboss/blog/session/feed/type/FeedTypes.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/type/FeedTypes.java 2008-01-07 16:29:09 UTC (rev 164)
+++ trunk/src/action/org/jboss/blog/session/feed/type/FeedTypes.java 2008-01-07 17:41:09 UTC (rev 165)
@@ -76,7 +76,7 @@
return;
}
- log.info("Registering feed dao class: ", daoClass.getName(), ".");
+ log.info("Registering feed dao class: #0.", daoClass.getName());
feedDaos.put(feedType.model(), constructor);
feedTypes.put(feedType.model(), feedType);
Modified: trunk/src/action/org/jboss/blog/session/scanner/AnnotationScanner.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/scanner/AnnotationScanner.java 2008-01-07 16:29:09 UTC (rev 164)
+++ trunk/src/action/org/jboss/blog/session/scanner/AnnotationScanner.java 2008-01-07 17:41:09 UTC (rev 165)
@@ -34,7 +34,7 @@
this.classLoader = classLoader;
this.handlers = handlers;
-
+
}
private void addParentURLsOfResource(Set<String> urlPaths, String resourceName) throws IOException {
@@ -131,8 +131,7 @@
}
}
- private ClassFile getClassFile(String name) throws IOException
- {
+ private ClassFile getClassFile(String name) throws IOException {
InputStream stream = classLoader.getResourceAsStream(name);
DataInputStream dstream = new DataInputStream(stream);
@@ -149,7 +148,8 @@
}
private void scanItem(String name) throws IOException {
- if (name.endsWith(".class")) {
+ // TODO: fix - remove the second part
+ if (name.endsWith(".class") && name.startsWith("org/jboss/blog/session/feed/dao")) {
ClassFile classFile = getClassFile(name);
AnnotationsAttribute visibleAnnotations = (AnnotationsAttribute)
Modified: trunk/src/action/org/jboss/blog/session/scanner/Init.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/scanner/Init.java 2008-01-07 16:29:09 UTC (rev 164)
+++ trunk/src/action/org/jboss/blog/session/scanner/Init.java 2008-01-07 17:41:09 UTC (rev 165)
@@ -5,6 +5,8 @@
import org.jboss.seam.core.Events;
import org.jboss.blog.session.feed.type.FeedType;
import org.jboss.blog.session.feed.type.FeedTypes;
+import org.jboss.blog.session.feed.dao.AggregatedFeedDao;
+import org.jboss.blog.session.feed.dao.RemoteFeedDao;
import java.util.Map;
import java.util.HashMap;
@@ -27,7 +29,9 @@
handlers.put(FeedType.class, feedTypes);
- new AnnotationScanner(Thread.currentThread().getContextClassLoader(), handlers).scan();
+ //new AnnotationScanner(Thread.currentThread().getContextClassLoader(), handlers).scan();
+ feedTypes.handleClass(AggregatedFeedDao.class);
+ feedTypes.handleClass(RemoteFeedDao.class);
Events.instance().raiseEvent("org.jboss.blog.postBlogInit");
}
More information about the jboss-cvs-commits
mailing list