[jboss-cvs] JBossBlog SVN: r35 - in trunk: . blog-core/src/java/org/jboss/blog/model blog-core/src/java/org/jboss/blog/service/store/hibernate blog-core/src/java/org/jboss/blog/ui blog-core/src/web/WEB-INF blog-core/src/web/views lib/hibernate
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Dec 2 19:11:13 EST 2006
Author: adamw
Date: 2006-12-02 19:10:53 -0500 (Sat, 02 Dec 2006)
New Revision: 35
Modified:
trunk/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java
trunk/blog-core/src/java/org/jboss/blog/model/BlogPost.java
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml
trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
trunk/blog-core/src/web/WEB-INF/portlet.xml
trunk/blog-core/src/web/views/post_view.xhtml
trunk/jbossblog.iws
trunk/lib/hibernate/hibernate3.jar
Log:
http://jira.jboss.com/jira/browse/JBBLOG-13
Modified: trunk/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java 2006-12-02 23:03:09 UTC (rev 34)
+++ trunk/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java 2006-12-03 00:10:53 UTC (rev 35)
@@ -11,8 +11,8 @@
private boolean titleAsIdInitialized;
private String titleAsId;
- public boolean hasComments() {
- return ((getComments() == null) || (getComments().size() == 0));
+ public boolean getHasComments() {
+ return ((getComments() != null) && (getComments().size() > 0));
}
public String getTitleAsId() {
Modified: trunk/blog-core/src/java/org/jboss/blog/model/BlogPost.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/model/BlogPost.java 2006-12-02 23:03:09 UTC (rev 34)
+++ trunk/blog-core/src/java/org/jboss/blog/model/BlogPost.java 2006-12-03 00:10:53 UTC (rev 35)
@@ -22,7 +22,7 @@
*
* @return True iff this post has any comments.
*/
- public boolean hasComments();
+ public boolean getHasComments();
/**
*
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml 2006-12-02 23:03:09 UTC (rev 34)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml 2006-12-03 00:10:53 UTC (rev 35)
@@ -10,7 +10,7 @@
<generator class="native" />
</id>
- <many-to-one name="post" column="POST" not-null="true" class="HBlogPost" />
+ <many-to-one name="post" column="POST_ID" not-null="true" class="HBlogPost" />
<property name="author" column="AUTHOR" not-null="true" />
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml 2006-12-02 23:03:09 UTC (rev 34)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogPost.hbm.xml 2006-12-03 00:10:53 UTC (rev 35)
@@ -32,7 +32,7 @@
<one-to-many class="HBlogModelPost" />
</bag>
- <bag name="comments" order-by="created desc" inverse="true">
+ <bag name="comments" order-by="created desc" inverse="true" cascade="all">
<key column="POST_ID" not-null="true" />
<one-to-many class="HBlogComment" />
</bag>
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2006-12-02 23:03:09 UTC (rev 34)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2006-12-03 00:10:53 UTC (rev 35)
@@ -26,6 +26,7 @@
// Faces-managed properties
private UIData postsData;
+ private UIData commentsData;
private State state;
public UIData getPostsData() {
@@ -36,6 +37,14 @@
this.postsData = postsData;
}
+ public UIData getCommentsData() {
+ return commentsData;
+ }
+
+ public void setCommentsData(UIData commentsData) {
+ this.commentsData = commentsData;
+ }
+
public State getState() {
return state;
}
@@ -51,10 +60,11 @@
private Integer numberOfPostsPerPage;
private Boolean viewPostsOnSeparatePage;
private Boolean viewAllPosts;
+ private Boolean commentsEnabled;
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). */
private List postsWithNext;
@@ -112,6 +122,15 @@
return blogModel;
}
+ public Boolean getCommentsEnabled() {
+ if (commentsEnabled == null) {
+ commentsEnabled = BlogTools.getBlogService().getConfigurationService().
+ getCommentsEnabled(getRequest());
+ }
+
+ return commentsEnabled;
+ }
+
public Integer getNumberOfPostsPerPage() {
if (numberOfPostsPerPage == null) {
numberOfPostsPerPage = BlogTools.getBlogService().getConfigurationService().
@@ -280,13 +299,13 @@
public String postEditFromBlogView() {
postSelect();
exitFromBlogView();
-
+
return UITools.POST_EDIT;
}
public String postEditFromPostView() {
exitFromPostView();
-
+
return UITools.POST_EDIT;
}
Modified: trunk/blog-core/src/web/WEB-INF/portlet.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/portlet.xml 2006-12-02 23:03:09 UTC (rev 34)
+++ trunk/blog-core/src/web/WEB-INF/portlet.xml 2006-12-03 00:10:53 UTC (rev 35)
@@ -35,6 +35,10 @@
<name>viewPostsOnSeparatePage</name>
<value>true</value>
</preference>
+ <preference>
+ <name>commentsEnabled</name>
+ <value>false</value>
+ </preference>
</portlet-preferences>
</portlet>
</portlet-app>
Modified: trunk/blog-core/src/web/views/post_view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/post_view.xhtml 2006-12-02 23:03:09 UTC (rev 34)
+++ trunk/blog-core/src/web/views/post_view.xhtml 2006-12-03 00:10:53 UTC (rev 35)
@@ -35,6 +35,75 @@
<h:outputText value="#{blogView.selectedPost.description}" escape="false" />
</p>
+ <h:panelGroup rendered="#{blogView.selectedPost.hasComments}">
+ <blog:isAllowed fragment="acl://viewComment" contextData="#{blogView.blogName}">
+ <hr />
+
+ <h3>Comments</h3>
+
+ <h:dataTable value="#{blogView.selectedPost.comments}" var="comment"
+ binding="#{blogView.commentsData}" styleClass="posts"
+ rowClasses="posts-row,posts-row-alternate" >
+ <h:column>
+ <span class="post-title">#{comment.title}</span>
+ <span class="post-data">
+ created on #{comment.createdTime}, #{comment.createdDate}
+ by #{comment.author}.
+ </span>
+
+ <p class="post-description">
+ <h:outputText value="#{comment.description}" escape="false" />
+ </p>
+ </h:column>
+
+ <h:column>
+ <h:panelGroup rendered="#{blogView.blogModifiable}">
+ <blog:isAllowed fragment="acl://manageComment"
+ contextData="#{blogView.blogName}">
+ <span class="admin-link">
+ <h:commandLink value="Delete"
+ action="#{commentEdit.commentDelete}" />
+ </span>
+ </blog:isAllowed>
+ </h:panelGroup>
+ </h:column>
+ </h:dataTable>
+ </blog:isAllowed>
+ </h:panelGroup>
+
+ <h:panelGroup rendered="#{blogView.commentsEnabled}">
+ <blog:isAllowed fragment="acl://addComment" contextData="#{blogView.blogName}">
+ <hr />
+
+ <h3>Add a comment!</h3>
+
+ <h:form>
+ <h:panelGrid columns="2" headerClass="">
+ <h:panelGroup>Title: (*)</h:panelGroup>
+ <h:panelGroup>
+ <h:inputText value="#{commentEdit.title}" required="true"
+ maxlength="255" size="32" />
+ </h:panelGroup>
+
+ <h:panelGroup>Author: (*)</h:panelGroup>
+ <h:panelGroup>
+ <h:inputText value="#{commentEdit.author}" required="true"
+ maxlength="255" size="32" />
+ </h:panelGroup>
+
+ <h:panelGroup>Description:</h:panelGroup>
+ <h:panelGroup>
+ <h:inputTextarea value="#{commentEdit.description}" rows="10" cols="40" />
+ </h:panelGroup>
+ </h:panelGrid>
+
+ <h:commandLink value="Add" action="#{commentEdit.saveNew}" />
+ </h:form>
+
+ <hr />
+ </blog:isAllowed>
+ </h:panelGroup>
+
<h:form>
<h:commandLink action="#{blogView.blogView}">
<< Back
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2006-12-02 23:03:09 UTC (rev 34)
+++ trunk/jbossblog.iws 2006-12-03 00:10:53 UTC (rev 35)
@@ -17,13 +17,13 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml" />
- <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="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml" />
+ <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/portlet.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml" />
+ <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/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" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.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" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -148,19 +148,22 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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="post_view.xhtml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="165" column="48" selection-start="4229" selection-end="4229" vertical-scroll-proportion="0.63022506">
+ <state line="39" column="18" selection-start="1540" selection-end="1540" vertical-scroll-proportion="-0.25838926">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="HBlogComment.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.java">
+ <file leaf-file-name="AbstractBlogPost.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="0" selection-start="811" selection-end="811" vertical-scroll-proportion="0.511254">
+ <state line="14" column="66" selection-start="495" selection-end="495" vertical-scroll-proportion="0.3376206">
<folding />
</state>
</provider>
@@ -169,16 +172,16 @@
<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="34" column="66" selection-start="1240" selection-end="1240" vertical-scroll-proportion="0.8199357">
+ <state line="33" column="9" selection-start="1173" selection-end="1173" vertical-scroll-proportion="0.79581994">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="HBlogComment.hbm.xml" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="HBlogComment.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/HBlogComment.hbm.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="83" selection-start="497" selection-end="497" vertical-scroll-proportion="0.28938907">
+ <state line="14" column="15" selection-start="525" selection-end="525" vertical-scroll-proportion="0.3376206">
<folding />
</state>
</provider>
@@ -187,21 +190,12 @@
<file leaf-file-name="HibernateBlogStoreService.java" pinned="false" current="false" current-in-tab="false">
<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="316" column="30" selection-start="10929" selection-end="10929" vertical-scroll-proportion="1.0889621">
+ <state line="316" column="30" selection-start="10929" selection-end="10929" vertical-scroll-proportion="0.49588138">
<folding />
</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">
- <provider selected="true" editor-type-id="text-editor">
- <state line="18" column="24" selection-start="588" selection-end="588" vertical-scroll-proportion="0.31350482">
- <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">
@@ -387,6 +381,14 @@
<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/views" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -405,7 +407,25 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src" />
<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/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -546,6 +566,86 @@
<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/java/org/jboss/blog/service/store" />
+ <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/java" />
+ <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/java/org/jboss" />
+ <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/java/org/jboss/blog" />
+ <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/java/org/jboss/blog/service" />
+ <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/java/org/jboss/blog/service/store" />
+ <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/java/org/jboss/blog/service/store/hibernate" />
+ <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/java" />
+ <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/java/org/jboss" />
+ <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/java/org/jboss/blog" />
+ <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/java/org/jboss/blog/service" />
+ <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/java/org/jboss/blog/service/configuration" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -568,6 +668,40 @@
<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/java" />
+ <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/java/org/jboss" />
+ <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/java/org/jboss/blog" />
+ <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/java/org/jboss/blog/model" />
+ <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/etc" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -804,7 +938,7 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="25" width="1690" height="1004" 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" />
@@ -813,7 +947,7 @@
<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.32839224" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22690992" order="9" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22690992" order="9" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39977092" order="6" />
<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" />
@@ -922,107 +1056,122 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <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/service/store/hibernate/HBlogPost.hbm.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="16" column="13" selection-start="520" selection-end="520" vertical-scroll-proportion="-4.822076">
+ <state line="33" column="9" selection-start="1173" selection-end="1173" vertical-scroll-proportion="0.79581994">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl/BlogPostImpl.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="12" column="13" selection-start="273" selection-end="273" vertical-scroll-proportion="0.19292605">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.2224109">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="46" selection-start="425" selection-end="425" vertical-scroll-proportion="0.31350482">
+ <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/java/org/jboss/blog/model/BlogPost.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="22" column="51" selection-start="529" selection-end="529" vertical-scroll-proportion="0.4340836">
+ <state line="24" column="27" selection-start="565" selection-end="565" vertical-scroll-proportion="0.5546624">
<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/java/org/jboss/blog/service/store/hibernate/HBlogComment.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="24" selection-start="588" selection-end="588" vertical-scroll-proportion="0.31350482">
+ <state line="12" column="61" selection-start="394" selection-end="394" vertical-scroll-proportion="0.2170418">
<folding />
</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.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="316" column="30" selection-start="10929" selection-end="10929" vertical-scroll-proportion="1.0889621">
+ <state line="155" column="35" selection-start="3933" selection-end="3933" vertical-scroll-proportion="0.38906753">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.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="41" column="20" selection-start="1487" selection-end="1487" vertical-scroll-proportion="0.75165564">
+ <state line="38" column="0" selection-start="1018" selection-end="1018" vertical-scroll-proportion="0.51446944">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="69" column="7" selection-start="1875" selection-end="1875" vertical-scroll-proportion="0.8013245">
+ <state line="91" column="49" selection-start="3926" selection-end="3926" vertical-scroll-proportion="-0.049423393">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java">
+ <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="58" column="40" selection-start="2071" selection-end="2071" vertical-scroll-proportion="1.4403974">
+ <state line="48" column="53" selection-start="2106" selection-end="2106" vertical-scroll-proportion="0.30981067">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="4" selection-start="1460" selection-end="1779" vertical-scroll-proportion="0.6141479">
+ <state line="56" column="1" selection-start="695" selection-end="695" vertical-scroll-proportion="0.8553055">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="57" column="39" selection-start="2581" selection-end="2581" vertical-scroll-proportion="0.42114094">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_new.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="61" selection-start="1990" selection-end="1990" vertical-scroll-proportion="0.51894563">
+ <state line="18" column="79" selection-start="634" selection-end="693" vertical-scroll-proportion="0.45302013">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="25" selection-start="1603" selection-end="1603" vertical-scroll-proportion="0.8440514">
+ <state line="15" column="66" selection-start="759" selection-end="759" vertical-scroll-proportion="0.37067544">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/AbstractBlogPost.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="43" selection-start="1772" selection-end="1772" vertical-scroll-proportion="1.1334405">
+ <state line="14" column="66" selection-start="495" selection-end="495" vertical-scroll-proportion="0.3376206">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogComment.hbm.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="83" selection-start="497" selection-end="497" vertical-scroll-proportion="0.28938907">
+ <state line="39" column="18" selection-start="1540" selection-end="1540" vertical-scroll-proportion="-0.25838926">
<folding />
</state>
</provider>
Modified: trunk/lib/hibernate/hibernate3.jar
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list