[jboss-cvs] JBossBlog SVN: r30 - in trunk: . blog-core blog-core/src/etc/META-INF blog-core/src/web/WEB-INF blog-core/src/web/views lib/jboss-portal

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Nov 14 19:32:36 EST 2006


Author: adamw
Date: 2006-11-14 19:32:28 -0500 (Tue, 14 Nov 2006)
New Revision: 30

Added:
   trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml
   trunk/lib/jboss-portal/portal-faces-lib.jar
Modified:
   trunk/blog-core/blog-core.iml
   trunk/blog-core/build.xml
   trunk/blog-core/src/etc/META-INF/acl-permissions.xml
   trunk/blog-core/src/etc/META-INF/jboss-service.xml
   trunk/blog-core/src/web/WEB-INF/blog-object.xml
   trunk/blog-core/src/web/WEB-INF/faces-config.xml
   trunk/blog-core/src/web/WEB-INF/portlet-instances.xml
   trunk/blog-core/src/web/WEB-INF/portlet.xml
   trunk/blog-core/src/web/views/blog_view.xhtml
   trunk/blog-core/src/web/views/post_mod.xhtml
   trunk/blog-core/src/web/views/post_view.xhtml
   trunk/jbossblog.iws
Log:
http://jira.jboss.com/jira/browse/JBBLOG-9

Modified: trunk/blog-core/blog-core.iml
===================================================================
--- trunk/blog-core/blog-core.iml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/blog-core.iml	2006-11-15 00:32:28 UTC (rev 30)
@@ -121,6 +121,15 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="hibernate" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/jboss-portal/portal-faces-lib.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="WebModuleBuildComponent">
@@ -161,6 +170,11 @@
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/portal-faces-lib.jar" />
+      <url>jar://$MODULE_DIR$/../lib/jboss-portal/portal-faces-lib.jar!/</url>
+    </containerElement>
+    <containerElement type="library" level="module">
+      <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/portal-identity-lib.jar" />
       <url>jar://$MODULE_DIR$/../lib/jboss-portal/portal-identity-lib.jar!/</url>
     </containerElement>

Modified: trunk/blog-core/build.xml
===================================================================
--- trunk/blog-core/build.xml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/build.xml	2006-11-15 00:32:28 UTC (rev 30)
@@ -3,9 +3,9 @@
 <project name="JBoss Blog" default="build">
     <!-- Configuration of deployment -->
     <property name="jboss.home" value="/home/adamw/jboss/jboss-blog" />
-    <property name="jboss.conf" value="sa" />
+    <property name="jboss.conf" value="default" />
     <!-- Unset this property if jboss portal is deployed -->
-    <!--<property name="jboss.portal.present" value="true" />-->
+    <property name="jboss.portal.present" value="true" />
 
     <!-- Configuration of source/ target directories -->
     <property name="src" value="src"/>
@@ -74,7 +74,7 @@
 
     </target>
 
-    <target name="copy-libs-for-servlet" if="jboss.portal.present">
+    <target name="copy-libs-for-servlet" unless="jboss.portal.present">
         <copy todir="${dist.lib.dir}"><fileset refid="myfaces.jars"/></copy>
         <copy todir="${dist.lib.dir}"><fileset refid="facelets.jars"/></copy>
     </target>

Modified: trunk/blog-core/src/etc/META-INF/acl-permissions.xml
===================================================================
--- trunk/blog-core/src/etc/META-INF/acl-permissions.xml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/src/etc/META-INF/acl-permissions.xml	2006-11-15 00:32:28 UTC (rev 30)
@@ -29,10 +29,10 @@
 			<criteria for="readCategory://ui">param[0].title.toLowerCase().startsWith('unit testing')</criteria>
 		</permission-->	
 		<permission action="viewComment"/>
-        <permission action="managePost"/>
+        <!--<permission action="managePost"/>-->
 
-        <permission action="manageCategory"/>
-        <permission action="manageBlog"/>
+        <!--<permission action="manageCategory"/>-->
+        <!--<permission action="manageBlog"/>-->
         <!-- <permission action="all"/>	-->
 
         <!-- Owner Module permissions -->

