[jboss-cvs] JBossBlog SVN: r29 - in trunk: . blog-core/src/etc/META-INF blog-core/src/java/org/jboss/blog/service/store/hibernate blog-core/src/java/org/jboss/blog/tools blog-core/src/java/org/jboss/blog/ui blog-core/src/web blog-core/src/web/WEB-INF blog-core/src/web/views

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Nov 14 10:28:03 EST 2006


Author: adamw
Date: 2006-11-14 10:27:51 -0500 (Tue, 14 Nov 2006)
New Revision: 29

Added:
   trunk/blog-core/src/web/views/blog_del.xhtml
   trunk/blog-core/src/web/views/blog_new.xhtml
Modified:
   trunk/blog-core/src/etc/META-INF/acl-mapping.xml
   trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.hbm.xml
   trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
   trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
   trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java
   trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
   trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java
   trunk/blog-core/src/web/WEB-INF/faces-config.xml
   trunk/blog-core/src/web/blog.css
   trunk/blog-core/src/web/views/admin_panel.xhtml
   trunk/blog-core/src/web/views/blog_edit.xhtml
   trunk/blog-core/src/web/views/blog_mod.xhtml
   trunk/blog-core/src/web/views/blog_view.xhtml
   trunk/blog-core/src/web/views/del_confirm.xhtml
   trunk/blog-core/src/web/views/id_edit.xhtml
   trunk/jbossblog.iws
Log:
http://jira.jboss.com/jira/browse/JBBLOG-12

Modified: trunk/blog-core/src/etc/META-INF/acl-mapping.xml
===================================================================
--- trunk/blog-core/src/etc/META-INF/acl-mapping.xml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/etc/META-INF/acl-mapping.xml	2006-11-14 15:27:51 UTC (rev 29)
@@ -41,7 +41,15 @@
 			<resource type="fragment" criteriaId="manageBlog://ui">
 				<id>acl://manageBlog</id>
 			</resource>
-		</function>
+            <resource type="jsfAction" criteriaId="manageBlog://action">
+				<class>org.jboss.blog.ui.BlogEdit</class>
+				<method>saveNew</method>
+			</resource>
+            <resource type="jsfAction" criteriaId="manageBlog://action">
+				<class>org.jboss.blog.ui.BlogEdit</class>
+				<method>delete</method>
+			</resource>
+        </function>
 
         <function id="manageCategory" name="Manage Category">
 			<!-- ui protection -->

Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.hbm.xml
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.hbm.xml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.hbm.xml	2006-11-14 15:27:51 UTC (rev 29)
@@ -11,7 +11,7 @@
         </id>
         
         <natural-id>
-            <many-to-one name="model" class="HBlogModel" column="BLOG_ID" />
+            <many-to-one name="model" class="HBlogModel" column="BLOG_ID" cascade="none" />
             <many-to-one name="post" class="HBlogPost" column="POST_ID" cascade="persist,merge,save-update" />
         </natural-id>
     </class>

Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java	2006-11-14 15:27:51 UTC (rev 29)
@@ -189,17 +189,25 @@
             throw new IllegalArgumentException("Cannot delete a new model.");
         }
 
-        // Deleting all posts.
+        // Deleting the model.
+        sf.getCurrentSession().delete(hmodel);
+
+        // Deleting all posts belonging only to this category.
+        // TODO This can be done more effectively with a query
         for (Iterator iter = hmodel.getModelPosts().iterator(); iter.hasNext();) {
-            HBlogPost post = ((HBlogModelPost) iter.next()).getPost();
+            HBlogModelPost modelPost = (HBlogModelPost) iter.next();
+            HBlogPost post = modelPost.getPost();
+
             // If the post belongs only to this model, delete it.
             if ((post.getModelPosts().size() == 1) && (post.getId() != null)) {
+                sf.getCurrentSession().delete(modelPost);
+                sf.getCurrentSession().delete(post.getModelPosts().get(0));
                 sf.getCurrentSession().delete(post);
+                post.getModelPosts().clear();
             }
         }
 
