[jboss-cvs] JBossBlog SVN: r17 - in trunk: . blog-core/src/etc/META-INF blog-core/src/java/org/jboss/blog/service blog-core/src/java/org/jboss/blog/service/model

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Nov 2 09:57:41 EST 2006


Author: adamw
Date: 2006-11-02 09:57:35 -0500 (Thu, 02 Nov 2006)
New Revision: 17

Added:
   trunk/blog-core/src/java/org/jboss/blog/service/model/
   trunk/blog-core/src/java/org/jboss/blog/service/model/BlogModelService.java
   trunk/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java
   trunk/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java
Removed:
   trunk/blog-core/src/java/org/jboss/blog/service/category/
   trunk/blog-core/src/java/org/jboss/blog/service/model/BlogCategoryService.java
   trunk/blog-core/src/java/org/jboss/blog/service/model/CachingBlogCategoryService.java
   trunk/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogCategoryService.java
Modified:
   trunk/blog-core/src/etc/META-INF/jboss-service.xml
   trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java
   trunk/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java
   trunk/jbossblog.iws
Log:
http://jira.jboss.com/jira/browse/JBBLOG-8

Modified: trunk/blog-core/src/etc/META-INF/jboss-service.xml
===================================================================
--- trunk/blog-core/src/etc/META-INF/jboss-service.xml	2006-11-02 14:53:30 UTC (rev 16)
+++ trunk/blog-core/src/etc/META-INF/jboss-service.xml	2006-11-02 14:57:35 UTC (rev 17)
@@ -11,8 +11,8 @@
                 optional-attribute-name="NameService"
                 proxy-type="attribute">blog:service=Name</depends>
         <depends
-                optional-attribute-name="CategoryService"
-                proxy-type="attribute">blog:service=Category</depends>
+                optional-attribute-name="ModelyService"
+                proxy-type="attribute">blog:service=Model</depends>
         <depends
                 optional-attribute-name="PermissionsService"
                 proxy-type="attribute">blog:service=Permissions</depends>
@@ -42,16 +42,16 @@
     </mbean>
 
     <!-- Model service -->
-    <mbean code="org.jboss.blog.service.category.CachingBlogCategoryService"
-           name="blog:service=Category"
-           xmbean-dd="org/jboss/blog/service/category/CachingBlogCategoryService.xml">
+    <mbean code="org.jboss.blog.service.model.CachingBlogModelService"
+           name="blog:service=Model"
+           xmbean-dd="org/jboss/blog/service/model/CachingBlogModelService.xml">
         <depends
-                optional-attribute-name="DelegateCategoryService"
-                proxy-type="attribute">blog:service=RomeParsingCategory</depends>
+                optional-attribute-name="DelegateModelService"
+                proxy-type="attribute">blog:service=RomeParsingModel</depends>
     </mbean>
-    <mbean code="org.jboss.blog.service.category.RomeParsingBlogCategoryService"
-           name="blog:service=RomeParsingCategory"
-           xmbean-dd="org/jboss/blog/service/category/RomeParsingBlogCategoryService.xml">
+    <mbean code="org.jboss.blog.service.model.RomeParsingBlogModelService"
+           name="blog:service=RomeParsingModel"
+           xmbean-dd="org/jboss/blog/service/model/RomeParsingBlogModelService.xml">
     </mbean>
 
     <!-- Permissions service -->

Modified: trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java	2006-11-02 14:53:30 UTC (rev 16)
+++ trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java	2006-11-02 14:57:35 UTC (rev 17)
@@ -2,7 +2,7 @@
 
 import org.jboss.blog.service.permissions.BlogPermissionsService;
 import org.jboss.blog.service.name.BlogNameService;
-import org.jboss.blog.service.category.BlogCategoryService;
+import org.jboss.blog.service.model.BlogModelService;
 import org.jboss.blog.service.configuration.BlogConfigurationService;
 import org.jboss.blog.service.store.BlogStoreService;
 
@@ -18,8 +18,8 @@
     public BlogNameService getNameService();
     public void setNameService(BlogNameService nameService);
     
-    public BlogCategoryService getModelService();
-    public void setModelService(BlogCategoryService categoryService);
+    public BlogModelService getModelService();
+    public void setModelService(BlogModelService modelService);
 
     public BlogConfigurationService getConfigurationService();
     public void setConfigurationService(BlogConfigurationService configurationService);