Modified: trunk/blog-core/src/etc/META-INF/jboss-service.xml
===================================================================
--- trunk/blog-core/src/etc/META-INF/jboss-service.xml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/src/etc/META-INF/jboss-service.xml	2006-11-15 00:32:28 UTC (rev 30)
@@ -7,25 +7,20 @@
     <mbean code="org.jboss.blog.service.BlogServiceImpl"
            name="blog:service=Main"
            xmbean-dd="org/jboss/blog/service/BlogServiceImpl.xml">
-        <depends
-                optional-attribute-name="NameService"
-                proxy-type="attribute">blog:service=Name</depends>
-        <depends
-                optional-attribute-name="ModelService"
-                proxy-type="attribute">blog:service=Model</depends>
-        <depends
-                optional-attribute-name="PermissionsService"
-                proxy-type="attribute">blog:service=Permissions</depends>
-        <depends
-                optional-attribute-name="ConfigurationService"
-                proxy-type="attribute">blog:service=Configuration</depends>
-        <depends
-                optional-attribute-name="StoreService"
-                proxy-type="attribute">blog:service=Store</depends>
+        <depends optional-attribute-name="NameService"
+                 proxy-type="attribute">blog:service=Name</depends>
+        <depends optional-attribute-name="ModelService"
+                 proxy-type="attribute">blog:service=Model</depends>
+        <depends optional-attribute-name="PermissionsService"
+                 proxy-type="attribute">blog:service=Permissions</depends>
+        <depends optional-attribute-name="ConfigurationService"
+                 proxy-type="attribute">blog:service=Configuration</depends>
+        <depends optional-attribute-name="StoreService"
+                 proxy-type="attribute">blog:service=Store</depends>
     </mbean>
 
     <!-- Name service -->
-    <mbean code="org.jboss.blog.service.name.InitParamsBlogNameService"
+    <mbean code="org.jboss.blog.service.name.PortletPreferencesBlogNameService"
            name="blog:service=Name"
            xmbean-dd="org/jboss/blog/service/name/PortletPreferencesBlogNameService.xml" >
         <attribute name="IdName">blogId</attribute>
@@ -33,7 +28,7 @@
     </mbean>
 
     <!-- Configuration service -->
-    <mbean code="org.jboss.blog.service.configuration.InitParamsBlogConfigurationService"
+    <mbean code="org.jboss.blog.service.configuration.PortletPreferencesBlogConfigurationService"
            name="blog:service=Configuration"
            xmbean-dd="org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.xml" >
         <attribute name="NumberOfPostsPerPageName">numberOfPostsPerPage</attribute>
@@ -45,26 +40,22 @@
     <mbean code="org.jboss.blog.service.model.CachingBlogModelService"
            name="blog:service=Model"
            xmbean-dd="org/jboss/blog/service/model/CachingBlogModelService.xml">
-        <depends
-                optional-attribute-name="DelegateModelService"
-                proxy-type="attribute">blog:service=DelegatingModel</depends>
+        <depends optional-attribute-name="DelegateModelService"
+                 proxy-type="attribute">blog:service=DelegatingModel</depends>
     </mbean>
     <mbean code="org.jboss.blog.service.model.DelegatingModelService"
            name="blog:service=DelegatingModel"
            xmbean-dd="org/jboss/blog/service/model/DelegatingModelService.xml">
-        <depends
-                optional-attribute-name="ExternalDelegateModelService"
-                proxy-type="attribute">blog:service=RomeParsingModel</depends>
-        <depends
-                optional-attribute-name="InternalDelegateModelService"
-                proxy-type="attribute">blog:service=StoreModel</depends>
+        <depends optional-attribute-name="ExternalDelegateModelService"
+                 proxy-type="attribute">blog:service=RomeParsingModel</depends>
+        <depends optional-attribute-name="InternalDelegateModelService"
+                 proxy-type="attribute">blog:service=StoreModel</depends>
     </mbean>
     <mbean code="org.jboss.blog.service.model.StoreModelService"
            name="blog:service=StoreModel"
            xmbean-dd="org/jboss/blog/service/model/StoreModelService.xml">
-        <depends
-                optional-attribute-name="StoreService"
-                proxy-type="attribute">blog:service=Store</depends>
+        <depends optional-attribute-name="StoreService"
+                 proxy-type="attribute">blog:service=Store</depends>
     </mbean>
     <mbean code="org.jboss.blog.service.model.RomeParsingBlogModelService"
            name="blog:service=RomeParsingModel"