-        // Deleting the model.
-        sf.getCurrentSession().delete(hmodel);
+        hmodel.getModelPosts().clear();
     }
 
     /**

Modified: trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java	2006-11-14 15:27:51 UTC (rev 29)
@@ -11,10 +11,15 @@
 public class UITools {
     public static final String BLOG_VIEW    = "blog_view";
     public static final String POST_VIEW    = "post_view";
+
     public static final String BLOG_EDIT    = "blog_edit";
+    public static final String BLOG_NEW     = "blog_new";
+    public static final String BLOG_DEL     = "blog_del";
+
     public static final String POST_EDIT    = "post_edit";
     public static final String POST_NEW     = "post_new";
     public static final String POST_DEL     = "post_del";
+
     public static final String ADMIN_PANEL  = "admin_panel";
     public static final String ID_EDIT      = "id_edit";
 

Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java	2006-11-14 15:27:51 UTC (rev 29)
@@ -6,7 +6,11 @@
 import org.jboss.blog.tools.BlogTools;
 import org.jboss.blog.tools.UITools;
 import org.jboss.blog.service.store.model.ModifiableBlogModel;
+import org.jboss.blog.service.store.model.BlogModelAlreadyExistsException;
+import org.jboss.blog.BlogName;
 
+import java.util.Date;
+
 /**
  * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
  */
@@ -102,7 +106,7 @@
     public String save() {
         try {
             ModifiableBlogModel mbm = BlogTools.getBlogService().getStoreService().getBlogModel(
-                        blogView.getBlogName());
+                    blogView.getBlogName());
 
             boolean changed = false;
 
@@ -115,13 +119,13 @@
             if (!BlogTools.objectsEqual(link, mbm.getLink())) {
                 changed = true; mbm.setLink(link); }
 
-            if (!BlogTools.objectsEqual(description, mbm.getDescription())) { 
+            if (!BlogTools.objectsEqual(description, mbm.getDescription())) {
                 changed = true; mbm.setDescription(description); }
 
             if (changed) {
-                UITools.addInfoMessage("Blog properties saved.");
+                UITools.addInfoMessage("Blog category data saved.");
             } else {
-                UITools.addInfoMessage("No blog properties were modified.");
+                UITools.addInfoMessage("No blog category data was modified.");
             }
         } catch (BlogModelDoesNotExistException e) {
             UITools.addMessageBlogDoesntExist(blogView.getBlogName());
@@ -130,6 +134,63 @@
         return blogView.getReturnTo();
     }
 
+    public String saveNew() {
+        try {
+            ModifiableBlogModel mbm = BlogTools.getBlogService().getStoreService().newBlogModel(
+                    getState().getSelectedBlogName());
+
+            mbm.setAuthor(author);
+            mbm.setTitle(title);
+            mbm.setLink(link);
+            mbm.setDescription(description);
+            mbm.setCreated(new Date());
+
+            BlogTools.getBlogService().getStoreService().saveNewBlogModel(mbm);
+
+            UITools.addInfoMessage("New blog category created.");
+        } catch (BlogModelAlreadyExistsException e) {
+            UITools.addErrorMessage("Blog already exists: " + getState().getSelectedBlogName() + ".");
+        }
+
+        return UITools.BLOG_VIEW;
+    }
+
+    public String delete() {
+        try {
+            BlogName toDelete = getState().getSelectedBlogName();
+
+            ModifiableBlogModel mbm = BlogTools.getBlogService().getStoreService().getBlogModel(
+                    toDelete);
+
+            BlogTools.getBlogService().getStoreService().deleteBlogModel(mbm);
+
+            getState().setSelectedBlogName(null);
+
+            UITools.addInfoMessage("Blog category deleted.");
+
+            // If this was the last category with this id, we must return to the admin panel.
+            if (BlogTools.getBlogService().getStoreService().getAllCategories(toDelete).size() == 0) {
+                return UITools.ADMIN_PANEL;
+            } else {
+                return UITools.ID_EDIT;
+            }
+        } catch (BlogModelDoesNotExistException e) {
+            UITools.addMessageBlogDoesntExist(blogView.getBlogName());
+
+            return UITools.ID_EDIT;
+        } catch(Throwable t) {
+            t.printStackTrace();
+            throw new RuntimeException(t);
+        }
+
+    }
+
+    public String backFromDelete() {
+        getState().setSelectedBlogName(null);
+
+        return UITools.ID_EDIT;
+    }
+
     public String back() {
         return blogView.getReturnTo();
     }

Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java	2006-11-14 15:27:51 UTC (rev 29)
@@ -53,6 +53,7 @@
     private Boolean viewAllPosts;
     private Boolean postsExpandable;
     private Boolean blogModifiable;
+    private Boolean defaultBlog;
     
     /* A list of posts to show in the current view, plus the next post,
      * if such a post exists (used to checking if there is a next page). */
@@ -64,6 +65,19 @@
         return FacesContext.getCurrentInstance().getExternalContext().getRequest();
     }
 