Modified: trunk/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java	2006-11-02 14:53:30 UTC (rev 16)
+++ trunk/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java	2006-11-02 14:57:35 UTC (rev 17)
@@ -1,7 +1,7 @@
 package org.jboss.blog.service;
 
 import org.jboss.blog.service.name.BlogNameService;
-import org.jboss.blog.service.category.BlogCategoryService;
+import org.jboss.blog.service.model.BlogModelService;
 import org.jboss.blog.service.permissions.BlogPermissionsService;
 import org.jboss.blog.service.configuration.BlogConfigurationService;
 import org.jboss.blog.service.store.BlogStoreService;
@@ -19,7 +19,7 @@
     }
 
     private BlogNameService nameService;
-    private BlogCategoryService categoryService;
+    private BlogModelService modelService;
     private BlogPermissionsService permissionsService;
     private BlogConfigurationService configurationService;
     private BlogStoreService storeService;
@@ -55,15 +55,15 @@
     /**
      * @jmx.managed-attribute
      */
-    public BlogCategoryService getModelService() {
-        return categoryService;
+    public BlogModelService getModelService() {
+        return modelService;
     }
 
     /**
      * @jmx.managed-attribute
      */
-    public void setModelService(BlogCategoryService categoryService) {
-        this.categoryService = categoryService;
+    public void setModelService(BlogModelService modelService) {
+        this.modelService = modelService;
     }
 
     /**

Copied: trunk/blog-core/src/java/org/jboss/blog/service/model (from rev 16, trunk/blog-core/src/java/org/jboss/blog/service/category)

Deleted: trunk/blog-core/src/java/org/jboss/blog/service/model/BlogCategoryService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/category/BlogCategoryService.java	2006-11-02 14:53:30 UTC (rev 16)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/BlogCategoryService.java	2006-11-02 14:57:35 UTC (rev 17)
@@ -1,22 +0,0 @@
-package org.jboss.blog.service.category;
-
-import org.jboss.blog.BlogName;
-import org.jboss.blog.model.BlogModel;
-import org.jboss.blog.model.BlogCategoryDoesNotExistException;
-
-/**
- * A service which enables to obtain a blog category (parsed blog information and
- * entries), having a blog name.
- * @author Adam Warski (adamw at aster.pl)
- */
-public interface BlogCategoryService {
-    /**
-     * Basing on the given blog name, reads (parses/ creates/ etc) a blog
-     * category.
-     * @param name Name of the blog for which the model should be read.
-     * @return A category of a blog with the given name.
-     * @throws org.jboss.blog.model.BlogCategoryDoesNotExistException If a blog
-     * with the given name couldn't be found.
-     */
-    public BlogModel getBlogCategory(BlogName name) throws BlogCategoryDoesNotExistException;
-}

Added: trunk/blog-core/src/java/org/jboss/blog/service/model/BlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/category/BlogModelService.java	2006-11-02 14:53:30 UTC (rev 16)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/BlogModelService.java	2006-11-02 14:57:35 UTC (rev 17)
@@ -0,0 +1,22 @@
+package org.jboss.blog.service.model;
+
+import org.jboss.blog.BlogName;
+import org.jboss.blog.model.BlogModel;
+import org.jboss.blog.model.BlogCategoryDoesNotExistException;
+
+/**
+ * A service which enables to obtain a blog category (parsed blog information and
+ * entries), having a blog name.
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public interface BlogModelService {
+    /**
+     * Basing on the given blog name, reads (parses/ creates/ etc) a blog
+     * category.
+     * @param name Name of the blog for which the model should be read.
+     * @return A category of a blog with the given name.
+     * @throws org.jboss.blog.model.BlogCategoryDoesNotExistException If a blog
+     * with the given name couldn't be found.
+     */
+    public BlogModel getBlogCategory(BlogName name) throws BlogCategoryDoesNotExistException;
+}

Deleted: trunk/blog-core/src/java/org/jboss/blog/service/model/CachingBlogCategoryService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/category/CachingBlogCategoryService.java	2006-11-02 14:53:30 UTC (rev 16)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/CachingBlogCategoryService.java	2006-11-02 14:57:35 UTC (rev 17)
@@ -1,44 +0,0 @@
-package org.jboss.blog.service.category;
-
-import org.jboss.blog.model.BlogModel;
-import org.jboss.blog.model.BlogCategoryDoesNotExistException;
-import org.jboss.blog.BlogName;
-import org.jboss.blog.service.AbstractBlogService;
-
-/**
- * A blog category service which caches categories returned by another blog
- * model category service to avoid, for example, unnecessary feed parsing.
- * @author Adam Warski (adamw at aster.pl)
- *
- * @jmx.mbean
- * @jboss.xmbean
- */
-public class CachingBlogCategoryService extends AbstractBlogService implements BlogCategoryService {
-    public CachingBlogCategoryService() {
-
-    }
-
-    /**
-     * @jmx.managed-operation
-     * @jmx.managed-parameter type="org.jboss.blog.BlogName"
-     */
-    public BlogModel getBlogCategory(BlogName name) throws BlogCategoryDoesNotExistException {
-        return delegateCategoryService.getBlogCategory(name);
-    }
-
-    private BlogCategoryService delegateCategoryService;
-
-    /**
-     * @jmx.managed-attribute
-     */
-    public BlogCategoryService getDelegateCategoryService() {
-        return delegateCategoryService;
-    }
-
-    /**
-     * @jmx.managed-attribute
-     */
-    public void setDelegateCategoryService(BlogCategoryService delegateCategoryService) {
-        this.delegateCategoryService = delegateCategoryService;
-    }
-}

Added: trunk/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/category/CachingBlogModelService.java	2006-11-02 14:53:30 UTC (rev 16)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java	2006-11-02 14:57:35 UTC (rev 17)
@@ -0,0 +1,44 @@
+package org.jboss.blog.service.model;
+
+import org.jboss.blog.model.BlogModel;
+import org.jboss.blog.model.BlogCategoryDoesNotExistException;
+import org.jboss.blog.BlogName;
+import org.jboss.blog.service.AbstractBlogService;
+
+/**
+ * A blog category service which caches categories returned by another blog
+ * model category service to avoid, for example, unnecessary feed parsing.
+ * @author Adam Warski (adamw at aster.pl)
+ *
+ * @jmx.mbean
+ * @jboss.xmbean
+ */
+public class CachingBlogModelService extends AbstractBlogService implements BlogModelService {
+    public CachingBlogModelService() {
+
+    }
+
+    /**
+     * @jmx.managed-operation
+     * @jmx.managed-parameter type="org.jboss.blog.BlogName"
+     */
+    public BlogModel getBlogCategory(BlogName name) throws BlogCategoryDoesNotExistException {
+        return delegateModelService.getBlogCategory(name);
+    }
+
+    private BlogModelService delegateModelService;
+
+    /**
+     * @jmx.managed-attribute
+     */
+    public BlogModelService getDelegateCategoryService() {
+        return delegateModelService;
+    }
+
+    /**
+     * @jmx.managed-attribute
+     */
+    public void setDelegateCategoryService(BlogModelService delegateModelService) {
+        this.delegateModelService = delegateModelService;
+    }
+}

Deleted: trunk/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogCategoryService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/category/RomeParsingBlogCategoryService.java	2006-11-02 14:53:30 UTC (rev 16)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogCategoryService.java	2006-11-02 14:57:35 UTC (rev 17)
@@ -1,83 +0,0 @@
-package org.jboss.blog.service.category;
-
-import org.jboss.blog.model.BlogModel;
-import org.jboss.blog.model.BlogCategoryDoesNotExistException;
-import org.jboss.blog.model.BlogPost;
-import org.jboss.blog.BlogName;
-import org.jboss.blog.service.AbstractBlogService;
-import org.jboss.blog.rome.CommentRssModule;
-import org.jboss.blog.tools.BlogTools;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.net.URL;
-import java.io.IOException;
-
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.XmlReader;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndEntry;
-
-/**
- * @author Adam Warski (adamw at aster.pl)
- *
- * @jmx.mbean
- * @jboss.xmbean
- */
-public class RomeParsingBlogCategoryService extends AbstractBlogService implements BlogCategoryService {
-    public RomeParsingBlogCategoryService() {
-
-    }
-
-    /**
-     * @jmx.managed-operation
-     * @jmx.managed-parameter type="org.jboss.blog.BlogName"
-     */
-    public BlogModel getBlogCategory(BlogName name) throws BlogCategoryDoesNotExistException {
-        if (name.getId() == null) {
-            throw new BlogCategoryDoesNotExistException("No blog selected (null blog id)");
-        }
-
-        // Parsing the feed, which's address is the id of the selected blog.
-        SyndFeedInput input = new SyndFeedInput();
-        SyndFeed inFeed;
-        try {
-            inFeed = input.build(new XmlReader(new URL(name.getId()).openStream()));
-        } catch (IOException e) {
-            throw new BlogCategoryDoesNotExistException(e);
-        } catch (FeedException e) {
-            throw new BlogCategoryDoesNotExistException(e);
-        }
-        
-        List entries = new ArrayList();
-
-        String defaultAuthor = inFeed.getAuthor();
-        for (Iterator iter = inFeed.getEntries().iterator(); iter.hasNext();) {
-            SyndEntry entry = (SyndEntry) iter.next();
-
-            CommentRssModule commRssModule = (CommentRssModule)
-                    entry.getModule("http://wellformedweb.org/CommentAPI/");
-            String commentsRss = null;
-            if (commRssModule != null) {
-                commentsRss = commRssModule.getCommentRss();
-                if (commentsRss != null) {
-                    commentsRss = commentsRss.trim();
-                }
-            }
-
-            String author = entry.getAuthor();
-            entries.add(new BlogPost(
-                    BlogTools.isEmpty(author) ? defaultAuthor : author,
-                    entry.getTitle(), entry.getDescription().getValue(),
-                    entry.getPublishedDate(), entry.getLink(),
-                    entry.getUri(), commentsRss));
-        }
-
-        return new BlogModel(inFeed.getAuthor(), inFeed.getTitle(),
-                inFeed.getDescription(), inFeed.getLink(),
-                inFeed.getPublishedDate(), entries,
-                inFeed.getCategories().size() != 1 ? "" : inFeed.getCategories().get(0).toString());
-    }
-}

Added: trunk/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/category/RomeParsingBlogModelService.java	2006-11-02 14:53:30 UTC (rev 16)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java	2006-11-02 14:57:35 UTC (rev 17)
@@ -0,0 +1,83 @@
+package org.jboss.blog.service.model;
+
+import org.jboss.blog.model.BlogModel;
+import org.jboss.blog.model.BlogCategoryDoesNotExistException;
+import org.jboss.blog.model.BlogPost;
+import org.jboss.blog.BlogName;
+import org.jboss.blog.service.AbstractBlogService;
+import org.jboss.blog.rome.CommentRssModule;
+import org.jboss.blog.tools.BlogTools;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.net.URL;
+import java.io.IOException;
+
+import com.sun.syndication.io.SyndFeedInput;
+import com.sun.syndication.io.XmlReader;
+import com.sun.syndication.io.FeedException;
+import com.sun.syndication.feed.synd.SyndFeed;
+import com.sun.syndication.feed.synd.SyndEntry;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ *
+ * @jmx.mbean
+ * @jboss.xmbean
+ */
+public class RomeParsingBlogModelService extends AbstractBlogService implements BlogModelService {
+    public RomeParsingBlogModelService() {
+
+    }
+
+    /**
+     * @jmx.managed-operation
+     * @jmx.managed-parameter type="org.jboss.blog.BlogName"
+     */
+    public BlogModel getBlogCategory(BlogName name) throws BlogCategoryDoesNotExistException {
+        if (name.getId() == null) {
+            throw new BlogCategoryDoesNotExistException("No blog selected (null blog id)");
+        }
+
+        // Parsing the feed, which's address is the id of the selected blog.
+        SyndFeedInput input = new SyndFeedInput();
+        SyndFeed inFeed;
+        try {
+            inFeed = input.build(new XmlReader(new URL(name.getId()).openStream()));
+        } catch (IOException e) {
+            throw new BlogCategoryDoesNotExistException(e);
+        } catch (FeedException e) {
+            throw new BlogCategoryDoesNotExistException(e);
+        }
+        
+        List entries = new ArrayList();
+
+        String defaultAuthor = inFeed.getAuthor();
+        for (Iterator iter = inFeed.getEntries().iterator(); iter.hasNext();) {
+            SyndEntry entry = (SyndEntry) iter.next();
+
+            CommentRssModule commRssModule = (CommentRssModule)
+                    entry.getModule("http://wellformedweb.org/CommentAPI/");
+            String commentsRss = null;
+            if (commRssModule != null) {
+                commentsRss = commRssModule.getCommentRss();
+                if (commentsRss != null) {
+                    commentsRss = commentsRss.trim();
+                }
+            }
+
+            String author = entry.getAuthor();
+            entries.add(new BlogPost(
+                    BlogTools.isEmpty(author) ? defaultAuthor : author,
+                    entry.getTitle(), entry.getDescription().getValue(),
+                    entry.getPublishedDate(), entry.getLink(),
+                    entry.getUri(), commentsRss));
+        }
+
+        return new BlogModel(inFeed.getAuthor(), inFeed.getTitle(),
+                inFeed.getDescription(), inFeed.getLink(),
+                inFeed.getPublishedDate(), entries,
+                inFeed.getCategories().size() != 1 ? "" : inFeed.getCategories().get(0).toString());
+    }
+}

Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws	2006-11-02 14:53:30 UTC (rev 16)
+++ trunk/jbossblog.iws	2006-11-02 14:57:35 UTC (rev 17)
@@ -17,64 +17,20 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/ACLTagHandler.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/ACLTagHandler.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogViewState.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogViewState.java" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/BlogCategoryService.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml" afterPath="$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/viewpost.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogModel.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogModel.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogEntryDoesNotExistException.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/BlogModelService.java" afterPath="" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/build.xml" afterPath="$PROJECT_DIR$/blog-core/build.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogCategory.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/AuthorizationListener.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl/AuthorizationListener.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/DoesNotExistBlogPost.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogPostDoesNotExistException.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/PostManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/BlogPostImpl.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogModelDoesNotExistException.java" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/blog-core.iml" afterPath="$PROJECT_DIR$/blog-core/blog-core.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/web/views/viewentry.xhtml" afterPath="" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java" afterPath="" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/BlogCategoryService.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/etc/Messages.properties" afterPath="$PROJECT_DIR$/blog-core/src/etc/Messages.properties" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/BlogManager.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CurrentView.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CurrentView.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/test" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/CachingBlogCategoryService.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogService.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/BlogCategoryImpl.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/CachingBlogModelService.java" afterPath="" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/etc/blog-ds.xml" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/BlogModelService.java" afterPath="" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/test/HibernateTest.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogEntry.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model" afterPath="" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/RomeParsingBlogCategoryService.java" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/RomeParsingBlogModelService.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/DoesNotExistBlogEntry.java" afterPath="" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogPost.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogCategoryDoesNotExistException.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/BlogName.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/BlogName.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/CachingBlogCategoryService.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/BlogCategoryService.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogCategoryService.java" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/BlogModelService.java" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/RomeParsingBlogCategoryService.java" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/CachingBlogCategoryService.java" afterPath="" />
     </list>
   </component>
   <component name="ChangeListSynchronizer" />
@@ -805,7 +761,7 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration" />
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
@@ -843,7 +799,7 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category" />
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
@@ -877,6 +833,44 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
         <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="jbossblog.ipr" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="blog-core" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
           <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
@@ -1226,13 +1220,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="25" width="1680" height="1000" extended-state="0" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
       <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="13" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" order="7" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26156694" order="0" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26156694" order="0" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32914287" order="1" />
       <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24984577" order="7" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22742857" order="9" />
@@ -1343,27 +1337,6 @@
     <option name="myLastEditedConfigurable" value="Project Default" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="48" column="57" selection-start="2313" selection-end="2313" vertical-scroll-proportion="0.59309494">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/CachingBlogCategoryService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="18" selection-start="329" selection-end="329" vertical-scroll-proportion="0.10895884">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/BlogCategoryService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="25" selection-start="578" selection-end="578" vertical-scroll-proportion="0.2542373">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="35" column="34" selection-start="1375" selection-end="1375" vertical-scroll-proportion="0.65625">
@@ -1377,7 +1350,7 @@
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/category/RomeParsingBlogCategoryService.java">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="80" column="50" selection-start="2981" selection-end="2981" vertical-scroll-proportion="0.9455206">
           <folding />
@@ -1402,15 +1375,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="0" selection-start="576" selection-end="576" vertical-scroll-proportion="0.017772513">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/test/HibernateTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="21" column="4" selection-start="398" selection-end="436" vertical-scroll-proportion="0.37322274">
@@ -1455,6 +1419,36 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="57" column="42" selection-start="2688" selection-end="2688" vertical-scroll-proportion="0.4885404">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="13" column="17" selection-start="484" selection-end="484" vertical-scroll-proportion="0.15995261">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="15" column="13" selection-start="470" selection-end="470" vertical-scroll-proportion="0.26658767">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/AbstractBlogService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="22" selection-start="149" selection-end="149" vertical-scroll-proportion="0.12711865">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogModel.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="18" column="3" selection-start="490" selection-end="490" vertical-scroll-proportion="0.2843602">




More information about the jboss-cvs-commits mailing list