@@ -89,6 +80,7 @@
            xmbean-dd="org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.xml" >
         <depends>blog:service=Hibernate</depends>
     </mbean>
+
     <!-- Hibernate setup -->
     <mbean code="org.hibernate.jmx.HibernateService"
            name="blog:service=Hibernate">

Modified: trunk/blog-core/src/web/WEB-INF/blog-object.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/blog-object.xml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/src/web/WEB-INF/blog-object.xml	2006-11-15 00:32:28 UTC (rev 30)
@@ -2,22 +2,88 @@
 <deployments>
     <deployment>
         <if-exists>overwrite</if-exists>
-        <parent-ref>default.default</parent-ref>
-        <window>
-            <window-name>BlogPortletWindow</window-name>
-            <instance-ref>BlogPortletInstance</instance-ref>
-            <region>center</region>
-            <height>1</height>
-        </window>
+        <parent-ref>default</parent-ref>
+        <page>
+            <page-name>blog1</page-name>
+            <window>
+                <window-name>NavigationPortletWindow</window-name>
+                <instance-ref>NavigationPortletInstance</instance-ref>
+                <region>navigation</region>
+                <height>0</height>
+                <!-- keep portal and page properties for this window -->
+                <properties>
+                    <!-- use the window renderer from the emptyRenderer renderSet -->
+                    <property>
+                        <name>theme.windowRendererId</name>
+                        <value>emptyRenderer</value>
+                    </property>
+                    <!-- use the decoration renderer from the emptyRenderer renderSet -->
+                    <property>
+                        <name>theme.decorationRendererId</name>
+                        <value>emptyRenderer</value>
+                    </property>
+                    <!-- use the portlet renderer from the emptyRenderer renderSet -->
+                    <property>
+                        <name>theme.portletRendererId</name>
+                        <value>emptyRenderer</value>
+                    </property>
+                </properties>
+            </window>
+            <window>
+                <window-name>BlogPortletRedHatWindow</window-name>
+                <instance-ref>BlogPortletRedHatInstance</instance-ref>
+                <region>center</region>
+                <height>1</height>
+            </window>
+            <window>
+                <window-name>BlogPortletJBossWindow</window-name>
+                <instance-ref>BlogPortletJBossInstance</instance-ref>
+                <region>center</region>
+                <height>2</height>
+            </window>
+        </page>
     </deployment>
     <deployment>
         <if-exists>overwrite</if-exists>
-        <parent-ref>default.default</parent-ref>
-        <window>
-            <window-name>BlogPortletOnetWindow</window-name>
-            <instance-ref>BlogPortletOnetInstance</instance-ref>
-            <region>center</region>
-            <height>2</height>
-        </window>
+        <parent-ref>default</parent-ref>
+        <page>
+            <page-name>blog2</page-name>
+            <window>
+                <window-name>NavigationPortletWindow</window-name>
+                <instance-ref>NavigationPortletInstance</instance-ref>
+                <region>navigation</region>
+                <height>0</height>
+                <!-- keep portal and page properties for this window -->
+                <properties>
+                    <!-- use the window renderer from the emptyRenderer renderSet -->
+                    <property>
+                        <name>theme.windowRendererId</name>
+                        <value>emptyRenderer</value>
+                    </property>
+                    <!-- use the decoration renderer from the emptyRenderer renderSet -->
+                    <property>
+                        <name>theme.decorationRendererId</name>
+                        <value>emptyRenderer</value>
+                    </property>
+                    <!-- use the portlet renderer from the emptyRenderer renderSet -->
+                    <property>
+                        <name>theme.portletRendererId</name>
+                        <value>emptyRenderer</value>
+                    </property>
+                </properties>
+            </window>
+            <window>
+                <window-name>BlogPortletDefaultWindow</window-name>
+                <instance-ref>BlogPortletDefaultInstance</instance-ref>
+                <region>center</region>
+                <height>1</height>
+            </window>
+            <window>
+                <window-name>BlogPortletPrivateWindow</window-name>
+                <instance-ref>BlogPortletPrivateInstance</instance-ref>
+                <region>center</region>
+                <height>2</height>
+            </window>
+        </page>
     </deployment>
 </deployments>