+    private void resetBlogData() {
+        blogName = null;
+        blogModel = null;
+        blogModifiable = null;
+        blogViewState = null;
+        defaultBlog  = null;
+    }
+
+    private void resetPosts() {
+        postsWithNext = null;
+        posts = null;
+    }
+
     public BlogName getBlogName() {
         if (blogName == null) {
             // Blog name from the state has precedence over the default one.
@@ -76,6 +90,14 @@
         return blogName;
     }
 
+    public Boolean getDefaultBlog() {
+        if (defaultBlog == null) {
+            defaultBlog = Boolean.valueOf(getState().getSelectedBlogName() == null);
+        }
+
+        return defaultBlog;
+    }
+
     public BlogModel getBlogModel() {
         if (blogModel == null) {
             try {
@@ -133,6 +155,7 @@
 
         return postsExpandable;
     }
+
     public Boolean getBlogModifiable() {
         if (blogModifiable == null) {
             blogModifiable = Boolean.valueOf(BlogTools.getBlogService().getStoreService().
@@ -142,11 +165,6 @@
         return blogModifiable;
     }
 
-    private void resetPosts() {
-        postsWithNext = null;
-        posts = null;
-    }
-
     private List getPostsWithNext() {
         if (postsWithNext == null) {
             postsWithNext = getBlogModel().getPosts(getFrom(), getTo()+1);
@@ -290,6 +308,13 @@
         return UITools.BLOG_EDIT;
     }
 
+    public String returnToDefault() {
+        getState().setSelectedBlogName(null);
+        resetBlogData();
+
+        return null;
+    }
+
     // Helper methods
 
     private void postSelect() {

Modified: trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java	2006-11-14 15:27:51 UTC (rev 29)
@@ -14,14 +14,18 @@
  */
 public class IdEdit {
     private State state;
+
     private List rawIds;
     private List ids;
     private List categories;
+
     private String newId;
     private String existingId;
+
     private String newCategory;
     private String existingCategory;
     private String deleteCategory;
+
     private Boolean categoryExists;
 
     public IdEdit() {
@@ -38,6 +42,7 @@
 
     private void populateRawIds() {
         if (rawIds == null) {
+            // TODO: filter with permissions of the logged in person
             rawIds = BlogTools.getBlogService().getStoreService().getAllBlogs();
         }
     }
@@ -58,6 +63,7 @@
 
     public List getCategories() {
         if (categories == null) {
+            // TODO: filter with permissions of the logged in person
             List rawCategories = BlogTools.getBlogService().getStoreService()
                     .getAllCategories(new BlogName(getState().getSelectedBlogId(), null));
             categories = new ArrayList();
@@ -147,14 +153,23 @@
     }
 
     public String newCategory() {
-        return null;
+        getState().setSelectedBlogName(new BlogName(getState().getSelectedBlogId(),
+                getNewCategory()));
+
+        return UITools.BLOG_NEW;
     }
 
     public String editCategory() {
-        return null;
+        getState().setSelectedBlogName(new BlogName(getState().getSelectedBlogId(),
+                getExistingCategory()));
+
+        return UITools.BLOG_VIEW;
     }
 
     public String deleteCategory() {
-        return null;
+        getState().setSelectedBlogName(new BlogName(getState().getSelectedBlogId(),
+                getDeleteCategory()));
+        
+        return UITools.BLOG_DEL;
     }
 }

Modified: trunk/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.xml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.xml	2006-11-14 15:27:51 UTC (rev 29)
@@ -159,4 +159,36 @@
             <to-view-id>/views/blog_edit.xhtml</to-view-id>
         </navigation-case>
     </navigation-rule>
+
+    <navigation-rule>
+        <from-view-id>/views/id_edit.xhtml</from-view-id>
+        <navigation-case>
+            <from-outcome>blog_new</from-outcome>
+            <to-view-id>/views/blog_new.xhtml</to-view-id>
+        </navigation-case>
+    </navigation-rule>
+
+    <navigation-rule>
+        <from-view-id>/views/id_edit.xhtml</from-view-id>
+        <navigation-case>
+            <from-outcome>blog_del</from-outcome>
+            <to-view-id>/views/blog_del.xhtml</to-view-id>
+        </navigation-case>
+    </navigation-rule>
+
+    <navigation-rule>
+        <from-view-id>/views/blog_del.xhtml</from-view-id>
+        <navigation-case>
+            <from-outcome>id_edit</from-outcome>
+            <to-view-id>/views/id_edit.xhtml</to-view-id>
+        </navigation-case>
+    </navigation-rule>
+
+    <navigation-rule>
+        <from-view-id>/views/blog_del.xhtml</from-view-id>
+        <navigation-case>
+            <from-outcome>admin_panel</from-outcome>
+            <to-view-id>/views/admin_panel.xhtml</to-view-id>
+        </navigation-case>
+    </navigation-rule>
 </faces-config>

Modified: trunk/blog-core/src/web/blog.css
===================================================================
--- trunk/blog-core/src/web/blog.css	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/web/blog.css	2006-11-14 15:27:51 UTC (rev 29)
@@ -30,6 +30,10 @@
     font-weight: bold;
 }
 
+.delete-subject {
+    font-weight: bold;
+}
+
 .post-title-big {
     font-weight: bold;
     font-size: 14px;

Modified: trunk/blog-core/src/web/views/admin_panel.xhtml
===================================================================
--- trunk/blog-core/src/web/views/admin_panel.xhtml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/web/views/admin_panel.xhtml	2006-11-14 15:27:51 UTC (rev 29)
@@ -38,7 +38,11 @@
                     <h:commandLink action="#{idEdit.editExisting}" value="Go &gt;&gt;"/>
                 </h:panelGroup>
 
-                <h:commandLink value="&lt;&lt; Back" action="blog_view" immediate="true"/>
+                <h:panelGroup>
+                    <h:commandLink value="&lt;&lt; Back" action="blog_view" immediate="true"/>
+                </h:panelGroup>
+                <h:panelGroup></h:panelGroup>
+                <h:panelGroup></h:panelGroup>
             </h:panelGrid>
             </h:form>
         </ui:define>

Added: trunk/blog-core/src/web/views/blog_del.xhtml
===================================================================
--- trunk/blog-core/src/web/views/blog_del.xhtml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/web/views/blog_del.xhtml	2006-11-14 15:27:51 UTC (rev 29)
@@ -0,0 +1,26 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:blog="http://www.jboss.org/portal/jbossblog">
+    <ui:composition template="del_confirm.xhtml">
+        <ui:param name="requiredPermission" value="acl://manageBlog" />
+
+        <ui:define name="delname">
+            blog category
+        </ui:define>
+
+        <ui:define name="delsubject">
+            #{state.selectedBlogName}
+        </ui:define>
+
+        <ui:define name="cancellink">
+            <h:commandLink value="No" action="#{blogEdit.backFromDelete}" />
+        </ui:define>
+
+        <ui:define name="deletelink">
+            <h:commandLink value="Yes" action="#{blogEdit.delete}" />
+        </ui:define>
+    </ui:composition>
+</div>
\ No newline at end of file

Modified: trunk/blog-core/src/web/views/blog_edit.xhtml
===================================================================
--- trunk/blog-core/src/web/views/blog_edit.xhtml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/web/views/blog_edit.xhtml	2006-11-14 15:27:51 UTC (rev 29)
@@ -8,11 +8,15 @@
         <ui:param name="requiredPermission" value="acl://manageCategory" />
 
         <ui:define name="editheader">
-            Edit blog
+            Edit blog category
         </ui:define>
 
         <ui:define name="edittableheader">
-            Change blog properties:
+            Change blog category data:
         </ui:define>
+
+        <ui:define name="savelink">
+            <h:commandLink value="Save" action="#{blogEdit.save}" />
+        </ui:define>
     </ui:composition>
 </div>
\ No newline at end of file

Modified: trunk/blog-core/src/web/views/blog_mod.xhtml
===================================================================
--- trunk/blog-core/src/web/views/blog_mod.xhtml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/web/views/blog_mod.xhtml	2006-11-14 15:27:51 UTC (rev 29)
@@ -43,7 +43,7 @@
 
                 <h:commandLink value="&lt;&lt; Back" action="#{blogEdit.back}" immediate="true"/>
                 &#160;
-                <h:commandLink value="Save" action="#{blogEdit.save}" />
+                <ui:insert name="savelink" />
             </h:form>
         </ui:define>
     </ui:composition>

Added: trunk/blog-core/src/web/views/blog_new.xhtml
===================================================================
--- trunk/blog-core/src/web/views/blog_new.xhtml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/web/views/blog_new.xhtml	2006-11-14 15:27:51 UTC (rev 29)
@@ -0,0 +1,22 @@
+<div  xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:c="http://java.sun.com/jstl/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:blog="http://www.jboss.org/portal/jbossblog">
+    <ui:composition template="blog_mod.xhtml">
+        <ui:param name="requiredPermission" value="acl://manageBlog" />
+
+        <ui:define name="editheader">
+            New blog category
+        </ui:define>
+
+        <ui:define name="edittableheader">
+            Enter blog category data:
+        </ui:define>
+
+        <ui:define name="savelink">
+            <h:commandLink value="Save" action="#{blogEdit.saveNew}" />
+        </ui:define>
+    </ui:composition>
+</div>
\ No newline at end of file

Modified: trunk/blog-core/src/web/views/blog_view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/blog_view.xhtml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/web/views/blog_view.xhtml	2006-11-14 15:27:51 UTC (rev 29)
@@ -16,7 +16,14 @@
                 new posts in this blog.</p>
             </h:form>
         </blog:isAllowed>
-        
+
+        <h:panelGroup rendered="#{!blogView.defaultBlog}">
+            <h:form>
+                <p class="admin-link"><h:commandLink value="Return" action="#{blogView.returnToDefault}" />
+                to default blog view.</p>
+            </h:form>
+        </h:panelGroup>
+
         <blog:isAllowed fragment="acl://accessAdminModule">
             <h:form>
                 <p class="admin-link">You can <h:commandLink value="administrate" action="admin_panel" />

Modified: trunk/blog-core/src/web/views/del_confirm.xhtml
===================================================================
--- trunk/blog-core/src/web/views/del_confirm.xhtml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/web/views/del_confirm.xhtml	2006-11-14 15:27:51 UTC (rev 29)
@@ -9,11 +9,20 @@
             <h2>Confirm <ui:insert name="delname" /> delete</h2>
 
             <h:form>
-                Are you sure you want to delete <ui:insert name="delname" />:
-                <b><ui:insert name="delsubject" /></b>?
+                <h:panelGrid columns="1">
+                    <h:panelGroup>
+                        Are you sure you want to delete <ui:insert name="delname" />:
+                        <span class="del-subject"><ui:insert name="delsubject" /></span>?
+                    </h:panelGroup>
 
-                <ui:insert name="cancellink" />
-                <ui:insert name="deletelink" />
+                    <h:panelGroup>
+                        <ui:insert name="cancellink" />
+                    </h:panelGroup>
+
+                    <h:panelGroup>
+                        <ui:insert name="deletelink" />
+                    </h:panelGroup>
+                </h:panelGrid>
             </h:form>
         </ui:define>
     </ui:composition>

Modified: trunk/blog-core/src/web/views/id_edit.xhtml
===================================================================
--- trunk/blog-core/src/web/views/id_edit.xhtml	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/blog-core/src/web/views/id_edit.xhtml	2006-11-14 15:27:51 UTC (rev 29)
@@ -48,7 +48,15 @@
                     <h:commandLink action="#{idEdit.deleteCategory}" value="Go &gt;&gt;"/>
                 </h:panelGroup>
 
-                <h:commandLink value="&lt;&lt; Back" action="admin_panel" immediate="true"/>
+                <h:panelGroup>
+                    <h:commandLink value="&lt;&lt; Back" action="admin_panel" immediate="true"/>
+                </h:panelGroup>
+
+                <h:panelGroup>
+                </h:panelGroup>
+
+                <h:panelGroup>
+                </h:panelGroup>
             </h:panelGrid>
             </h:form>
         </ui:define>

Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws	2006-11-13 23:38:46 UTC (rev 28)
+++ trunk/jbossblog.iws	2006-11-14 15:27:51 UTC (rev 29)
@@ -18,22 +18,22 @@
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/blog.css" afterPath="$PROJECT_DIR$/blog-core/src/web/blog.css" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/PostEdit.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/PostEdit.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/admin_panel.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/post_edit.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/post_edit.xhtml" />
-      <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="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/blog_edit.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_edit.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/admin_panel.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/admin_panel.xhtml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_new.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java" 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/web/views/blog_del.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/id_edit.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/id_edit.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/del_confirm.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/del_confirm.xhtml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/id_edit.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml" />
+      <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="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/IdEdit.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/IdEdit.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.hbm.xml" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.hbm.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml" afterPath="$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/IdEdit.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/view.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/view.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-permissions.xml" afterPath="$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-permissions.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/post_new.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/post_new.xhtml" />
     </list>
   </component>
   <component name="ChangeListSynchronizer" />
@@ -157,106 +157,7 @@
     </subPane>
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="admin_panel.xhtml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/admin_panel.xhtml">
-          <provider editor-type-id="HtmlPreview">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="39" column="0" selection-start="1645" selection-end="1645" vertical-scroll-proportion="0.9782609">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PostEdit.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/PostEdit.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="199" column="37" selection-start="5448" selection-end="5448" vertical-scroll-proportion="0.33825943">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="portlet.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="21" column="37" selection-start="949" selection-end="949" vertical-scroll-proportion="0.51724136">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="id_edit.xhtml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/id_edit.xhtml">
-          <provider editor-type-id="HtmlPreview">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="46" column="65" selection-start="2135" selection-end="2135" vertical-scroll-proportion="0.9691252">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="IdEdit.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/IdEdit.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="138" column="18" selection-start="3435" selection-end="3435" vertical-scroll-proportion="0.65865386">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="blog_view.xhtml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
-          <provider editor-type-id="HtmlPreview">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="21" column="101" selection-start="989" selection-end="989" vertical-scroll-proportion="0.38593483">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="acl-permissions.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-permissions.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="34" column="38" selection-start="1377" selection-end="1377" vertical-scroll-proportion="0.8374384">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="faces-config.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
-          <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
-            <state />
-          </provider>
-          <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="138" column="45" selection-start="4850" selection-end="4850" vertical-scroll-proportion="0.5831904">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="acl-mapping.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="40" column="32" selection-start="2203" selection-end="2203" vertical-scroll-proportion="0.5320197">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -989,7 +890,7 @@
       <showLibraryContents />
       <hideEmptyPackages />
       <abbreviatePackageNames />
-      <showStructure ProjectPane="false" Scope="false" PackagesPane="false" Favorites="false" />
+      <showStructure Favorites="false" Scope="false" PackagesPane="false" ProjectPane="false" />
       <autoscrollToSource />
       <autoscrollFromSource />
       <sortByType />
@@ -1025,23 +926,6 @@
   </component>
   <component name="RestoreUpdateTree" />
   <component name="RunManager">
-    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <module name="" />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-    </configuration>
     <configuration default="true" type="Applet" factoryName="Applet">
       <module name="" />
       <option name="MAIN_CLASS_NAME" />
@@ -1073,6 +957,23 @@
         <option name="Make" value="true" />
       </method>
     </configuration>
+    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <module name="" />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
   </component>
   <component name="ScopeViewComponent">
     <subPane subId="Project">
@@ -1148,13 +1049,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="25" width="1690" height="1005" extended-state="6" />
-    <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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2863274" order="0" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26118946" 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.24367674" order="7" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22727273" order="9" />
@@ -1162,7 +1063,7 @@
       <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="4" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="10" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
-      <window_info id="Ant Build" active="true" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25444514" order="1" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2268547" order="1" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" order="11" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24984577" order="2" />
@@ -1265,127 +1166,133 @@
     <option name="myLastEditedConfigurable" value="Project Default" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/admin_panel.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="17" selection-start="351" selection-end="351" vertical-scroll-proportion="0.14440434">
+        <state line="35" column="59" selection-start="1492" selection-end="1492" vertical-scroll-proportion="0.8779264">
           <folding />
         </state>
       </provider>
+      <provider editor-type-id="HtmlPreview">
+        <state />
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="4" column="0" selection-start="83" selection-end="83" vertical-scroll-proportion="0.09615385">
+        <state line="32" column="15" selection-start="449" selection-end="449" vertical-scroll-proportion="0.5192308">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/State.java">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="13" selection-start="308" selection-end="308" vertical-scroll-proportion="0.16245487">
+        <state line="11" column="31" selection-start="272" selection-end="272" vertical-scroll-proportion="0.1923077">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="54" selection-start="708" selection-end="708" vertical-scroll-proportion="0.2757353">
+        <state line="58" column="44" selection-start="1598" selection-end="1598" vertical-scroll-proportion="0.4054487">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-permissions.xml">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="34" column="38" selection-start="1377" selection-end="1377" vertical-scroll-proportion="0.8374384">
+        <state line="189" column="37" selection-start="6563" selection-end="6563" vertical-scroll-proportion="0.7993311">
           <folding />
         </state>
       </provider>
+      <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
+        <state />
+      </provider>
+      <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="31" column="13" selection-start="923" selection-end="923" vertical-scroll-proportion="-0.44117647">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="40" column="32" selection-start="2203" selection-end="2203" vertical-scroll-proportion="0.5320197">
+        <state line="118" column="36" selection-start="2920" selection-end="2920" vertical-scroll-proportion="0.34775642">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
-      <provider editor-type-id="HtmlPreview">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="101" selection-start="989" selection-end="989" vertical-scroll-proportion="0.38593483">
+        <state line="195" column="60" selection-start="6409" selection-end="6409" vertical-scroll-proportion="0.60426927">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/lib/myfaces/myfaces-api.jar!/javax/faces/model/SelectItem.class">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.hbm.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="11" selection-start="435" selection-end="435" vertical-scroll-proportion="0.27093595">
+        <state line="10" column="53" selection-start="421" selection-end="421" vertical-scroll-proportion="0.24630542">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
-      <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
-        <state />
-      </provider>
-      <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="138" column="45" selection-start="4850" selection-end="4850" vertical-scroll-proportion="0.5831904">
+        <state line="168" column="39" selection-start="4579" selection-end="4579" vertical-scroll-proportion="0.59345794">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/admin_panel.xhtml">
-      <provider editor-type-id="HtmlPreview">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/IdEdit.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="39" column="0" selection-start="1645" selection-end="1645" vertical-scroll-proportion="0.9782609">
-          <folding />
+        <state line="170" column="35" selection-start="4365" selection-end="4365" vertical-scroll-proportion="1.0373832">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="37" selection-start="949" selection-end="949" vertical-scroll-proportion="0.51724136">
+        <state line="45" column="45" selection-start="1943" selection-end="1943" vertical-scroll-proportion="1.0925325">
           <folding />
         </state>
       </provider>
+      <provider editor-type-id="HtmlPreview">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/PostEdit.java">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/del_confirm.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="199" column="37" selection-start="5448" selection-end="5448" vertical-scroll-proportion="0.33825943">
+        <state line="14" column="88" selection-start="705" selection-end="705" vertical-scroll-proportion="0.3409091">
           <folding />
         </state>
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/id_edit.xhtml">
       <provider editor-type-id="HtmlPreview">
         <state />
       </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="46" column="65" selection-start="2135" selection-end="2135" vertical-scroll-proportion="0.9691252">
+        <state line="50" column="42" selection-start="2124" selection-end="2124" vertical-scroll-proportion="0.42429283">
           <folding />
         </state>
       </provider>
+      <provider editor-type-id="HtmlPreview">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/IdEdit.java">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/id_edit.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="138" column="18" selection-start="3435" selection-end="3435" vertical-scroll-proportion="0.65865386">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state line="58" column="31" selection-start="2548" selection-end="2548" vertical-scroll-proportion="1.0681819">
+          <folding />
         </state>
       </provider>
+      <provider editor-type-id="HtmlPreview">
+        <state />
+      </provider>
     </entry>
   </component>
 </project>




More information about the jboss-cvs-commits mailing list