[jboss-svn-commits] JBL Code SVN: r10914 - in labs/jbosslabs/trunk/portal-extensions/forge-blog: src/java/org/jboss/labs/blog/service/model and 1 other directory.

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

Author: adamw
Date: 2007-04-11 18:48:08 -0400 (Wed, 11 Apr 2007)
New Revision: 10914

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/META-INF/jboss-service.xml
   labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/labs/blog/service/model/LabsModelService.java
Log:
Blog model service

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/META-INF/jboss-service.xml	2007-04-11 22:13:11 UTC (rev 10913)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/META-INF/jboss-service.xml	2007-04-11 22:48:08 UTC (rev 10914)
@@ -42,12 +42,31 @@
     </mbean>
 
     <!-- Model service -->
+    <mbean code="org.jboss.blog.service.model.caching.CachingBlogModelService"
+           name="blog:service=Model"
+           xmbean-dd="org/jboss/blog/service/model/caching/CachingBlogModelService.xml">
+        <attribute name="UpdateInterval">60000</attribute>
+        <depends optional-attribute-name="DelegateModelService"
+                 proxy-type="attribute">blog:service=DelegatingModel</depends>
+    </mbean>
+    <mbean code="org.jboss.blog.service.model.DelegatingModelService"
+           name="blog:service=DelegatingModel"
+           xmbean-dd="org/jboss/blog/service/model/DelegatingModelService.xml">
+        <depends optional-attribute-name="ExternalDelegateModelService"
+                 proxy-type="attribute">blog:service=RomeParsingModel</depends>
+        <depends optional-attribute-name="InternalDelegateModelService"
+                 proxy-type="attribute">blog:service=LabsModel</depends>
+    </mbean>
     <mbean code="org.jboss.labs.blog.service.model.LabsModelService"
-           name="blog:service=Model"
+           name="blog:service=LabsModel"
            xmbean-dd="org/jboss/labs/blog/service/model/LabsModelService.xml">
         <depends optional-attribute-name="FeedsService"
                  proxy-type="attribute">shotoku:service=feeds</depends>
     </mbean>
+    <mbean code="org.jboss.blog.service.model.rome.RomeParsingBlogModelService"
+           name="blog:service=RomeParsingModel"
+           xmbean-dd="org/jboss/blog/service/model/rome/RomeParsingBlogModelService.xml">
+    </mbean>
 
     <!-- Permissions service -->
     <mbean code="org.jboss.labs.blog.service.permissions.LabsPermissionsService"

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/labs/blog/service/model/LabsModelService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/labs/blog/service/model/LabsModelService.java	2007-04-11 22:13:11 UTC (rev 10913)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/labs/blog/service/model/LabsModelService.java	2007-04-11 22:48:08 UTC (rev 10914)
@@ -26,7 +26,15 @@
         try {
             return getFeedsService().getFeed("default", blogName.getId(), "rss2").getBlogModel();
         } catch (FeedDoesNotExistException e) {
-            throw new BlogModelDoesNotExistException(e);
+            try {
+                return getFeedsService().getFeed("default", blogName.getId(), "atom").getBlogModel();
+            } catch (FeedDoesNotExistException e1) {
+                try {
+                    return getFeedsService().getFeed("default", blogName.getId(), "rdf").getBlogModel();
+                } catch (FeedDoesNotExistException e2) {
+                     throw new BlogModelDoesNotExistException(e2);
+                }
+            }
         }
     }
 }