\ No newline at end of file

Modified: trunk/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.xml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.xml	2006-11-15 00:32:28 UTC (rev 30)
@@ -6,8 +6,11 @@
 
 <faces-config>
     <application>
-        <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
-        <!--<view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>-->
+        <!-- JBoss Portal-facelets integration -->
+        <property-resolver>org.jboss.portal.faces.el.DelegatingPropertyResolver</property-resolver>
+
+        <!--<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>-->
+        <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
         <locale-config>
             <default-locale>en</default-locale>
         </locale-config>

Added: trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml	2006-11-15 00:32:28 UTC (rev 30)
@@ -0,0 +1,8 @@
+<portlet-app>
+    <portlet>
+        <portlet-name>BlogPortlet</portlet-name>
+        <transaction>
+            <trans-attribute>Required</trans-attribute>
+        </transaction>
+    </portlet>
+</portlet-app>
\ No newline at end of file

Modified: trunk/blog-core/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/portlet-instances.xml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/src/web/WEB-INF/portlet-instances.xml	2006-11-15 00:32:28 UTC (rev 30)
@@ -3,7 +3,7 @@
     <deployment>
         <if-exists>overwrite</if-exists>
         <instance>
-            <instance-id>BlogPortletInstance</instance-id>
+            <instance-id>BlogPortletRedHatInstance</instance-id>
             <portlet-ref>BlogPortlet</portlet-ref>
             <preferences>
                 <preference>
@@ -28,12 +28,12 @@
     <deployment>
         <if-exists>overwrite</if-exists>
         <instance>
-            <instance-id>BlogPortletOnetInstance</instance-id>
+            <instance-id>BlogPortletJBossInstance</instance-id>
             <portlet-ref>BlogPortlet</portlet-ref>
             <preferences>
                 <preference>
                     <name>blogId</name>
-                    <value>http://wiadomosci.onet.pl/2,kategoria.rss</value>
+                    <value>http://jboss.org/jbossBlog/blog/?flavor=rss2</value>
                 </preference>
                 <preference>
                     <name>blogCategory</name>
@@ -41,6 +41,31 @@
                 </preference>
                 <preference>
                     <name>numberOfPostsPerPage</name>
+                    <value>4</value>
+                </preference>
+                <preference>
+                    <name>viewPostsOnSeparatePage</name>
+                    <value>true</value>
+                </preference>
+            </preferences>
+        </instance>
+    </deployment>
+    <deployment>
+        <if-exists>overwrite</if-exists>
+        <instance>
+            <instance-id>BlogPortletDefaultInstance</instance-id>
+            <portlet-ref>BlogPortlet</portlet-ref>
+            <preferences>
+                <preference>
+                    <name>blogId</name>
+                    <value>default</value>
+                </preference>
+                <preference>
+                    <name>blogCategory</name>
+                    <value></value>
+                </preference>
+                <preference>
+                    <name>numberOfPostsPerPage</name>
                     <value>3</value>
                 </preference>
                 <preference>
@@ -50,4 +75,29 @@
             </preferences>
         </instance>
     </deployment>
+    <deployment>
+        <if-exists>overwrite</if-exists>
+        <instance>
+            <instance-id>BlogPortletPrivateInstance</instance-id>
+            <portlet-ref>BlogPortlet</portlet-ref>
+            <preferences>
+                <preference>
+                    <name>blogId</name>
+                    <value>default</value>
+                </preference>
+                <preference>
+                    <name>blogCategory</name>
+                    <value>private</value>
+                </preference>
+                <preference>
+                    <name>numberOfPostsPerPage</name>
+                    <value>5</value>
+                </preference>
+                <preference>
+                    <name>viewPostsOnSeparatePage</name>
+                    <value>true</value>
+                </preference>
+            </preferences>
+        </instance>
+    </deployment>
 </deployments>
\ No newline at end of file

Modified: trunk/blog-core/src/web/WEB-INF/portlet.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/portlet.xml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/src/web/WEB-INF/portlet.xml	2006-11-15 00:32:28 UTC (rev 30)
@@ -21,7 +21,7 @@
         <portlet-preferences>
             <preference>
                 <name>blogId</name>
