[jboss-cvs] JBossBlog SVN: r27 - in trunk: . blog-core/src/etc/META-INF blog-core/src/java/org/jboss/blog/service/store 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
Sat Nov 11 11:10:23 EST 2006
Author: adamw
Date: 2006-11-11 11:10:14 -0500 (Sat, 11 Nov 2006)
New Revision: 27
Added:
trunk/blog-core/src/web/blog.css
trunk/blog-core/src/web/views/del_confirm.xhtml
trunk/blog-core/src/web/views/post_del.xhtml
Modified:
trunk/blog-core/src/etc/META-INF/acl-mapping.xml
trunk/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java
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/PostEdit.java
trunk/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java
trunk/blog-core/src/web/WEB-INF/faces-config.xml
trunk/blog-core/src/web/views/blog_view.xhtml
trunk/blog-core/src/web/views/common.xhtml
trunk/blog-core/src/web/views/post_view.xhtml
trunk/blog-core/src/web/views/view.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-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/etc/META-INF/acl-mapping.xml 2006-11-11 16:10:14 UTC (rev 27)
@@ -122,6 +122,10 @@
<class>org.jboss.blog.ui.PostEdit</class>
<method>saveNew</method>
</resource>
+ <resource type="jsfAction" criteriaId="managePost://action">
+ <class>org.jboss.blog.ui.PostEdit</class>
+ <method>delete</method>
+ </resource>
<implies>manageComment</implies>
</function>
</module>
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java 2006-11-11 16:10:14 UTC (rev 27)
@@ -67,16 +67,25 @@
throws BlogModelAlreadyExistsException, IllegalArgumentException;
/**
- * Deletes the current blog model (more precisely, a blog with the name
- * of the current blog model, and all posts, if they do not belong to any
- * other blog models).
+ * Deletes the given blog model (and all posts, if they do not belong to
+ * any other blog models).
* @param model Model to delete. Should be earlier obtained with
* {@link BlogStoreService#getBlogModel(org.jboss.blog.BlogName)}.
- * @throws IllegalArgumentException If model is null.
+ * @throws IllegalArgumentException If model is null, is a new model
+ * or wasn't obtained from this store service.
*/
public void deleteBlogModel(ModifiableBlogModel model)
throws IllegalArgumentException;
+ /**
+ * Deletes the given post.
+ * @param post Post to delete.
+ * @throws IllegalArgumentException If post is null, is a new post
+ * or wasn't obtained from this store service.
+ */
+ public void deletePost(ModifiableBlogPost post)
+ throws IllegalArgumentException;
+
// Factory methods
/**
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-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java 2006-11-11 16:10:14 UTC (rev 27)
@@ -185,12 +185,45 @@
*/
public void deleteBlogModel(ModifiableBlogModel model) {
HBlogModel hmodel = castAndAssertBlogModel(model);
+ if (hmodel.getId() == null) {
+ throw new IllegalArgumentException("Cannot delete a new model.");
+ }
+ // Deleting all posts.
+ for (Iterator iter = hmodel.getModelPosts().iterator(); iter.hasNext();) {
+ HBlogPost post = ((HBlogModelPost) iter.next()).getPost();
+ // If the post belongs only to this model, delete it.
+ if ((post.getModelPosts().size() == 1) && (post.getId() != null)) {
+ sf.getCurrentSession().delete(post);
+ }
+ }
+
+ // Deleting the model.
sf.getCurrentSession().delete(hmodel);
}
+ /**
+ * @jmx.managed-operation
+ * @jmx.managed-parameter type="org.jboss.blog.service.store.model.ModifiableBlogPost"
+ */
+ public void deletePost(ModifiableBlogPost post) {
+ HBlogPost hpost = castAndAssertBlogPost(post);
+ if (hpost.getId() == null) {
+ throw new IllegalArgumentException("Cannot delete a new post.");
+ }
+
+ sf.getCurrentSession().createQuery("delete from HBlogModelPost as bmp " +
+ "where bmp.post = :post").setEntity("post", hpost).executeUpdate();
+ sf.getCurrentSession().delete(hpost);
+ }
+
//
+ /**
+ * To the given blog model, adds the given post.
+ * @param model Model to which the post should be added.
+ * @param post Post to add.
+ */
void addPost(HBlogModel model, HBlogPost post) {
HBlogModel hmodel = castAndAssertBlogModel(model);
HBlogPost hpost = castAndAssertBlogPost(post);
@@ -208,6 +241,11 @@
}
}
+ /**
+ * From the given blog model, removes the given post.
+ * @param model Model from which the post shold be removed.
+ * @param post Post to remove.
+ */
void removePost(HBlogModel model, HBlogPost post) {
HBlogModel hmodel = castAndAssertBlogModel(model);
HBlogPost hpost = castAndAssertBlogPost(post);
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-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2006-11-11 16:10:14 UTC (rev 27)
@@ -14,6 +14,7 @@
public static final String BLOG_EDIT = "blog_edit";
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 void addInfoMessage(String message) {
FacesContext.getCurrentInstance().addMessage(null,
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java 2006-11-11 16:10:14 UTC (rev 27)
@@ -180,7 +180,7 @@
return null;
}
- //try {
+ try {
ModifiableBlogPost post;
post = BlogTools.getBlogService().getStoreService().newBlogPost();
@@ -194,21 +194,18 @@
post.setCreated(new Date());
post.setCommentLink(commentLink);
+ // Adding the post to all selected categories.
+ // TODO permissions for category-level? Both here, save() and post_mod.xhtml
for (Iterator iter = selectedCategories.iterator(); iter.hasNext();) {
- try {
ModifiableBlogModel blog = BlogTools.getBlogService().getStoreService().getBlogModel(
(BlogName) iter.next());
blog.addPost(post);
- } catch (Throwable t) {
- t.printStackTrace();
- throw new RuntimeException(t);
- }
}
UITools.addInfoMessage("New post saved.");
- //} catch (BlogModelDoesNotExistException e) {
- // UITools.addMessageBlogDoesntExist(blogView.getBlogName());
- //}
+ } catch (BlogModelDoesNotExistException e) {
+ UITools.addMessageBlogDoesntExist(blogView.getBlogName());
+ }
return UITools.BLOG_VIEW;
}
@@ -217,8 +214,7 @@
// Calculating the added & removed categories sets.
Set selectedCategories = getSelectedCategories();
if (selectedCategories.size() == 0) {
- UITools.addErrorMessage("DELETE: not yet supported!");
- return null;
+ return UITools.POST_DEL;
}
Set currentCategories = getCurrentCategories();
@@ -285,6 +281,26 @@
return blogView.getReturnTo();
}
+ public String delete() {
+ try {
+ ModifiableBlogModel model = BlogTools.getBlogService().getStoreService().getBlogModel(
+ blogView.getBlogName());
+ ModifiableBlogPost post = model.getModifiableBlogPostByTitleAsId(
+ blogView.getSelectedPostTitleAsId());
+
+ BlogTools.getBlogService().getStoreService().deletePost(post);
+
+ UITools.addInfoMessage("Post deleted.");
+ } catch (BlogModelDoesNotExistException e) {
+ UITools.addMessageBlogDoesntExist(blogView.getBlogName());
+ } catch (BlogPostDoesNotExistException e) {
+ UITools.addMessagePostDoesntExist(blogView.getSelectedPostTitleAsId());
+ }
+
+ return UITools.BLOG_VIEW;
+
+ }
+
public String back() {
return blogView.getReturnTo();
}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java 2006-11-11 16:10:14 UTC (rev 27)
@@ -5,6 +5,7 @@
import java.util.Set;
/**
+ *
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public class SelectableBlogName {
Modified: trunk/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.xml 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.xml 2006-11-11 16:10:14 UTC (rev 27)
@@ -113,4 +113,12 @@
<to-view-id>/views/post_new.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/post_edit.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>post_del</from-outcome>
+ <to-view-id>/views/post_del.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
</faces-config>
Added: trunk/blog-core/src/web/blog.css
===================================================================
--- trunk/blog-core/src/web/blog.css 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/web/blog.css 2006-11-11 16:10:14 UTC (rev 27)
@@ -0,0 +1,18 @@
+.blog-body {
+ font-family: Helvetica, Arial, sans-serif;
+ font-size: 12px;
+}
+
+.blog-header {
+ font-weight: bold;
+ font-size: 16px;
+}
+
+.blog-description {
+
+}
+
+.admin-link {
+ font-style: italic;
+ font-size: 10px
+}
\ 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-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/web/views/blog_view.xhtml 2006-11-11 16:10:14 UTC (rev 27)
@@ -6,10 +6,17 @@
xmlns:blog="http://www.jboss.org/portal/jbossblog">
<ui:composition template="view.xhtml">
<ui:define name="editlink">
- <h:commandLink value="Edit" action="#{blogView.blogEditFromBlogView}" />
+ <h:commandLink value="edit" action="#{blogView.blogEditFromBlogView}" />
</ui:define>
<ui:define name="viewmain">
+ <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
+ <h:form>
+ <p class="admin-link">You can <h:commandLink value="create" action="#{blogView.postNew}" />
+ new posts in this blog.</p>
+ </h:form>
+ </blog:isAllowed>
+
<h2>Entries</h2>
<ul>
<h:dataTable value="#{blogView.posts}" var="post" binding="#{blogView.postsData}">
@@ -44,25 +51,22 @@
</h:dataTable>
</ul>
+ <h:panelGroup rendered="#{blogView.hasPrevious || blogView.hasNext}">
<h2>Navigation</h2>
+ </h:panelGroup>
+
<h:panelGroup rendered="#{blogView.hasPrevious}">
<h:form>
- <h:commandLink action="#{blogView.previous}">Previous</h:commandLink>
+ <h:commandLink action="#{blogView.previous}"><< Previous</h:commandLink>
</h:form>
<br />
</h:panelGroup>
<h:panelGroup rendered="#{blogView.hasNext}">
<h:form>
- <h:commandLink action="#{blogView.next}">Next</h:commandLink>
+ <h:commandLink action="#{blogView.next}">Next >></h:commandLink>
</h:form>
</h:panelGroup>
-
- <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
- <h:form>
- <h:commandLink value="New post" action="#{blogView.postNew}" />
- </h:form>
- </blog:isAllowed>
</ui:define>
</ui:composition>
</div>
Modified: trunk/blog-core/src/web/views/common.xhtml
===================================================================
--- trunk/blog-core/src/web/views/common.xhtml 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/web/views/common.xhtml 2006-11-11 16:10:14 UTC (rev 27)
@@ -1,14 +1,22 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
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">
- <!--<link rel='stylesheet' type='text/css' href='/???.css' media='screen'/>-->
-
+<head>
+ <title></title>
+ <link rel='stylesheet' type='text/css' href='/jboss-blog/blog.css' media='screen'/>
+</head>
+<body class="blog-body">
<f:loadBundle basename="Messages" var="messages"/>
<blog:isAllowed fragment="#{requiredPermission}" contextData="#{blogView.blogName}">
<ui:insert name="content" />
</blog:isAllowed>
-</div>
\ No newline at end of file
+</body>
+</html>
\ No newline at end of file
Added: trunk/blog-core/src/web/views/del_confirm.xhtml
===================================================================
--- trunk/blog-core/src/web/views/del_confirm.xhtml 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/web/views/del_confirm.xhtml 2006-11-11 16:10:14 UTC (rev 27)
@@ -0,0 +1,20 @@
+<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="common.xhtml">
+ <ui:define name="content">
+ <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>?
+
+ <ui:insert name="cancellink" />
+ <ui:insert name="deletelink" />
+ </h:form>
+ </ui:define>
+ </ui:composition>
+</div>
\ No newline at end of file
Added: trunk/blog-core/src/web/views/post_del.xhtml
===================================================================
--- trunk/blog-core/src/web/views/post_del.xhtml 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/web/views/post_del.xhtml 2006-11-11 16:10:14 UTC (rev 27)
@@ -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://managePost" />
+
+ <ui:define name="delname">
+ post
+ </ui:define>
+
+ <ui:define name="delsubject">
+ #{blogView.selectedPost.title}
+ </ui:define>
+
+ <ui:define name="cancellink">
+ <h:commandLink value="No" action="#{postEdit.back}" />
+ </ui:define>
+
+ <ui:define name="deletelink">
+ <h:commandLink value="Yes" action="#{postEdit.delete}" />
+ </ui:define>
+ </ui:composition>
+</div>
\ No newline at end of file
Modified: trunk/blog-core/src/web/views/post_view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/post_view.xhtml 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/web/views/post_view.xhtml 2006-11-11 16:10:14 UTC (rev 27)
@@ -6,7 +6,7 @@
xmlns:blog="http://www.jboss.org/portal/jbossblog">
<ui:composition template="view.xhtml">
<ui:define name="editlink">
- <h:commandLink value="Edit" action="#{blogView.blogEditFromPostView}" />
+ <h:commandLink value="edit" action="#{blogView.blogEditFromPostView}" />
</ui:define>
<ui:define name="viewmain">
Modified: trunk/blog-core/src/web/views/view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/view.xhtml 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/blog-core/src/web/views/view.xhtml 2006-11-11 16:10:14 UTC (rev 27)
@@ -7,25 +7,30 @@
<ui:composition template="common.xhtml">
<ui:param name="requiredPermission" value="acl://viewCategory" />
<ui:define name="content">
- <h2>Info</h2>
+ <p class="blog-header">
+ #{blogView.blogModel.title} created by
+ <h:panelGroup rendered="#{not empty blogView.blogName.category}">
+ #{blogView.blogModel.author}, category: #{blogView.blogName.category}
+ </h:panelGroup>
+ <h:panelGroup rendered="#{empty blogView.blogName.category}">
+ #{blogView.blogModel.author}
+ </h:panelGroup>
+ </p>
- <h:messages />
+ <p class="blog-description">
+ #{blogView.blogModel.description}
+ </p>
- Title: #{blogView.blogModel.title} <br />
- Description: #{blogView.blogModel.description} <br />
- Author: #{blogView.blogModel.author}
- <h:panelGroup rendered="#{not empty blogView.blogName.category}">
- <br />Category: #{blogView.blogName.category}
- </h:panelGroup>
-
<h:panelGroup rendered="#{blogView.blogModifiable}">
<blog:isAllowed fragment="acl://manageCategory" contextData="#{blogView.blogName}">
<h:form>
- <p>Click here to edit: <ui:insert name="editlink" /></p>
+ <p class="admin-link">You can <ui:insert name="editlink" /> this blog's data.</p>
</h:form>
</blog:isAllowed>
</h:panelGroup>
+ <h:messages />
+
<ui:insert name="viewmain" />
</ui:define>
</ui:composition>
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2006-11-11 14:25:51 UTC (rev 26)
+++ trunk/jbossblog.iws 2006-11-11 16:10:14 UTC (rev 27)
@@ -17,30 +17,20 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/post_del.xhtml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/common.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/common.xhtml" />
<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="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogPost.java" />
- <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="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/post_new.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java" />
- <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="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="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/service/store/hibernate/HBlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.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/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/etc/META-INF/acl-mapping.xml" afterPath="$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.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/java/org/jboss/blog/service/store/model/ModifiableBlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogPost.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/del_confirm.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="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/blog.css" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java" />
<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/java/org/jboss/blog/model/BlogModel.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogModel.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogModel.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogModel.java" />
- <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="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/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/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -165,85 +155,61 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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">
+ <file leaf-file-name="view.xhtml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="168" column="46" selection-start="4470" selection-end="4470" vertical-scroll-proportion="0.6217949">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="HBlogPost.hbm.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="29" column="29" selection-start="1036" selection-end="1036" vertical-scroll-proportion="0.69711536">
+ <state line="26" column="46" selection-start="1232" selection-end="1254" vertical-scroll-proportion="0.6331169">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
</file>
- <file leaf-file-name="HBlogModel.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java">
+ <file leaf-file-name="common.xhtml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/common.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="186" column="27" selection-start="4910" selection-end="4910" vertical-scroll-proportion="1.1394231">
+ <state line="4" column="66" selection-start="243" selection-end="243" vertical-scroll-proportion="0.097402595">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
</file>
- <file leaf-file-name="HBlogPost.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java">
+ <file leaf-file-name="blog_view.xhtml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="122" column="54" selection-start="2702" selection-end="2702" vertical-scroll-proportion="1.1153846">
+ <state line="66" column="70" selection-start="2617" selection-end="2617" vertical-scroll-proportion="0.8766234">
<folding />
</state>
</provider>
- </entry>
- </file>
- <file leaf-file-name="HibernateBlogStoreService.java" pinned="false" current="true" current-in-tab="true">
- <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="205" column="42" selection-start="6828" selection-end="6828" vertical-scroll-proportion="0.525641">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
+ <provider editor-type-id="HtmlPreview">
+ <state />
</provider>
</entry>
</file>
- <file leaf-file-name="ModifiableBlogModel.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogModel.java">
+ <file leaf-file-name="post_view.xhtml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="17" column="41" selection-start="550" selection-end="550" vertical-scroll-proportion="0.28846154">
+ <state line="8" column="31" selection-start="389" selection-end="389" vertical-scroll-proportion="0.19480519">
<folding />
</state>
</provider>
- </entry>
- </file>
- <file leaf-file-name="BlogView.java" pinned="false" current="false" current-in-tab="false">
- <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="193" column="73" selection-start="5497" selection-end="5497" vertical-scroll-proportion="-0.011217949">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
+ <provider editor-type-id="HtmlPreview">
+ <state />
</provider>
</entry>
</file>
- <file leaf-file-name="post_mod.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml">
+ <file leaf-file-name="blog.css" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="71" selection-start="2161" selection-end="2161" vertical-scroll-proportion="0.89464885">
+ <state line="14" column="6" selection-start="176" selection-end="176" vertical-scroll-proportion="0.3271028">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
</file>
</leaf>
@@ -377,7 +343,29 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/web" />
<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/web" />
+ <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/web/WEB-INF" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -1233,74 +1221,81 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogModel.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="22" selection-start="207" selection-end="207" vertical-scroll-proportion="0.1923077">
+ <state line="19" column="62" selection-start="585" selection-end="585" vertical-scroll-proportion="0.35576922">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogPost.java">
+ <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="17" column="51" selection-start="555" selection-end="555" vertical-scroll-proportion="0.33653846">
+ <state line="186" column="27" selection-start="4910" selection-end="4910" vertical-scroll-proportion="1.1394231">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogPost.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
+ <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="26" selection-start="734" selection-end="734" vertical-scroll-proportion="0.6730769">
+ <state line="116" column="26" selection-start="4090" selection-end="4090" vertical-scroll-proportion="0.99498326">
<folding />
</state>
</provider>
+ <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogModel.java">
+ <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="21" column="33" selection-start="641" selection-end="641" vertical-scroll-proportion="0.45673078">
- <folding />
+ <state line="298" column="11" selection-start="9448" selection-end="9448" vertical-scroll-proportion="0.66346157">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogModel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="88" column="90" selection-start="3147" selection-end="3147" vertical-scroll-proportion="0.6394231">
+ <state line="17" column="41" selection-start="550" selection-end="550" vertical-scroll-proportion="0.28037384">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml">
+ <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="29" column="29" selection-start="1036" selection-end="1036" vertical-scroll-proportion="0.69711536">
- <folding />
+ <state line="193" column="73" selection-start="5497" selection-end="5497" vertical-scroll-proportion="-0.010903426">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="122" column="54" selection-start="2702" selection-end="2702" vertical-scroll-proportion="1.1153846">
+ <state line="57" column="16" selection-start="2334" selection-end="2334" vertical-scroll-proportion="1.387987">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/del_confirm.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="186" column="27" selection-start="4910" selection-end="4910" vertical-scroll-proportion="1.1394231">
+ <state line="14" column="22" selection-start="611" selection-end="611" vertical-scroll-proportion="0.3409091">
<folding />
</state>
</provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="4" column="44" selection-start="175" selection-end="175" vertical-scroll-proportion="-1.4759616">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
+ <provider editor-type-id="HtmlPreview">
+ <state />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_del.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="71" selection-start="2161" selection-end="2161" vertical-scroll-proportion="0.89464885">
+ <state line="6" column="41" selection-start="328" selection-end="328" vertical-scroll-proportion="0.14610389">
<folding />
</state>
</provider>
@@ -1308,48 +1303,52 @@
<state />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="193" column="73" selection-start="5497" selection-end="5497" vertical-scroll-proportion="-0.011217949">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="14" column="6" selection-start="176" selection-end="176" vertical-scroll-proportion="0.3271028">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/model/ModifiableBlogModel.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="17" column="41" selection-start="550" selection-end="550" vertical-scroll-proportion="0.28846154">
+ <state line="26" column="46" selection-start="1232" selection-end="1254" vertical-scroll-proportion="0.6331169">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/common.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="0" selection-start="672" selection-end="672" vertical-scroll-proportion="0.69711536">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="4" column="66" selection-start="243" selection-end="243" vertical-scroll-proportion="0.097402595">
+ <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/post_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="168" column="46" selection-start="4470" selection-end="4470" vertical-scroll-proportion="0.6217949">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="8" column="31" selection-start="389" selection-end="389" vertical-scroll-proportion="0.19480519">
+ <folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <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/web/views/blog_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="205" column="42" selection-start="6828" selection-end="6828" vertical-scroll-proportion="0.525641">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="66" column="70" selection-start="2617" selection-end="2617" vertical-scroll-proportion="0.8766234">
+ <folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
</component>
</project>
More information about the jboss-cvs-commits
mailing list