[jboss-cvs] JBossBlog SVN: r187 - in trunk: resources/WEB-INF and 3 other directories.

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

Author: adamw
Date: 2008-02-04 14:12:05 -0500 (Mon, 04 Feb 2008)
New Revision: 187

Modified:
   trunk/resources/META-INF/persistence-dev.xml
   trunk/resources/WEB-INF/pages.xml
   trunk/src/action/org/jboss/blog/session/feed/mod/RemoteFeedModBean.java
   trunk/view/layout/template.xhtml
   trunk/view/manage/template/template_list.xhtml
Log:


Modified: trunk/resources/META-INF/persistence-dev.xml
===================================================================
--- trunk/resources/META-INF/persistence-dev.xml	2008-02-04 16:02:25 UTC (rev 186)
+++ trunk/resources/META-INF/persistence-dev.xml	2008-02-04 19:12:05 UTC (rev 187)
@@ -27,6 +27,7 @@
             <property name="hibernate.connection.characterEncoding" value="UTF-8" />
 
             <!-- TODO Search -->
+            <!-- TODO 2nd level caching -->
             <!-- use a file system based index -->
             <property name="hibernate.search.default.directory_provider"
                       value="org.hibernate.search.store.FSDirectoryProvider"/>

Modified: trunk/resources/WEB-INF/pages.xml
===================================================================
--- trunk/resources/WEB-INF/pages.xml	2008-02-04 16:02:25 UTC (rev 186)
+++ trunk/resources/WEB-INF/pages.xml	2008-02-04 19:12:05 UTC (rev 187)
@@ -225,7 +225,7 @@
     <!-- Manage templates -->
 
     <page view-id="/manage/template/template_add.xhtml">
-        <begin-conversation flush-mode="manual" />
+        <begin-conversation flush-mode="manual" join="true" />
         <navigation from-action="#{templateMod.saveNew}">
             <end-conversation />
             <redirect view-id="/manage/template/template_list.xhtml" />
@@ -233,7 +233,7 @@
     </page>
 
     <page view-id="/manage/template/template_edit.xhtml">
-        <begin-conversation flush-mode="manual" />
+        <begin-conversation flush-mode="manual" join="true" />
         <param name="id" converterId="templateConverter" value="#{templateMod.template}" />
         <navigation from-action="#{templateMod.saveExisting}">
             <end-conversation />

Modified: trunk/src/action/org/jboss/blog/session/feed/mod/RemoteFeedModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/mod/RemoteFeedModBean.java	2008-02-04 16:02:25 UTC (rev 186)
+++ trunk/src/action/org/jboss/blog/session/feed/mod/RemoteFeedModBean.java	2008-02-04 19:12:05 UTC (rev 187)
@@ -2,16 +2,20 @@
 
 import org.jboss.blog.model.feed.Feed;
 import org.jboss.blog.model.feed.RemoteFeed;
+import org.jboss.blog.model.Post;
 import org.jboss.blog.session.feed.InvalidFeedTypeException;
 import org.jboss.blog.session.parser.ParserException;
 import org.jboss.blog.session.parser.ParserService;
 import org.jboss.blog.tools.StringTools;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.core.Events;
+import org.jboss.seam.core.Validators;
 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 org.hibernate.validator.ClassValidator;
+import org.hibernate.validator.InvalidValue;
 
 import javax.faces.application.FacesMessage;
 import javax.persistence.EntityManager;
@@ -35,6 +39,9 @@
     @In
     private FacesMessages facesMessages;
 
+    @In
+    private Validators validators;
+
     private RemoteFeed remoteFeed;
 
     private Feed parsedFeed;
@@ -83,9 +90,26 @@
         getRemoteFeed().setAccepted(false);
     }
 
+    private void validateFeedAndPosts(Feed feed) throws ParserException {
+        ClassValidator<Post> postValidator = validators.getValidator(Post.class);
+
+        for (Post post : feed.getPosts()) {
+            InvalidValue[] invalidValues = postValidator.getInvalidValues(post);
+            if (invalidValues.length != 0) {
+                for (InvalidValue invalidValue : invalidValues) {
+                    facesMessages.addToControlFromResourceBundle("link", FacesMessage.SEVERITY_ERROR,
+                            "Property: #0, error: #1", invalidValue.getPropertyName(), invalidValue.getMessage());
+                }
+                
+                throw new ParserException("Posts are missing some information.");
+            }
+        }        
+    }
+
     public void parseFeed() {
         try {
             parsedFeed = parserService.parse(getRemoteFeed().getRemoteLink());
+            validateFeedAndPosts(parsedFeed);
             setParseOk(true);
         } catch (ParserException e) {
             setParseException(e);

Modified: trunk/view/layout/template.xhtml
===================================================================
--- trunk/view/layout/template.xhtml	2008-02-04 16:02:25 UTC (rev 186)
+++ trunk/view/layout/template.xhtml	2008-02-04 19:12:05 UTC (rev 187)
@@ -17,7 +17,7 @@
     </ui:include>
 
 	<div class="body">
-        <h:messages globalOnly="true" styleClass="message"/>
+        <h:messages globalOnly="true" styleClass="message" />
         
         <ui:insert name="body"/>
 	</div>

Modified: trunk/view/manage/template/template_list.xhtml
===================================================================
--- trunk/view/manage/template/template_list.xhtml	2008-02-04 16:02:25 UTC (rev 186)
+++ trunk/view/manage/template/template_list.xhtml	2008-02-04 19:12:05 UTC (rev 187)
@@ -10,7 +10,7 @@
     <ui:define name="body">
         <h1>Manage templates</h1>
 
-        <s:link value="Add new template" view="/manage/template/template_add.xhtml" propagation="begin" />
+        <s:link value="Add new template" view="/manage/template/template_add.xhtml" />
 
         <h3>Current templates:</h3>