-                <value>http://labs.jboss.org/feeds/shotoku/rss2</value>
+                <value>http://finance.yahoo.com/rss/headline?s=rhat</value>
             </preference>
             <preference>
                 <name>blogCategory</name>
@@ -29,11 +29,11 @@
             </preference>
             <preference>
                 <name>numberOfPostsPerPage</name>
-                <value>5</value>
+                <value>10</value>
             </preference>
             <preference>
                 <name>viewPostsOnSeparatePage</name>
-                <value>false</value>
+                <value>true</value>
             </preference>
         </portlet-preferences>
     </portlet>

Modified: trunk/blog-core/src/web/views/blog_view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/blog_view.xhtml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/src/web/views/blog_view.xhtml	2006-11-15 00:32:28 UTC (rev 30)
@@ -10,12 +10,14 @@
     </ui:define>
 
     <ui:define name="viewmain">
+        <h:panelGroup rendered="#{blogView.blogModifiable}">
         <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
             <h:form>
                 <p class="admin-link">You can <h:commandLink value="create" action="#{blogView.postNew}" />
                 new posts in this blog.</p>
             </h:form>
         </blog:isAllowed>
+        </h:panelGroup>
 
         <h:panelGroup rendered="#{!blogView.defaultBlog}">
             <h:form>
@@ -35,7 +37,6 @@
         <h:dataTable value="#{blogView.posts}" var="post" binding="#{blogView.postsData}"
                 rowClasses="posts-row,posts-row-alternate" styleClass="posts">
             <h:column>
-                <p>
                 <span class="post-title">
                 <h:commandLink value="#{post.title}"
                                action="#{blogView.postView}"
@@ -47,25 +48,24 @@
                 <span class="post-data">
                     created on #{post.createdTime}, #{post.createdDate} by #{post.author}.
                 </span>
-                </p>
 
                 <h:panelGroup rendered="#{!blogView.viewPostsOnSeparatePage and
                         (blogView.viewAllPosts ||
                             (blogView.selectedPostTitleAsId == post.titleAsId))}">
                     <p class="post-description">
-                        #{post.description}
+                        <h:outputText value="#{post.description}" escape="false" />
                     </p>
                 </h:panelGroup>
             </h:column>
 
             <h:column>
-                <p>
+                <h:panelGroup rendered="#{blogView.blogModifiable}">
                 <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
                     <span class="admin-link">
                         <h:commandLink value="Edit" action="#{blogView.postEditFromBlogView}" />
                     </span>
                 </blog:isAllowed>
-                </p>
+                </h:panelGroup>
             </h:column>
         </h:dataTable>
         </h:form>
@@ -73,7 +73,7 @@
         <h:form>
             <h:panelGroup rendered="#{blogView.hasPrevious}">
                 <h:commandLink action="#{blogView.previous}">&lt;&lt; Previous</h:commandLink>
-                
+                &#160;
             </h:panelGroup>
             
             <h:panelGroup rendered="#{blogView.hasNext}">

Modified: trunk/blog-core/src/web/views/post_mod.xhtml
===================================================================
--- trunk/blog-core/src/web/views/post_mod.xhtml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/src/web/views/post_mod.xhtml	2006-11-15 00:32:28 UTC (rev 30)
@@ -56,6 +56,9 @@
                     </h:column>
                     <h:column>
                         #{blog.category}
+                        <h:panelGroup rendered="#{empty blog.category}">
+                            <p class="sidenote">(empty)</p>
+                        </h:panelGroup>
                     </h:column>
                 </h:dataTable>
 

Modified: trunk/blog-core/src/web/views/post_view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/post_view.xhtml	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/blog-core/src/web/views/post_view.xhtml	2006-11-15 00:32:28 UTC (rev 30)
@@ -10,6 +10,7 @@
     </ui:define>
 
     <ui:define name="viewmain">
+        <h:panelGroup rendered="#{blogView.blogModifiable}">
         <blog:isAllowed fragment="acl://managePost" contextData="#{blogView.blogName}">
             <h:form>
             <p class="admin-link"> You can <h:commandLink value="edit"
@@ -17,6 +18,7 @@
             </p>
             </h:form>
         </blog:isAllowed>
