[jboss-cvs] JBossBlog SVN: r28 - in trunk: . blog-core/src/etc/META-INF 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
Mon Nov 13 18:38:55 EST 2006
Author: adamw
Date: 2006-11-13 18:38:46 -0500 (Mon, 13 Nov 2006)
New Revision: 28
Added:
trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java
trunk/blog-core/src/web/views/admin_panel.xhtml
trunk/blog-core/src/web/views/id_edit.xhtml
Modified:
trunk/blog-core/src/etc/META-INF/acl-mapping.xml
trunk/blog-core/src/etc/META-INF/acl-permissions.xml
trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java
trunk/blog-core/src/web/WEB-INF/faces-config.xml
trunk/blog-core/src/web/blog.css
trunk/blog-core/src/web/views/blog_mod.xhtml
trunk/blog-core/src/web/views/blog_view.xhtml
trunk/blog-core/src/web/views/post_edit.xhtml
trunk/blog-core/src/web/views/post_mod.xhtml
trunk/blog-core/src/web/views/post_new.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 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/etc/META-INF/acl-mapping.xml 2006-11-13 23:38:46 UTC (rev 28)
@@ -29,13 +29,20 @@
<acl>
<!-- Blog Admin usecases -->
<module id="adminModule" name="Admin Module">
- <function id="accessAdminModule" name="Access Admin Module">
- <!-- ui protection -->
+ <!-- only ui protection -->
+ <function id="accessAdminModule" name="Access Admin Module">
<resource type="fragment" criteriaId="accessAdminModule://ui">
<id>acl://accessAdminModule</id>
</resource>
</function>
+ <!-- only ui protection -->
+ <function id="manageBlog" name="Manage Blog">
+ <resource type="fragment" criteriaId="manageBlog://ui">
+ <id>acl://manageBlog</id>
+ </resource>
+ </function>
+
<function id="manageCategory" name="Manage Category">
<!-- ui protection -->
<resource type="fragment" criteriaId="manageCategory://ui">
@@ -47,20 +54,7 @@
<method>save</method>
</resource>
<implies>accessAdminModule</implies>
- </function>
-
- <function id="manageBlog" name="Manage Blog">
- <!-- ui protection -->
- <resource type="fragment" criteriaId="manageBlog://ui">
- <id>acl://manageBlog</id>
- </resource>
- <!-- action protection -->
- <!--<resource type="jsfAction" criteriaId="manageBlogs://action">
- <class>org.jboss.blog.ui.action.AdminController</class>
- <method>manageBlogs</method>
- </resource>-->
- <implies>manageCategory</implies>
- </function>
+ </function>
</module>
<!-- Blog User usecases -->
Modified: trunk/blog-core/src/etc/META-INF/acl-permissions.xml
===================================================================
--- trunk/blog-core/src/etc/META-INF/acl-permissions.xml 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/etc/META-INF/acl-permissions.xml 2006-11-13 23:38:46 UTC (rev 28)
@@ -29,8 +29,10 @@
<criteria for="readCategory://ui">param[0].title.toLowerCase().startsWith('unit testing')</criteria>
</permission-->
<permission action="viewComment"/>
+ <permission action="managePost"/>
+
<permission action="manageCategory"/>
- <permission action="managePost"/>
+ <permission action="manageBlog"/>
<!-- <permission action="all"/> -->
<!-- Owner Module permissions -->
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 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2006-11-13 23:38:46 UTC (rev 28)
@@ -15,6 +15,8 @@
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";
public static void addInfoMessage(String message) {
FacesContext.getCurrentInstance().addMessage(null,
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-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2006-11-13 23:38:46 UTC (rev 28)
@@ -273,6 +273,7 @@
}
public String postNew() {
+ exitFromBlogView();
return UITools.POST_NEW;
}
Added: trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java 2006-11-13 23:38:46 UTC (rev 28)
@@ -0,0 +1,160 @@
+package org.jboss.blog.ui;
+
+import org.jboss.blog.tools.BlogTools;
+import org.jboss.blog.tools.UITools;
+import org.jboss.blog.BlogName;
+
+import javax.faces.model.SelectItem;
+import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+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() {
+
+ }
+
+ public State getState() {
+ return state;
+ }
+
+ public void setState(State state) {
+ this.state = state;
+ }
+
+ private void populateRawIds() {
+ if (rawIds == null) {
+ rawIds = BlogTools.getBlogService().getStoreService().getAllBlogs();
+ }
+ }
+
+ public List getIds() {
+ if (ids == null) {
+ populateRawIds();
+ ids = new ArrayList();
+
+ for (Iterator iter = rawIds.iterator(); iter.hasNext();) {
+ BlogName next = (BlogName) iter.next();
+ ids.add(new SelectItem(next.getId(), next.getId()));
+ }
+ }
+
+ return ids;
+ }
+
+ public List getCategories() {
+ if (categories == null) {
+ List rawCategories = BlogTools.getBlogService().getStoreService()
+ .getAllCategories(new BlogName(getState().getSelectedBlogId(), null));
+ categories = new ArrayList();
+
+ for (Iterator iter = rawCategories.iterator(); iter.hasNext();) {
+ BlogName next = (BlogName) iter.next();
+ categories.add(new SelectItem(next.getCategory(), next.getCategory()));
+ }
+ }
+
+ return categories;
+ }
+
+ public Boolean getCategoryExists() {
+ if (categoryExists == null) {
+ categoryExists = Boolean.valueOf(getCategories().size() > 0);
+ }
+
+ return categoryExists;
+ }
+
+ public String getNewId() {
+ return newId;
+ }
+
+ public void setNewId(String newId) {
+ this.newId = newId;
+ }
+
+ public String getExistingId() {
+ return existingId;
+ }
+
+ public void setExistingId(String existingId) {
+ this.existingId = existingId;
+ }
+
+ public String getNewCategory() {
+ return newCategory;
+ }
+
+ public void setNewCategory(String newCategory) {
+ this.newCategory = newCategory;
+ }
+
+ public String getExistingCategory() {
+ return existingCategory;
+ }
+
+ public void setExistingCategory(String existingCategory) {
+ this.existingCategory = existingCategory;
+ }
+
+ public String getDeleteCategory() {
+ return deleteCategory;
+ }
+
+ public void setDeleteCategory(String deleteCategory) {
+ this.deleteCategory = deleteCategory;
+ }
+
+ // Actions
+
+ public String editExisting() {
+ getState().setSelectedBlogId(getExistingId());
+
+ return UITools.ID_EDIT;
+ }
+
+ public String editNew() {
+ // Checking if the new id is not empty.
+ if (BlogTools.isEmpty(getNewId())) {
+ UITools.addErrorMessage("New blog id cannot be null.");
+ return null;
+ }
+
+ // And if it doesn't already exist.
+ populateRawIds();
+ if (rawIds.contains(new BlogName(getNewId(), null))) {
+ UITools.addErrorMessage("Blog id already exists.");
+ return null;
+ }
+
+ getState().setSelectedBlogId(getNewId());
+
+ return UITools.ID_EDIT;
+ }
+
+ public String newCategory() {
+ return null;
+ }
+
+ public String editCategory() {
+ return null;
+ }
+
+ public String deleteCategory() {
+ return 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 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java 2006-11-13 23:38:46 UTC (rev 28)
@@ -268,9 +268,9 @@
}
if (changed) {
- UITools.addInfoMessage("Post properties saved.");
+ UITools.addInfoMessage("Post data saved.");
} else {
- UITools.addInfoMessage("No post properties were modified.");
+ UITools.addInfoMessage("No post data was modified.");
}
} catch (BlogModelDoesNotExistException e) {
UITools.addMessageBlogDoesntExist(blogView.getBlogName());
Modified: trunk/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.xml 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.xml 2006-11-13 23:38:46 UTC (rev 28)
@@ -53,11 +53,22 @@
</managed-bean>
<managed-bean>
+ <managed-bean-name>idEdit</managed-bean-name>
+ <managed-bean-class>org.jboss.blog.ui.IdEdit</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>state</property-name>
+ <value>#{state}</value>
+ </managed-property>
+ </managed-bean>
+
+ <managed-bean>
<managed-bean-name>state</managed-bean-name>
<managed-bean-class>org.jboss.blog.ui.State</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <!-- Post/ blog view -->
<navigation-rule>
<from-view-id>*</from-view-id>
<navigation-case>
@@ -74,51 +85,78 @@
</navigation-case>
</navigation-rule>
+ <!-- Post edit/new/del -->
<navigation-rule>
<from-view-id>/views/index.xhtml</from-view-id>
<navigation-case>
- <from-outcome>blog_edit</from-outcome>
- <to-view-id>/views/blog_edit.xhtml</to-view-id>
+ <from-outcome>post_edit</from-outcome>
+ <to-view-id>/views/post_edit.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/views/post_view.xhtml</from-view-id>
<navigation-case>
- <from-outcome>blog_edit</from-outcome>
- <to-view-id>/views/blog_edit.xhtml</to-view-id>
+ <from-outcome>post_edit</from-outcome>
+ <to-view-id>/views/post_edit.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/views/index.xhtml</from-view-id>
<navigation-case>
- <from-outcome>post_edit</from-outcome>
- <to-view-id>/views/post_edit.xhtml</to-view-id>
+ <from-outcome>post_new</from-outcome>
+ <to-view-id>/views/post_new.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/views/post_view.xhtml</from-view-id>
+ <from-view-id>/views/post_edit.xhtml</from-view-id>
<navigation-case>
- <from-outcome>post_edit</from-outcome>
- <to-view-id>/views/post_edit.xhtml</to-view-id>
+ <from-outcome>post_del</from-outcome>
+ <to-view-id>/views/post_del.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+ <!-- Admin -->
<navigation-rule>
<from-view-id>/views/index.xhtml</from-view-id>
<navigation-case>
- <from-outcome>post_new</from-outcome>
- <to-view-id>/views/post_new.xhtml</to-view-id>
+ <from-outcome>admin_panel</from-outcome>
+ <to-view-id>/views/admin_panel.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/views/post_edit.xhtml</from-view-id>
+ <from-view-id>/views/admin_panel.xhtml</from-view-id>
<navigation-case>
- <from-outcome>post_del</from-outcome>
- <to-view-id>/views/post_del.xhtml</to-view-id>
+ <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/id_edit.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>
+
+ <!-- Blog edit/new/del -->
+ <navigation-rule>
+ <from-view-id>/views/index.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>blog_edit</from-outcome>
+ <to-view-id>/views/blog_edit.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/post_view.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>blog_edit</from-outcome>
+ <to-view-id>/views/blog_edit.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-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/blog.css 2006-11-13 23:38:46 UTC (rev 28)
@@ -3,16 +3,51 @@
font-size: 12px;
}
-.blog-header {
+.blog-description {
+
+}
+
+.admin-link {
+ font-style: italic;
+ font-size: 10px;
+}
+
+.posts {
+ border-spacing: 10px;
+}
+
+.posts-row {
+ font-family: Helvetica, Arial, sans-serif;
+ font-size: 12px;
+}
+
+.posts-row-alternate {
+ font-family: Helvetica, Arial, sans-serif;
+ font-size: 12px;
+}
+
+.post-title {
font-weight: bold;
- font-size: 16px;
}
-.blog-description {
+.post-title-big {
+ font-weight: bold;
+ font-size: 14px;
+}
+.post-data {
}
-.admin-link {
- font-style: italic;
- font-size: 10px
+.post-description {
+
+}
+
+h4 {
+ font-weight: bold;
+ font-size: 12px;
+ text-align: left;
+}
+
+.sidenote {
+ font-size: 10px;
}
\ No newline at end of file
Added: trunk/blog-core/src/web/views/admin_panel.xhtml
===================================================================
--- trunk/blog-core/src/web/views/admin_panel.xhtml 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/views/admin_panel.xhtml 2006-11-13 23:38:46 UTC (rev 28)
@@ -0,0 +1,46 @@
+<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:param name="requiredPermission" value="acl://accessAdminModule" />
+ <ui:define name="content">
+ <h2>Blog Administration</h2>
+
+ <h:messages />
+
+ <h:form>
+ <h:panelGrid columns="3">
+ <blog:isAllowed fragment="acl://manageBlog">
+ <h:panelGroup>
+ Create and edit a new blog id
+ </h:panelGroup>
+ <h:panelGroup>
+ <h:inputText value="#{idEdit.newId}"
+ maxlength="64" size="32" />
+ </h:panelGroup>
+ <h:panelGroup>
+ <h:commandLink action="#{idEdit.editNew}" value="Go >>"/>
+ </h:panelGroup>
+ </blog:isAllowed>
+
+ <h:panelGroup>
+ Edit an existing blog id
+ </h:panelGroup>
+ <h:panelGroup>
+ <h:selectOneMenu value="#{idEdit.existingId}">
+ <f:selectItems value="#{idEdit.ids}" />
+ </h:selectOneMenu>
+ </h:panelGroup>
+ <h:panelGroup>
+ <h:commandLink action="#{idEdit.editExisting}" value="Go >>"/>
+ </h:panelGroup>
+
+ <h:commandLink value="<< Back" action="blog_view" immediate="true"/>
+ </h:panelGrid>
+ </h:form>
+ </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-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/views/blog_mod.xhtml 2006-11-13 23:38:46 UTC (rev 28)
@@ -11,32 +11,38 @@
<h:messages />
<h:form>
+ <h4><ui:insert name="edittableheader" /></h4>
<h:panelGrid columns="2">
- <f:facet name="header">
- <ui:insert name="edittableheader" />
- </f:facet>
<h:panelGroup>Title: (*)</h:panelGroup>
<h:panelGroup>
- <h:inputText value="#{blogEdit.title}" required="true" />
+ <h:inputText value="#{blogEdit.title}" required="true"
+ maxlength="255" size="32" />
</h:panelGroup>
<h:panelGroup>Author: (*)</h:panelGroup>
<h:panelGroup>
- <h:inputText value="#{blogEdit.author}" required="true" />
+ <h:inputText value="#{blogEdit.author}" required="true"
+ maxlength="255" size="32" />
</h:panelGroup>
<h:panelGroup>Link: (*)</h:panelGroup>
<h:panelGroup>
- <h:inputText value="#{blogEdit.link}" required="true" />
+ <h:inputText value="#{blogEdit.link}" required="true"
+ maxlength="255" size="32" />
</h:panelGroup>
<h:panelGroup>Description:</h:panelGroup>
<h:panelGroup>
- <h:inputTextarea value="#{blogEdit.description}" />
+ <h:inputTextarea value="#{blogEdit.description}" rows="10" cols="40" />
</h:panelGroup>
</h:panelGrid>
- <h:commandLink value="Back" action="#{blogEdit.back}" immediate="true"/> <br />
+ <p class="sidenote">
+ Fields marked with (*) are required.
+ </p>
+
+ <h:commandLink value="<< Back" action="#{blogEdit.back}" immediate="true"/>
+  
<h:commandLink value="Save" action="#{blogEdit.save}" />
</h:form>
</ui:define>
Modified: trunk/blog-core/src/web/views/blog_view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/blog_view.xhtml 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/views/blog_view.xhtml 2006-11-13 23:38:46 UTC (rev 28)
@@ -16,57 +16,63 @@
new posts in this blog.</p>
</h:form>
</blog:isAllowed>
+
+ <blog:isAllowed fragment="acl://accessAdminModule">
+ <h:form>
+ <p class="admin-link">You can <h:commandLink value="administrate" action="admin_panel" />
+ blogs.</p>
+ </h:form>
+ </blog:isAllowed>
- <h2>Entries</h2>
- <ul>
- <h:dataTable value="#{blogView.posts}" var="post" binding="#{blogView.postsData}">
+ <h:form>
+ <h:dataTable value="#{blogView.posts}" var="post" binding="#{blogView.postsData}"
+ rowClasses="posts-row,posts-row-alternate" styleClass="posts">
<h:column>
- <li>
- <h:form>
- <b>
- <h:commandLink value="#{post.title}"
- action="#{blogView.postView}"
- rendered="#{blogView.postsExpandable}" />
+ <p>
+ <span class="post-title">
+ <h:commandLink value="#{post.title}"
+ action="#{blogView.postView}"
+ rendered="#{blogView.postsExpandable}" />
- <h:outputText value="#{post.title}"
- rendered="#{!blogView.postsExpandable}" />
- </b>
- <br />
+ <h:outputText value="#{post.title}"
+ rendered="#{!blogView.postsExpandable}" />
+ </span>
+ <span class="post-data">
+ created on #{post.createdTime}, #{post.createdDate} by #{post.author}.
+ </span>
+ </p>
- <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
- <h:commandLink value="Edit"
- action="#{blogView.postEditFromBlogView}" />
- </blog:isAllowed>
- </h:form>
-
<h:panelGroup rendered="#{!blogView.viewPostsOnSeparatePage and
(blogView.viewAllPosts ||
(blogView.selectedPostTitleAsId == post.titleAsId))}">
- #{post.description}
+ <p class="post-description">
+ #{post.description}
+ </p>
</h:panelGroup>
+ </h:column>
- <hr />
- </li>
+ <h:column>
+ <p>
+ <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
+ <span class="admin-link">
+ <h:commandLink value="Edit" action="#{blogView.postEditFromBlogView}" />
+ </span>
+ </blog:isAllowed>
+ </p>
</h:column>
</h:dataTable>
- </ul>
+ </h:form>
- <h:panelGroup rendered="#{blogView.hasPrevious || blogView.hasNext}">
- <h2>Navigation</h2>
- </h:panelGroup>
-
- <h:panelGroup rendered="#{blogView.hasPrevious}">
- <h:form>
+ <h:form>
+ <h:panelGroup rendered="#{blogView.hasPrevious}">
<h:commandLink action="#{blogView.previous}"><< Previous</h:commandLink>
- </h:form>
- <br />
- </h:panelGroup>
-
- <h:panelGroup rendered="#{blogView.hasNext}">
- <h:form>
+
+ </h:panelGroup>
+
+ <h:panelGroup rendered="#{blogView.hasNext}">
<h:commandLink action="#{blogView.next}">Next >></h:commandLink>
- </h:form>
- </h:panelGroup>
+ </h:panelGroup>
+ </h:form>
</ui:define>
</ui:composition>
</div>
Added: trunk/blog-core/src/web/views/id_edit.xhtml
===================================================================
--- trunk/blog-core/src/web/views/id_edit.xhtml 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/views/id_edit.xhtml 2006-11-13 23:38:46 UTC (rev 28)
@@ -0,0 +1,56 @@
+<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:param name="requiredPermission" value="acl://accessAdminModule" />
+ <ui:define name="content">
+ <h2>Editing id: #{state.selectedBlogId}</h2>
+
+ <h:messages />
+
+ <h:form>
+ <h:panelGrid columns="3">
+ <h:panelGroup>
+ New category
+ </h:panelGroup>
+ <h:panelGroup>
+ <h:inputText value="#{idEdit.newCategory}"
+ maxlength="128" size="32" />
+ </h:panelGroup>
+ <h:panelGroup>
+ <h:commandLink action="#{idEdit.newCategory}" value="Go >>"/>
+ </h:panelGroup>
+
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
+ Edit an existing blog category
+ </h:panelGroup>
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
+ <h:selectOneMenu value="#{idEdit.existingCategory}">
+ <f:selectItems value="#{idEdit.categories}" />
+ </h:selectOneMenu>
+ </h:panelGroup>
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
+ <h:commandLink action="#{idEdit.editCategory}" value="Go >>"/>
+ </h:panelGroup>
+
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
+ Delete a blog category
+ </h:panelGroup>
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
+ <h:selectOneMenu value="#{idEdit.deleteCategory}">
+ <f:selectItems value="#{idEdit.categories}" />
+ </h:selectOneMenu>
+ </h:panelGroup>
+ <h:panelGroup rendered="#{idEdit.categoryExists}">
+ <h:commandLink action="#{idEdit.deleteCategory}" value="Go >>"/>
+ </h:panelGroup>
+
+ <h:commandLink value="<< Back" action="admin_panel" immediate="true"/>
+ </h:panelGrid>
+ </h:form>
+ </ui:define>
+ </ui:composition>
+</div>
\ No newline at end of file
Modified: trunk/blog-core/src/web/views/post_edit.xhtml
===================================================================
--- trunk/blog-core/src/web/views/post_edit.xhtml 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/views/post_edit.xhtml 2006-11-13 23:38:46 UTC (rev 28)
@@ -12,11 +12,15 @@
</ui:define>
<ui:define name="edittableheader">
- Change post properties:
+ Change post data:
</ui:define>
<ui:define name="savelink">
<h:commandLink value="Save" action="#{postEdit.save}" />
</ui:define>
+
+ <ui:define name="sidenotes">
+ To delete a post, remove it from all categories.
+ </ui:define>
</ui:composition>
</div>
\ No newline at end of file
Modified: trunk/blog-core/src/web/views/post_mod.xhtml
===================================================================
--- trunk/blog-core/src/web/views/post_mod.xhtml 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/views/post_mod.xhtml 2006-11-13 23:38:46 UTC (rev 28)
@@ -11,42 +11,45 @@
<h:messages />
<h:form>
- <h:panelGrid columns="2">
- <f:facet name="header">
- <ui:insert name="edittableheader" />
- </f:facet>
+ <h4><ui:insert name="edittableheader" /></h4>
+ <h:panelGrid columns="2" headerClass="">
<h:panelGroup>Title: (*)</h:panelGroup>
<h:panelGroup>
- <h:inputText value="#{postEdit.title}" required="true" />
+ <h:inputText value="#{postEdit.title}" required="true"
+ maxlength="255" size="32" />
</h:panelGroup>
<h:panelGroup>Author: (*)</h:panelGroup>
<h:panelGroup>
- <h:inputText value="#{postEdit.author}" required="true" />
+ <h:inputText value="#{postEdit.author}" required="true"
+ maxlength="255" size="32" />
</h:panelGroup>
<h:panelGroup>Link: (*)</h:panelGroup>
<h:panelGroup>
- <h:inputText value="#{postEdit.link}" required="true" />
+ <h:inputText value="#{postEdit.link}" required="true"
+ maxlength="255" size="32" />
</h:panelGroup>
<h:panelGroup>Guid: (*)</h:panelGroup>
<h:panelGroup>
- <h:inputText value="#{postEdit.guid}" required="true" />
+ <h:inputText value="#{postEdit.guid}" required="true"
+ maxlength="255" size="32" />
</h:panelGroup>
<h:panelGroup>Description:</h:panelGroup>
<h:panelGroup>
- <h:inputTextarea value="#{postEdit.description}" />
+ <h:inputTextarea value="#{postEdit.description}" rows="10" cols="40" />
</h:panelGroup>
<h:panelGroup>Comment link:</h:panelGroup>
<h:panelGroup>
- <h:inputText value="#{postEdit.commentLink}" />
+ <h:inputText value="#{postEdit.commentLink}"
+ maxlength="255" size="32" />
</h:panelGroup>
</h:panelGrid>
- <h3>Post categories:</h3>
+ <h4>Select categories, to which this post should belong:</h4>
<h:dataTable value="#{postEdit.blogs}" var="blog">
<h:column>
<h:selectBooleanCheckbox value="#{blog.selected}" />
@@ -56,7 +59,12 @@
</h:column>
</h:dataTable>
- <h:commandLink value="Back" action="#{postEdit.back}" immediate="true"/> <br />
+ <p class="sidenote">
+ Fields marked with (*) are required. <ui:insert name="sidenotes" />
+ </p>
+
+ <h:commandLink value="<< Back" action="#{postEdit.back}" immediate="true"/>
+  
<ui:insert name="savelink" />
</h:form>
</ui:define>
Modified: trunk/blog-core/src/web/views/post_new.xhtml
===================================================================
--- trunk/blog-core/src/web/views/post_new.xhtml 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/views/post_new.xhtml 2006-11-13 23:38:46 UTC (rev 28)
@@ -12,11 +12,14 @@
</ui:define>
<ui:define name="edittableheader">
- Input new post properties:
+ Enter new post data:
</ui:define>
<ui:define name="savelink">
<h:commandLink value="Save" action="#{postEdit.saveNew}" />
</ui:define>
+
+ <ui:define name="sidenotes">
+ </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 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/views/post_view.xhtml 2006-11-13 23:38:46 UTC (rev 28)
@@ -10,24 +10,32 @@
</ui:define>
<ui:define name="viewmain">
- <h2>Post</h2>
+ <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
+ <h:form>
+ <p class="admin-link"> You can <h:commandLink value="edit"
+ action="#{blogView.postEditFromPostView}" /> this post.
+ </p>
+ </h:form>
+ </blog:isAllowed>
- <b>#{blogView.selectedPost.title}</b><br />
- #{blogView.selectedPost.description}
-
- <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
- <h:form>
<p>
- <h:commandLink value="Edit"
- action="#{blogView.postEditFromPostView}" />
+ <span class="post-title-big">
+ #{blogView.selectedPost.title}
+ </span>
+ <span class="post-data">
+ created on #{blogView.selectedPost.createdTime},
+ #{blogView.selectedPost.createdDate}
+ by #{blogView.selectedPost.author}.
+ </span>
</p>
- </h:form>
- </blog:isAllowed>
- <h2>Navigation</h2>
+ <p class="post-description">
+ #{blogView.selectedPost.description}
+ </p>
+
<h:form>
<h:commandLink action="#{blogView.blogView}">
- Back
+ << Back
</h:commandLink>
</h:form>
</ui:define>
Modified: trunk/blog-core/src/web/views/view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/view.xhtml 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/blog-core/src/web/views/view.xhtml 2006-11-13 23:38:46 UTC (rev 28)
@@ -7,7 +7,7 @@
<ui:composition template="common.xhtml">
<ui:param name="requiredPermission" value="acl://viewCategory" />
<ui:define name="content">
- <p class="blog-header">
+ <h2>
#{blogView.blogModel.title} created by
<h:panelGroup rendered="#{not empty blogView.blogName.category}">
#{blogView.blogModel.author}, category: #{blogView.blogName.category}
@@ -15,12 +15,14 @@
<h:panelGroup rendered="#{empty blogView.blogName.category}">
#{blogView.blogModel.author}
</h:panelGroup>
- </p>
+ </h2>
<p class="blog-description">
#{blogView.blogModel.description}
</p>
+ <h:messages />
+
<h:panelGroup rendered="#{blogView.blogModifiable}">
<blog:isAllowed fragment="acl://manageCategory" contextData="#{blogView.blogName}">
<h:form>
@@ -29,8 +31,6 @@
</blog:isAllowed>
</h:panelGroup>
- <h:messages />
-
<ui:insert name="viewmain" />
</ui:define>
</ui:composition>
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2006-11-11 16:10:14 UTC (rev 27)
+++ trunk/jbossblog.iws 2006-11-13 23:38:46 UTC (rev 28)
@@ -17,20 +17,23 @@
</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/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="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/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/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/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/web/views/del_confirm.xhtml" />
+ <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="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/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" />
@@ -155,58 +158,99 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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">
+ <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="26" column="46" selection-start="1232" selection-end="1254" vertical-scroll-proportion="0.6331169">
+ <state line="39" column="0" selection-start="1645" selection-end="1645" vertical-scroll-proportion="0.9782609">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
+ </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="common.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/common.xhtml">
+ <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="4" column="66" selection-start="243" selection-end="243" vertical-scroll-proportion="0.097402595">
+ <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="blog_view.xhtml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
+ <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="66" column="70" selection-start="2617" selection-end="2617" vertical-scroll-proportion="0.8766234">
- <folding />
+ <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="post_view.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
+ <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="8" column="31" selection-start="389" selection-end="389" vertical-scroll-proportion="0.19480519">
+ <state line="34" column="38" selection-start="1377" selection-end="1377" vertical-scroll-proportion="0.8374384">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
+ </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="blog.css" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog.css">
+ <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="14" column="6" selection-start="176" selection-end="176" vertical-scroll-proportion="0.3271028">
+ <state line="40" column="32" selection-start="2203" selection-end="2203" vertical-scroll-proportion="0.5320197">
<folding />
</state>
</provider>
@@ -945,7 +989,7 @@
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure Favorites="false" Scope="false" PackagesPane="false" ProjectPane="false" />
+ <showStructure ProjectPane="false" Scope="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -991,6 +1035,25 @@
<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" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1010,25 +1073,6 @@
<option name="Make" value="true" />
</method>
</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" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
</component>
<component name="ScopeViewComponent">
<subPane subId="Project">
@@ -1104,13 +1148,13 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="25" width="1690" height="1005" extended-state="6" />
- <editor active="true" />
+ <editor active="false" />
<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.25567138" order="0" />
+ <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="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" />
@@ -1118,7 +1162,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="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21336603" order="1" />
+ <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="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" />
@@ -1221,134 +1265,127 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <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/java/org/jboss/blog/service/store/BlogStoreService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="62" selection-start="585" selection-end="585" vertical-scroll-proportion="0.35576922">
+ <state line="12" column="17" selection-start="351" selection-end="351" vertical-scroll-proportion="0.14440434">
<folding />
</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/blog.css">
<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="0" selection-start="83" selection-end="83" vertical-scroll-proportion="0.09615385">
<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.ui.FacesConfigEditorProvider">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/State.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="116" column="26" selection-start="4090" selection-end="4090" vertical-scroll-proportion="0.99498326">
+ <state line="12" column="13" selection-start="308" selection-end="308" vertical-scroll-proportion="0.16245487">
<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/ui/PostEdit.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="298" column="11" selection-start="9448" selection-end="9448" vertical-scroll-proportion="0.66346157">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="18" column="54" selection-start="708" selection-end="708" vertical-scroll-proportion="0.2757353">
+ <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/etc/META-INF/acl-permissions.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="17" column="41" selection-start="550" selection-end="550" vertical-scroll-proportion="0.28037384">
+ <state line="34" column="38" selection-start="1377" selection-end="1377" vertical-scroll-proportion="0.8374384">
<folding />
</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/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="193" column="73" selection-start="5497" selection-end="5497" vertical-scroll-proportion="-0.010903426">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="31" column="13" selection-start="923" selection-end="923" vertical-scroll-proportion="-0.44117647">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="16" selection-start="2334" selection-end="2334" vertical-scroll-proportion="1.387987">
+ <state line="40" column="32" selection-start="2203" selection-end="2203" vertical-scroll-proportion="0.5320197">
<folding />
</state>
</provider>
+ </entry>
+ <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>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/del_confirm.xhtml">
+ <entry file="jar://$PROJECT_DIR$/lib/myfaces/myfaces-api.jar!/javax/faces/model/SelectItem.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="22" selection-start="611" selection-end="611" vertical-scroll-proportion="0.3409091">
+ <state line="12" column="11" selection-start="435" selection-end="435" vertical-scroll-proportion="0.27093595">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
+ </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>
- </entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_del.xhtml">
+ <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="41" selection-start="328" selection-end="328" vertical-scroll-proportion="0.14610389">
+ <state line="138" column="45" selection-start="4850" selection-end="4850" vertical-scroll-proportion="0.5831904">
<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>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="6" selection-start="176" selection-end="176" vertical-scroll-proportion="0.3271028">
+ <state line="39" column="0" selection-start="1645" selection-end="1645" vertical-scroll-proportion="0.9782609">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="46" selection-start="1232" selection-end="1254" vertical-scroll-proportion="0.6331169">
+ <state line="21" column="37" selection-start="949" selection-end="949" vertical-scroll-proportion="0.51724136">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/common.xhtml">
+ <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="4" column="66" selection-start="243" selection-end="243" vertical-scroll-proportion="0.097402595">
+ <state line="199" column="37" selection-start="5448" selection-end="5448" vertical-scroll-proportion="0.33825943">
<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/post_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="31" selection-start="389" selection-end="389" vertical-scroll-proportion="0.19480519">
+ <state line="46" column="65" selection-start="2135" selection-end="2135" vertical-scroll-proportion="0.9691252">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
+ <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="66" column="70" selection-start="2617" selection-end="2617" vertical-scroll-proportion="0.8766234">
- <folding />
+ <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>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
</component>
</project>
More information about the jboss-cvs-commits
mailing list