[jboss-cvs] JBossBlog SVN: r24 - in trunk: . blog-core/src/etc/META-INF blog-core/src/java/org/jboss/blog/service/store/hibernate
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 9 11:01:11 EST 2006
Author: adamw
Date: 2006-11-09 11:01:06 -0500 (Thu, 09 Nov 2006)
New Revision: 24
Modified:
trunk/blog-core/src/etc/META-INF/acl-mapping.xml
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml
trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java
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-09 15:08:54 UTC (rev 23)
+++ trunk/blog-core/src/etc/META-INF/acl-mapping.xml 2006-11-09 16:01:06 UTC (rev 24)
@@ -42,10 +42,10 @@
<id>acl://manageCategory</id>
</resource>
<!-- action protection -->
- <!--<resource type="jsfAction" criteriaId="manageCategories://action">
- <class>org.jboss.blog.ui.action.AdminController</class>
- <method>manageCategories</method>
- </resource>-->
+ <resource type="jsfAction" criteriaId="manageCategories://action">
+ <class>org.jboss.blog.ui.BlogEdit</class>
+ <method>save</method>
+ </resource>
<implies>accessAdminModule</implies>
</function>
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml 2006-11-09 15:08:54 UTC (rev 23)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml 2006-11-09 16:01:06 UTC (rev 24)
@@ -28,7 +28,7 @@
<property name="description" column="DESCRIPTION" type="text" />
- <bag name="posts" inverse="true">
+ <bag name="modelPosts" inverse="true">
<key column="BLOG_ID" not-null="true" />
<one-to-many class="HBlogModelPost" />
</bag>
Modified: trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java 2006-11-09 15:08:54 UTC (rev 23)
+++ trunk/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java 2006-11-09 16:01:06 UTC (rev 24)
@@ -18,7 +18,7 @@
private String link;
private Date created;
- private List posts;
+ private List modelPosts;
private Set categories;
@@ -85,14 +85,17 @@
this.created = created;
}
- public List getPosts() {
- return posts;
+ //
+
+ public List getModelPosts() {
+ return modelPosts;
}
- public void setPosts(List posts) {
- this.posts = posts;
+ public void setModelPosts(List posts) {
+ this.modelPosts = posts;
}
+
public HibernateBlogStoreService getStoreService() {
return storeService;
}
@@ -101,6 +104,8 @@
this.storeService = storeService;
}
+ //
+
public void setCategories(Set categories) {
if ((categories != null) && (categories.size() > 1)) {
throw new IllegalArgumentException("Only one categorty per model is supported");
@@ -121,6 +126,35 @@
return categories;
}
+ public List getPosts() {
+ // Creating a list of posts from the a list of HBlogModelPost.
+ List l = new ArrayList();
+ for (Iterator iter = getModelPosts().iterator(); iter.hasNext();) {
+ HBlogModelPost hbmp = (HBlogModelPost) iter.next();
+ l.add(hbmp.getPost());
+ }
+
+ return l;
+ }
+
+ public void setPosts(List posts) {
+ // Craeting a list of HBlogModelPost instances from the given list of posts.
+ List l = new ArrayList();
+ for (Iterator iter = posts.iterator(); iter.hasNext();) {
+ Object post = iter.next();
+ if (!(post instanceof HBlogPost)) {
+ throw new IllegalArgumentException("Trying to add posts to the store service " +
+ "which were not obtained from it.");
+ }
+
+ l.add(new HBlogModelPost(this, (HBlogPost) post));
+ }
+
+ setModelPosts(l);
+ }
+
+ //
+
public List getPosts(int from, int to) {
return storeService.getPosts(this, from, to);
}
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2006-11-09 15:08:54 UTC (rev 23)
+++ trunk/jbossblog.iws 2006-11-09 16:01:06 UTC (rev 24)
@@ -17,12 +17,9 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <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/blog_mod.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/blog_edit.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_edit.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/view.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/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/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/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.hbm.xml" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.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" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -150,7 +147,7 @@
<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="192" column="44" selection-start="5610" selection-end="5610" vertical-scroll-proportion="0.7078652">
+ <state line="207" column="30" selection-start="5975" selection-end="5975" vertical-scroll-proportion="0.5634029">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -158,54 +155,40 @@
</provider>
</entry>
</file>
- <file leaf-file-name="UITools.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.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="9" column="64" selection-start="217" selection-end="217" vertical-scroll-proportion="0.14106584">
+ <state line="17" column="40" selection-start="677" selection-end="677" vertical-scroll-proportion="0.41666666">
<folding />
</state>
</provider>
- </entry>
- </file>
- <file leaf-file-name="BlogEdit.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="123" column="50" selection-start="3044" selection-end="3044" vertical-scroll-proportion="0.7586207">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
+ <provider editor-type-id="HtmlPreview">
+ <state />
</provider>
</entry>
</file>
- <file leaf-file-name="view.xhtml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
+ <file leaf-file-name="HBlogModel.java" pinned="false" current="true" current-in-tab="true">
+ <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="24" column="33" selection-start="1117" selection-end="1117" vertical-scroll-proportion="0.60301507">
+ <state line="133" column="35" selection-start="3150" selection-end="3150" vertical-scroll-proportion="0.37460816">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
</file>
- <file leaf-file-name="blog_edit.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_edit.xhtml">
+ <file leaf-file-name="HBlogModel.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/HBlogModel.hbm.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="21" selection-start="470" selection-end="470" vertical-scroll-proportion="0.24509804">
+ <state line="30" column="25" selection-start="1123" selection-end="1123" vertical-scroll-proportion="0.7053292">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
</file>
- <file leaf-file-name="blog_mod.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml">
+ <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 selected="true" editor-type-id="text-editor">
- <state line="20" column="39" selection-start="915" selection-end="915" vertical-scroll-proportion="0.5025126">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -1162,136 +1145,130 @@
<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/HBlogModelPost.java">
+ <entry file="jar://$PROJECT_DIR$/lib/myfaces/myfaces-api.jar!/javax/faces/application/FacesMessage.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="38" selection-start="87" selection-end="87" vertical-scroll-proportion="0.048387095">
+ <state line="20" column="11" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.33226323">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.hbm.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="40" selection-start="361" selection-end="361" vertical-scroll-proportion="0.18808778">
+ <state line="15" column="67" selection-start="704" selection-end="704" vertical-scroll-proportion="0.38860103">
<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/model/ModifiableBlogModel.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_edit.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="46" selection-start="576" selection-end="576" vertical-scroll-proportion="0.3291536">
+ <state line="8" column="58" selection-start="410" selection-end="410" vertical-scroll-proportion="0.2020202">
<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/etc/META-INF/acl-permissions.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="228" column="29" selection-start="7807" selection-end="7807" vertical-scroll-proportion="0.6708464">
+ <state line="31" column="8" selection-start="1258" selection-end="1258" vertical-scroll-proportion="0.76859504">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml">
<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="46" column="28" selection-start="2436" selection-end="2436" vertical-scroll-proportion="0.54545456">
<folding />
</state>
</provider>
- <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
- <state />
- </provider>
- <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
- <state />
- </provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/lib/myfaces/myfaces-impl.jar!/javax/faces/Messages.properties">
- <provider editor-type-id="ResourceBundle">
- <state />
- </provider>
+ <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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="9" column="64" selection-start="217" selection-end="217" vertical-scroll-proportion="0.14106584">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/lib/myfaces/myfaces-impl.jar!/javax/faces/Messages_pl.properties">
- <provider editor-type-id="ResourceBundle">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="20" column="39" selection-start="915" selection-end="915" vertical-scroll-proportion="0.5025126">
+ <folding />
+ </state>
+ </provider>
+ <provider editor-type-id="HtmlPreview">
<state />
</provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<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/HibernateSessionFilter.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="40" selection-start="1044" selection-end="1044" vertical-scroll-proportion="0.43548387">
- <folding />
+ <state line="12" column="31" selection-start="406" selection-end="406" vertical-scroll-proportion="0.28213167">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/lib/myfaces/myfaces-api.jar!/javax/faces/application/FacesMessage.class">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="20" column="11" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.33226323">
+ <state line="17" column="40" selection-start="677" selection-end="677" vertical-scroll-proportion="0.41666666">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <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/model/BlogModel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="192" column="44" selection-start="5610" selection-end="5610" vertical-scroll-proportion="0.7078652">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="22" column="16" selection-start="570" selection-end="570" vertical-scroll-proportion="0.33225808">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="64" selection-start="217" selection-end="217" vertical-scroll-proportion="0.14106584">
+ <state line="30" column="25" selection-start="1123" selection-end="1123" vertical-scroll-proportion="0.7053292">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_edit.xhtml">
+ <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="10" column="21" selection-start="470" selection-end="470" vertical-scroll-proportion="0.24509804">
+ <state line="17" column="16" selection-start="508" selection-end="508" vertical-scroll-proportion="0.31451613">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.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="123" column="50" selection-start="3044" selection-end="3044" vertical-scroll-proportion="0.7586207">
+ <state line="207" column="30" selection-start="5975" selection-end="5975" vertical-scroll-proportion="0.5634029">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml">
+ <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="20" column="39" selection-start="915" selection-end="915" vertical-scroll-proportion="0.5025126">
+ <state line="133" column="35" selection-start="3150" selection-end="3150" vertical-scroll-proportion="0.37460816">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="24" column="33" selection-start="1117" selection-end="1117" vertical-scroll-proportion="0.60301507">
- <folding />
- </state>
- </provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
- </entry>
</component>
</project>
More information about the jboss-cvs-commits
mailing list