+        </h:panelGroup>
 
         <p>
         <span class="post-title-big">
@@ -30,7 +32,7 @@
         </p>
 
         <p class="post-description">
-            #{blogView.selectedPost.description}
+            <h:outputText value="#{blogView.selectedPost.description}" escape="false" />
         </p>
 
         <h:form>

Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws	2006-11-14 15:27:51 UTC (rev 29)
+++ trunk/jbossblog.iws	2006-11-15 00:32:28 UTC (rev 30)
@@ -17,23 +17,20 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/blog.css" afterPath="$PROJECT_DIR$/blog-core/src/web/blog.css" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/blog_edit.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_edit.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/admin_panel.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/admin_panel.xhtml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_new.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_del.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/id_edit.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/id_edit.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/del_confirm.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/del_confirm.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" />
+      <change type="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/etc/META-INF/jboss-service.xml" afterPath="$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/etc/conf/hibernate/setup.txt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/build.xml" afterPath="$PROJECT_DIR$/blog-core/build.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/IdEdit.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/IdEdit.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.hbm.xml" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModelPost.hbm.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml" afterPath="$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-mapping.xml" />
+      <change type="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/blog-object.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog-object.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-portlet.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/etc/conf/hibernate/hibernate.cfg.xml" />
+      <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/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/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/blog-core.iml" afterPath="$PROJECT_DIR$/blog-core/blog-core.iml" />
     </list>
   </component>
   <component name="ChangeListSynchronizer" />
@@ -157,7 +154,98 @@
     </subPane>
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <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 selected="true" editor-type-id="text-editor">
+            <state line="16" column="103" selection-start="748" selection-end="748" vertical-scroll-proportion="0.4013378">
+              <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>
+      </file>
+      <file leaf-file-name="BlogView.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="81" column="31" selection-start="2205" selection-end="2205" vertical-scroll-proportion="0.21634616">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="portlet-instances.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="35" column="71" selection-start="1322" selection-end="1322" vertical-scroll-proportion="0.84134614">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="post_mod.xhtml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="60" column="37" selection-start="2753" selection-end="2753" vertical-scroll-proportion="0.8444816">
+              <folding />
+            </state>
+          </provider>
+          <provider editor-type-id="HtmlPreview">
+            <state />
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="view.xhtml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="19" column="54" selection-start="927" selection-end="927" vertical-scroll-proportion="0.48885077">
+              <folding />
+            </state>
+          </provider>
+          <provider editor-type-id="HtmlPreview">
+            <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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="34" column="99" selection-start="1271" selection-end="1347" vertical-scroll-proportion="0.8528428">
+              <folding />
+            </state>
+          </provider>
+          <provider editor-type-id="HtmlPreview">
+            <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 selected="true" editor-type-id="text-editor">
+            <state line="66" column="33" selection-start="2989" selection-end="2989" vertical-scroll-proportion="0.7941681">
+              <folding />
+            </state>
+          </provider>
+          <provider editor-type-id="HtmlPreview">
+            <state />
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="acl-permissions.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-permissions.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="33" column="42" selection-start="1342" selection-end="1342" vertical-scroll-proportion="0.591133">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -252,6 +340,10 @@
           <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="Libraries" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+        </PATH_ELEMENT>
       </PATH>
       <PATH>
         <PATH_ELEMENT>
@@ -445,74 +537,6 @@
           <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/ui" />
-          <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/tools" />
-          <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>
@@ -551,7 +575,7 @@
           <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="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
@@ -573,280 +597,6 @@
           <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/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/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/permissions" />
-          <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/permissions" />
-          <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/permissions/acl" />
-          <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/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/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/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_ELEMENT>
-          <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/impl" />
-          <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>
@@ -1160,103 +910,100 @@
   </component>
   <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667" version="1">
     <option name="myPlainMode" value="false" />
-    <option name="myLastEditedConfigurable" value="xdoclet" />
+    <option name="myLastEditedConfigurable" value="blog-core" />
   </component>
   <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667,0.5642857" version="1">
     <option name="myLastEditedConfigurable" value="Project Default" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/admin_panel.xhtml">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="35" column="59" selection-start="1492" selection-end="1492" vertical-scroll-proportion="0.8779264">
+        <state line="30" column="96" selection-start="1531" selection-end="1531" vertical-scroll-proportion="0.71770334">
           <folding />
         </state>
       </provider>
-      <provider editor-type-id="HtmlPreview">
-        <state />
-      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog.css">
+    <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="32" column="15" selection-start="449" selection-end="449" vertical-scroll-proportion="0.5192308">
+        <state line="81" column="31" selection-start="2205" selection-end="2205" vertical-scroll-proportion="0.21634616">
           <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/web/views/admin_panel.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="31" selection-start="272" selection-end="272" vertical-scroll-proportion="0.1923077">
+        <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/ui/BlogView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="58" column="44" selection-start="1598" selection-end="1598" vertical-scroll-proportion="0.4054487">
-          <folding />
-        </state>
+      <provider editor-type-id="HtmlPreview">
+        <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/web/views/blog_mod.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="189" column="37" selection-start="6563" selection-end="6563" vertical-scroll-proportion="0.7993311">
+        <state line="44" column="22" selection-start="1891" selection-end="1897" vertical-scroll-proportion="0.72408026">
           <folding />
         </state>
       </provider>
-      <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
+      <provider editor-type-id="HtmlPreview">
         <state />
       </provider>
-      <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
-        <state />
-      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_new.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/HBlogModel.java">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/id_edit.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="118" column="36" selection-start="2920" selection-end="2920" vertical-scroll-proportion="0.34775642">
+        <state line="36" column="83" selection-start="1646" selection-end="1647" vertical-scroll-proportion="0.17224081">
           <folding />
         </state>
       </provider>
+      <provider editor-type-id="HtmlPreview">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="195" column="60" selection-start="6409" selection-end="6409" vertical-scroll-proportion="0.60426927">
+        <state line="35" column="71" selection-start="1322" selection-end="1322" vertical-scroll-proportion="0.84134614">
           <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/blog.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="53" selection-start="421" selection-end="421" vertical-scroll-proportion="0.24630542">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.4903846">
           <folding />
         </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/web/WEB-INF/blog-object.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="168" column="39" selection-start="4579" selection-end="4579" vertical-scroll-proportion="0.59345794">
+        <state line="30" column="21" selection-start="1395" selection-end="1395" vertical-scroll-proportion="0.72115386">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/IdEdit.java">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="170" column="35" selection-start="4365" selection-end="4365" vertical-scroll-proportion="1.0373832">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state line="60" column="37" selection-start="2753" selection-end="2753" vertical-scroll-proportion="0.8444816">
+          <folding />
         </state>
       </provider>
+      <provider editor-type-id="HtmlPreview">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_mod.xhtml">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="45" column="45" selection-start="1943" selection-end="1943" vertical-scroll-proportion="1.0925325">
+        <state line="34" column="99" selection-start="1271" selection-end="1347" vertical-scroll-proportion="0.8528428">
           <folding />
         </state>
       </provider>
@@ -1264,9 +1011,9 @@
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/del_confirm.xhtml">
+    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="88" selection-start="705" selection-end="705" vertical-scroll-proportion="0.3409091">
+        <state line="19" column="54" selection-start="927" selection-end="927" vertical-scroll-proportion="0.48885077">
           <folding />
         </state>
       </provider>
@@ -1276,7 +1023,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="50" column="42" selection-start="2124" selection-end="2124" vertical-scroll-proportion="0.42429283">
+        <state line="66" column="33" selection-start="2989" selection-end="2989" vertical-scroll-proportion="0.7941681">
           <folding />
         </state>
       </provider>
@@ -1284,14 +1031,18 @@
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/id_edit.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="58" column="31" selection-start="2548" selection-end="2548" vertical-scroll-proportion="1.0681819">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.5517242">
           <folding />
         </state>
       </provider>
-      <provider editor-type-id="HtmlPreview">
-        <state />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/acl-permissions.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="33" column="42" selection-start="1342" selection-end="1342" vertical-scroll-proportion="0.591133">
+          <folding />
+        </state>
       </provider>
     </entry>
   </component>

Added: trunk/lib/jboss-portal/portal-faces-lib.jar
===================================================================
(Binary files differ)


Property changes on: trunk/lib/jboss-portal/portal-faces-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




More information about the jboss-cvs-commits mailing list