[jboss-cvs] JBossBlog SVN: r113 - in trunk: blog-core and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 4 06:23:23 EDT 2007
Author: adamw
Date: 2007-04-04 06:23:22 -0400 (Wed, 04 Apr 2007)
New Revision: 113
Added:
trunk/blog-core/src/java/org/jboss/blog/portlet/simple/
trunk/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java
trunk/blog-core/src/web/WEB-INF/blog.taglib.off.xml
trunk/blog-core/src/web/WEB-INF/faces-config.off.xml
trunk/blog-core/src/web/WEB-INF/tld/
trunk/blog-core/src/web/WEB-INF/tld/portlet.tld
trunk/blog-core/src/web/blog_view.jsp
trunk/blog-core/src/web/post_view.jsp
Removed:
trunk/blog-core/src/web/WEB-INF/blog.taglib.xml
trunk/blog-core/src/web/WEB-INF/faces-config.xml
Modified:
trunk/blog-core/build.xml
trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java
trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
trunk/blog-core/src/web/WEB-INF/blog-object.xml
trunk/blog-core/src/web/WEB-INF/jboss-portlet.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/WEB-INF/web.xml
trunk/blog-core/src/web/views/blog_view.xhtml
trunk/jbossblog.ipr
trunk/jbossblog.iws
trunk/lib/jboss-portal/portal-faces-lib.jar
trunk/lib/jboss-portal/portal-identity-lib.jar
Log:
Alternative UI
Modified: trunk/blog-core/build.xml
===================================================================
--- trunk/blog-core/build.xml 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/build.xml 2007-04-04 10:23:22 UTC (rev 113)
@@ -81,6 +81,9 @@
<copy todir="${dist.lib.dir}"><fileset refid="jboss.jaae.jars"/></copy>
<copy todir="${dist.lib.dir}"><fileset refid="jboss.portal.identity.jars"/></copy>
<copy todir="${dist.lib.dir}"><fileset refid="jexl.jars"/></copy>
+
+ <copy todir="${dist.war.dir}/WEB-INF/lib"><fileset refid="jstl.jars"/></copy>
+
<antcall target="copy-libs-for-servlet" />
</target>
Modified: trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java 2007-04-04 10:23:22 UTC (rev 113)
@@ -132,7 +132,7 @@
facesContext.setViewRoot(viewHandler.createView(facesContext, viewId));
}
- if (request.getParameter(getViewIdParameterName()) == null) {
+ if (request.getParameter(getViewIdParameterName()) != null) {
facesContext.getViewRoot().setViewId(viewId);
}
Added: trunk/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java (rev 0)
+++ trunk/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java 2007-04-04 10:23:22 UTC (rev 113)
@@ -0,0 +1,62 @@
+package org.jboss.blog.portlet.simple;
+
+import org.jboss.blog.tools.UITools;
+import org.jboss.blog.ui.State;
+import org.jboss.blog.ui.BlogView;
+
+import javax.portlet.*;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public class BlogPortlet extends GenericPortlet {
+ private String jspPrefix;
+
+ public void init(PortletConfig portletConfig) throws PortletException {
+ super.init(portletConfig);
+
+ jspPrefix = portletConfig.getInitParameter("jspPrefix");
+ }
+
+ private State getStateBean(PortletRequest request) {
+ Object stateBean = request.getPortletSession().getAttribute("stateBean");
+ if (stateBean == null) {
+ stateBean = new State();
+ request.getPortletSession().setAttribute("stateBean", stateBean);
+ }
+
+ return (State) stateBean;
+ }
+
+ private BlogView getBlogViewBean(final PortletRequest request, State stateBean) {
+ BlogView blogViewBean = new BlogView() {
+ protected Object getRequest() {
+ return request;
+ }
+ };
+ blogViewBean.setState(stateBean);
+ blogViewBean.setFromParam(request.getParameter(UITools.FROM_PARAM_NAME));
+ blogViewBean.setPostParam(request.getParameter(UITools.POST_ID_PARAM_NAME));
+
+ return blogViewBean;
+ }
+
+ public void render(RenderRequest request, RenderResponse response) throws PortletException, IOException {
+ response.setContentType("text/html");
+
+ BlogView blogViewBean = getBlogViewBean(request, getStateBean(request));
+
+ String jsp;
+ if ((blogViewBean.getPostParam() != null) &&
+ (blogViewBean.getViewPostsOnSeparatePage().booleanValue())) {
+ jsp = jspPrefix + "post_view.jsp";
+ } else {
+ jsp = jspPrefix + "blog_view.jsp";
+ }
+
+ request.setAttribute("blogView", blogViewBean);
+
+ getPortletContext().getRequestDispatcher(jsp).include(request, response);
+ }
+}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2007-04-04 10:23:22 UTC (rev 113)
@@ -68,7 +68,7 @@
// A list of posts to show in the current view.
private List posts;
- Object getRequest() {
+ protected Object getRequest() {
return FacesContext.getCurrentInstance().getExternalContext().getRequest();
}
Modified: trunk/blog-core/src/web/WEB-INF/blog-object.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/blog-object.xml 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/src/web/WEB-INF/blog-object.xml 2007-04-04 10:23:22 UTC (rev 113)
@@ -6,14 +6,15 @@
<page>
<page-name>blog0</page-name>
<window>
- <window-name>BlogPortletJBossWindow</window-name>
- <instance-ref>BlogPortletJBossInstance</instance-ref>
+ <window-name>SimpleBlogPortletJBossWindow</window-name>
+ <instance-ref>SimpleBlogPortletJBossInstance</instance-ref>
<region>center</region>
<height>1</height>
</window>
</page>
</deployment>
- <deployment>
+
+ <!--<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<page>
@@ -63,5 +64,5 @@
<height>0</height>
</window>
</page>
- </deployment>
+ </deployment>-->
</deployments>
\ No newline at end of file
Copied: trunk/blog-core/src/web/WEB-INF/blog.taglib.off.xml (from rev 105, trunk/blog-core/src/web/WEB-INF/blog.taglib.xml)
===================================================================
--- trunk/blog-core/src/web/WEB-INF/blog.taglib.off.xml (rev 0)
+++ trunk/blog-core/src/web/WEB-INF/blog.taglib.off.xml 2007-04-04 10:23:22 UTC (rev 113)
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+ "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
+<facelet-taglib>
+ <namespace>http://www.jboss.org/portal/jbossblog</namespace>
+ <tag>
+ <tag-name>isAllowed</tag-name>
+ <handler-class>org.jboss.blog.service.permissions.acl.ACLTagHandler</handler-class>
+ </tag>
+
+ <tag>
+ <tag-name>postLink</tag-name>
+ <source>tags/post_link.xhtml</source>
+ </tag>
+
+ <tag>
+ <tag-name>fromLink</tag-name>
+ <source>tags/from_link.xhtml</source>
+ </tag>
+
+ <function>
+ <function-name>postLink</function-name>
+ <function-class>org.jboss.blog.tools.UITools</function-class>
+ <function-signature>java.lang.String createPostLink(java.lang.String)</function-signature>
+ </function>
+
+ <function>
+ <function-name>fromLink</function-name>
+ <function-class>org.jboss.blog.tools.UITools</function-class>
+ <function-signature>java.lang.String createFromLink(java.lang.Integer)</function-signature>
+ </function>
+</facelet-taglib>
\ No newline at end of file
Deleted: trunk/blog-core/src/web/WEB-INF/blog.taglib.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/blog.taglib.xml 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/src/web/WEB-INF/blog.taglib.xml 2007-04-04 10:23:22 UTC (rev 113)
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC
- "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
- "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
- <namespace>http://www.jboss.org/portal/jbossblog</namespace>
- <tag>
- <tag-name>isAllowed</tag-name>
- <handler-class>org.jboss.blog.service.permissions.acl.ACLTagHandler</handler-class>
- </tag>
-
- <tag>
- <tag-name>postLink</tag-name>
- <source>tags/post_link.xhtml</source>
- </tag>
-
- <tag>
- <tag-name>fromLink</tag-name>
- <source>tags/from_link.xhtml</source>
- </tag>
-
- <function>
- <function-name>postLink</function-name>
- <function-class>org.jboss.blog.tools.UITools</function-class>
- <function-signature>java.lang.String createPostLink(java.lang.String)</function-signature>
- </function>
-
- <function>
- <function-name>fromLink</function-name>
- <function-class>org.jboss.blog.tools.UITools</function-class>
- <function-signature>java.lang.String createFromLink(java.lang.Integer)</function-signature>
- </function>
-</facelet-taglib>
\ No newline at end of file
Copied: trunk/blog-core/src/web/WEB-INF/faces-config.off.xml (from rev 108, trunk/blog-core/src/web/WEB-INF/faces-config.xml)
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.off.xml (rev 0)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.off.xml 2007-04-04 10:23:22 UTC (rev 113)
@@ -0,0 +1,225 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!DOCTYPE faces-config PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+
+<faces-config>
+ <application>
+ <!-- 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>
+ <action-listener>org.jboss.blog.service.permissions.acl.AuthorizationListener</action-listener>
+ </application>
+
+ <managed-bean>
+ <managed-bean-name>blogView</managed-bean-name>
+ <managed-bean-class>org.jboss.blog.ui.BlogView</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>state</property-name>
+ <value>#{state}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>postParam</property-name>
+ <value>#{param.post}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>fromParam</property-name>
+ <value>#{param.from}</value>
+ </managed-property>
+ </managed-bean>
+
+ <managed-bean>
+ <managed-bean-name>blogEdit</managed-bean-name>
+ <managed-bean-class>org.jboss.blog.ui.BlogEdit</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>state</property-name>
+ <value>#{state}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>blogView</property-name>
+ <value>#{blogView}</value>
+ </managed-property>
+ </managed-bean>
+
+ <managed-bean>
+ <managed-bean-name>postEdit</managed-bean-name>
+ <managed-bean-class>org.jboss.blog.ui.PostEdit</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>state</property-name>
+ <value>#{state}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>blogView</property-name>
+ <value>#{blogView}</value>
+ </managed-property>
+ </managed-bean>
+
+ <managed-bean>
+ <managed-bean-name>idEdit</managed-bean-name>
+ <managed-bean-class>org.jboss.blog.ui.IdEdit</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>state</property-name>
+ <value>#{state}</value>
+ </managed-property>
+ </managed-bean>
+
+ <managed-bean>
+ <managed-bean-name>commentEdit</managed-bean-name>
+ <managed-bean-class>org.jboss.blog.ui.CommentEdit</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>blogView</property-name>
+ <value>#{blogView}</value>
+ </managed-property>
+ </managed-bean>
+
+ <managed-bean>
+ <managed-bean-name>state</managed-bean-name>
+ <managed-bean-class>org.jboss.blog.ui.State</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
+ <!-- Post/ blog view -->
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>blog_view</from-outcome>
+ <to-view-id>/views/blog_view.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>post_view</from-outcome>
+ <to-view-id>/views/post_view.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <!-- Post edit/new/del -->
+ <navigation-rule>
+ <from-view-id>/views/blog_view.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>post_edit</from-outcome>
+ <to-view-id>/views/post_edit.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/post_view.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>post_edit</from-outcome>
+ <to-view-id>/views/post_edit.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/blog_view.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>post_new</from-outcome>
+ <to-view-id>/views/post_new.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/post_edit.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>post_del</from-outcome>
+ <to-view-id>/views/post_del.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <!-- Comment del -->
+
+ <navigation-rule>
+ <from-view-id>/views/post_view.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>comment_del</from-outcome>
+ <to-view-id>/views/comment_del.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <!-- Admin -->
+ <navigation-rule>
+ <from-view-id>/views/blog_view.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>admin_panel</from-outcome>
+ <to-view-id>/views/admin_panel.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/admin_panel.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>id_edit</from-outcome>
+ <to-view-id>/views/id_edit.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/id_edit.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>admin_panel</from-outcome>
+ <to-view-id>/views/admin_panel.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <!-- Blog edit/new/del -->
+ <navigation-rule>
+ <from-view-id>/views/blog_view.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>blog_edit</from-outcome>
+ <to-view-id>/views/blog_edit.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/post_view.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>blog_edit</from-outcome>
+ <to-view-id>/views/blog_edit.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/id_edit.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>blog_new</from-outcome>
+ <to-view-id>/views/blog_new.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/id_edit.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>blog_del</from-outcome>
+ <to-view-id>/views/blog_del.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/blog_del.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>id_edit</from-outcome>
+ <to-view-id>/views/id_edit.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/blog_del.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>admin_panel</from-outcome>
+ <to-view-id>/views/admin_panel.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+</faces-config>
Deleted: trunk/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.xml 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.xml 2007-04-04 10:23:22 UTC (rev 113)
@@ -1,225 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
- <application>
- <!-- 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>
- <action-listener>org.jboss.blog.service.permissions.acl.AuthorizationListener</action-listener>
- </application>
-
- <managed-bean>
- <managed-bean-name>blogView</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.BlogView</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>state</property-name>
- <value>#{state}</value>
- </managed-property>
- <managed-property>
- <property-name>postParam</property-name>
- <value>#{param.post}</value>
- </managed-property>
- <managed-property>
- <property-name>fromParam</property-name>
- <value>#{param.from}</value>
- </managed-property>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>blogEdit</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.BlogEdit</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>state</property-name>
- <value>#{state}</value>
- </managed-property>
- <managed-property>
- <property-name>blogView</property-name>
- <value>#{blogView}</value>
- </managed-property>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>postEdit</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.PostEdit</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>state</property-name>
- <value>#{state}</value>
- </managed-property>
- <managed-property>
- <property-name>blogView</property-name>
- <value>#{blogView}</value>
- </managed-property>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>idEdit</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.IdEdit</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>state</property-name>
- <value>#{state}</value>
- </managed-property>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>commentEdit</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.CommentEdit</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>blogView</property-name>
- <value>#{blogView}</value>
- </managed-property>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>state</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.State</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-
- <!-- Post/ blog view -->
- <navigation-rule>
- <from-view-id>*</from-view-id>
- <navigation-case>
- <from-outcome>blog_view</from-outcome>
- <to-view-id>/views/blog_view.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>*</from-view-id>
- <navigation-case>
- <from-outcome>post_view</from-outcome>
- <to-view-id>/views/post_view.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- Post edit/new/del -->
- <navigation-rule>
- <from-view-id>/views/blog_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>post_edit</from-outcome>
- <to-view-id>/views/post_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/post_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>post_edit</from-outcome>
- <to-view-id>/views/post_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/blog_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>post_new</from-outcome>
- <to-view-id>/views/post_new.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/post_edit.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>post_del</from-outcome>
- <to-view-id>/views/post_del.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- Comment del -->
-
- <navigation-rule>
- <from-view-id>/views/post_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>comment_del</from-outcome>
- <to-view-id>/views/comment_del.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- Admin -->
- <navigation-rule>
- <from-view-id>/views/blog_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>admin_panel</from-outcome>
- <to-view-id>/views/admin_panel.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/admin_panel.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>id_edit</from-outcome>
- <to-view-id>/views/id_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/id_edit.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>admin_panel</from-outcome>
- <to-view-id>/views/admin_panel.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- Blog edit/new/del -->
- <navigation-rule>
- <from-view-id>/views/blog_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>blog_edit</from-outcome>
- <to-view-id>/views/blog_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/post_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>blog_edit</from-outcome>
- <to-view-id>/views/blog_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/id_edit.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>blog_new</from-outcome>
- <to-view-id>/views/blog_new.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/id_edit.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>blog_del</from-outcome>
- <to-view-id>/views/blog_del.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/blog_del.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>id_edit</from-outcome>
- <to-view-id>/views/id_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/blog_del.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>admin_panel</from-outcome>
- <to-view-id>/views/admin_panel.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-</faces-config>
Modified: trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml 2007-04-04 10:23:22 UTC (rev 113)
@@ -5,4 +5,10 @@
<trans-attribute>Required</trans-attribute>
</transaction>
</portlet>
+ <portlet>
+ <portlet-name>SimpleBlogPortlet</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 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/src/web/WEB-INF/portlet-instances.xml 2007-04-04 10:23:22 UTC (rev 113)
@@ -3,6 +3,52 @@
<deployment>
<if-exists>overwrite</if-exists>
<instance>
+ <instance-id>SimpleBlogPortletJBossInstance</instance-id>
+ <portlet-ref>SimpleBlogPortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>blogId</name>
+ <value>http://jboss.org/jbossBlog/blog/?flavor=rss2</value>
+ </preference>
+ <preference>
+ <name>blogCategory</name>
+ <value></value>
+ </preference>
+ <preference>
+ <name>numberOfPostsPerPage</name>
+ <value>4</value>
+ </preference>
+ <preference>
+ <name>viewPostsOnSeparatePage</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>commentsEnabled</name>
+ <value>false</value>
+ </preference>
+ <preference>
+ <name>showLinkToOriginalBlog</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>showLinkToOriginalPost</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>linkPostsToOriginal</name>
+ <value>false</value>
+ </preference>
+ <preference>
+ <name>feedLinks</name>
+ <value>rss2:http://xsite.com/${type}/feed</value>
+ </preference>
+ </preferences>
+ </instance>
+ </deployment>
+
+ <!--<deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
<instance-id>BlogPortletRedHatInstance</instance-id>
<portlet-ref>BlogPortlet</portlet-ref>
<preferences>
@@ -172,5 +218,5 @@
</preference>
</preferences>
</instance>
- </deployment>
+ </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 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/src/web/WEB-INF/portlet.xml 2007-04-04 10:23:22 UTC (rev 113)
@@ -2,7 +2,7 @@
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
- <portlet>
+ <!--<portlet>
<portlet-name>BlogPortlet</portlet-name>
<portlet-class>org.jboss.blog.portlet.BlogFacesPortlet</portlet-class>
<init-param>
@@ -52,8 +52,71 @@
<value>false</value>
</preference>
<preference>
+ <name>viewAllPosts</name>
+ <value>false</value>
+ </preference>
+ <preference>
<name>feedLinks</name>
</preference>
</portlet-preferences>
+ </portlet>-->
+
+ <portlet>
+ <portlet-name>SimpleBlogPortlet</portlet-name>
+ <portlet-class>org.jboss.blog.portlet.simple.BlogPortlet</portlet-class>
+ <init-param>
+ <name>jspPrefix</name>
+ <value>/</value>
+ </init-param>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <portlet-info>
+ <title>Simple blog portlet</title>
+ </portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>blogId</name>
+ <value>http://finance.yahoo.com/rss/headline?s=rhat</value>
+ </preference>
+ <preference>
+ <name>blogCategory</name>
+ <value></value>
+ </preference>
+ <preference>
+ <name>numberOfPostsPerPage</name>
+ <value>10</value>
+ </preference>
+ <preference>
+ <name>viewPostsOnSeparatePage</name>
+ <value>true</value>
+ </preference>
+ <preference>
+ <name>commentsEnabled</name>
+ <value>false</value>
+ </preference>
+ <preference>
+ <name>showLinkToOriginalBlog</name>
+ <value>false</value>
+ </preference>
+ <preference>
+ <name>showLinkToOriginalPost</name>
+ <value>false</value>
+ </preference>
+ <preference>
+ <name>linkPostsToOriginal</name>
+ <value>false</value>
+ </preference>
+ <preference>
+ <name>viewAllPosts</name>
+ <value>false</value>
+ </preference>
+ <preference>
+ <name>feedLinks</name>
+ </preference>
+ </portlet-preferences>
</portlet>
</portlet-app>
Added: trunk/blog-core/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- trunk/blog-core/src/web/WEB-INF/tld/portlet.tld (rev 0)
+++ trunk/blog-core/src/web/WEB-INF/tld/portlet.tld 2007-04-04 10:23:22 UTC (rev 113)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib>
+
+ <tlib-version>1.0</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>portlet</short-name>
+
+ <uri>http://java.sun.com/portlet</uri>
+
+ <tag>
+
+ <name>param</name>
+ <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.URLParameterTag</tag-class>
+ <body-content>empty</body-content>
+
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+
+ </attribute>
+
+ </tag>
+ <tag>
+
+ <name>renderURL</name>
+ <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.RenderURLTag</tag-class>
+ <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI</tei-class>
+ <body-content>JSP</body-content>
+
+ <attribute>
+ <name>portletMode</name>
+ <rtexprvalue>true</rtexprvalue>
+
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <rtexprvalue>true</rtexprvalue>
+
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <rtexprvalue>true</rtexprvalue>
+
+ </attribute>
+ <attribute>
+ <name>windowState</name>
+ <rtexprvalue>true</rtexprvalue>
+
+ </attribute>
+
+ </tag>
+ <tag>
+
+ <name>defineObjects</name>
+ <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTag</tag-class>
+ <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTagTEI</tei-class>
+ <body-content>empty</body-content>
+
+ </tag>
+ <tag>
+
+ <name>actionURL</name>
+ <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.ActionURLTag</tag-class>
+ <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI</tei-class>
+ <body-content>JSP</body-content>
+
+ <attribute>
+ <name>portletMode</name>
+ <rtexprvalue>true</rtexprvalue>
+
+ </attribute>
+ <attribute>
+ <name>secure</name>
+ <rtexprvalue>true</rtexprvalue>
+
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <rtexprvalue>true</rtexprvalue>
+
+ </attribute>
+ <attribute>
+ <name>windowState</name>
+ <rtexprvalue>true</rtexprvalue>
+
+ </attribute>
+
+ </tag>
+ <tag>
+
+ <name>namespace</name>
+ <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.NamespaceTag</tag-class>
+ <body-content>empty</body-content>
+
+ </tag>
+
+</taglib>
Modified: trunk/blog-core/src/web/WEB-INF/web.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/web.xml 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/src/web/WEB-INF/web.xml 2007-04-04 10:23:22 UTC (rev 113)
@@ -3,13 +3,13 @@
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <!-- Use Documents Saved as *.xhtml -->
+ <!-- Use Documents Saved as *.xhtml
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
- </context-param>
+ </context-param> -->
- <!-- Special Debug Output for Development -->
+ <!-- Special Debug Output for Development
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
<param-value>true</param-value>
@@ -18,17 +18,15 @@
<context-param>
<param-name>facelets.LIBRARIES</param-name>
<param-value>/WEB-INF/blog.taglib.xml</param-value>
- </context-param>
+ </context-param> -->
<!-- Servlet environment -->
- <context-param>
+ <!--<context-param>
<param-name>blogId</param-name>
- <!--<param-value>http://finance.yahoo.com/rss/headline?s=rhat</param-value>-->
<param-value>id0</param-value>
</context-param>
<context-param>
<param-name>blogCategory</param-name>
- <!--<param-value></param-value>-->
<param-value>cat0</param-value>
</context-param>
<context-param>
@@ -46,9 +44,9 @@
<context-param>
<param-name>commentsEnabled</param-name>
<param-value>true</param-value>
- </context-param>
+ </context-param>-->
- <filter>
+ <!--<filter>
<filter-name>Hibernate Session Filter</filter-name>
<filter-class>org.jboss.blog.service.store.hibernate.HibernateSessionFilter</filter-class>
</filter>
@@ -71,5 +69,5 @@
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
+ </servlet-mapping> -->
</web-app>
Added: trunk/blog-core/src/web/blog_view.jsp
===================================================================
--- trunk/blog-core/src/web/blog_view.jsp (rev 0)
+++ trunk/blog-core/src/web/blog_view.jsp 2007-04-04 10:23:22 UTC (rev 113)
@@ -0,0 +1,61 @@
+<%@ page language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored ="false" %>
+
+<portlet:defineObjects />
+
+<c:set var="blogView" value="${requestScope.blogView}" />
+
+<h2>${blogView.blogModel.title}</h2>
+
+<c:if test="${not empty blogView.blogModel.link}">
+ <p>
+ [ <a href="${blogView.blogModel.link}">View the original blog</a> ]
+ </p>
+</c:if>
+
+<c:forEach items="${blogView.posts}" var="post">
+ <p>
+ <a href="<portlet:renderURL><portlet:param name='post' value='${post.titleAsId}' /></portlet:renderURL>">${post.title}</a>
+ created on ${post.createdTime}, ${post.createdDate} by ${post.author.fullName}.
+ </p>
+
+ <c:if test="${not empty post.link}">
+ <p>
+ [ <a href="${post.link}">View the original post</a> ]
+ </p>
+ </c:if>
+
+ <hr />
+</c:forEach>
+
+<p>
+<c:if test="${blogView.hasPrevious}">
+ <a href="<portlet:renderURL><portlet:param name='from' value='${blogView.previousFrom}' /></portlet:renderURL>">Previous</a>
+</c:if>
+
+<c:if test="${blogView.hasNext}">
+ <a href="<portlet:renderURL><portlet:param name='from' value='${blogView.nextFrom}' /></portlet:renderURL>">Next</a>
+</c:if>
+</p>
+
+<p>
+<c:if test="${not empty blogView.feedLinks}">
+ Subscribe to a feed:
+
+ <c:if test="${not empty blogView.feedLinks.rss2}">
+ <a href="${blogView.feedLinks.rss2}">RSS2</a>
+ </c:if>
+
+ <c:if test="${not empty blogView.feedLinks.rdf}">
+ <a href="${blogView.feedLinks.rdf}">RDF</a>
+ </c:if>
+
+ <c:if test="${not empty blogView.feedLinks.atom}">
+ <a href="${blogView.feedLinks.atom}">Atom</a>
+ </c:if>
+</c:if>
+</p>
+
Added: trunk/blog-core/src/web/post_view.jsp
===================================================================
--- trunk/blog-core/src/web/post_view.jsp (rev 0)
+++ trunk/blog-core/src/web/post_view.jsp 2007-04-04 10:23:22 UTC (rev 113)
@@ -0,0 +1,41 @@
+<%@ page language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored ="false" %>
+
+<portlet:defineObjects />
+
+<c:set var="blogView" value="${requestScope.blogView}" />
+
+<p>
+ <a href="<portlet:renderURL><portlet:param name='from' value='${blogView.from}' /></portlet:renderURL>">Back</a>
+</p>
+
+<h2>${blogView.blogModel.title}</h2>
+
+<c:if test="${not empty blogView.blogModel.link}">
+ <p>
+ [ <a href="${blogView.blogModel.link}">View the original blog</a> ]
+ </p>
+</c:if>
+
+<p>
+${blogView.selectedPost.title}
+created on ${blogView.selectedPost.createdTime}, ${blogView.selectedPost.createdDate} by ${blogView.selectedPost.author.fullName}.
+</p>
+
+<c:if test="${not empty blogView.selectedPost.link}">
+ <p>
+ [ <a href="${blogView.selectedPost.link}">View the original post</a> ]
+ </p>
+</c:if>
+
+<p>
+${blogView.selectedPost.description}
+</p>
+
+<p>
+ <a href="<portlet:renderURL><portlet:param name='from' value='${blogView.from}' /></portlet:renderURL>">Back</a>
+</p>
+
Modified: trunk/blog-core/src/web/views/blog_view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/blog_view.xhtml 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/blog-core/src/web/views/blog_view.xhtml 2007-04-04 10:23:22 UTC (rev 113)
@@ -52,8 +52,8 @@
<h:panelGroup rendered="#{!blogView.viewPostsOnSeparatePage and
(blogView.viewAllPosts ||
(blogView.selectedPostTitleAsId == post.titleAsId))}">
- <h:panelGroup rendered="#{blogView.showLinkToOriginalPost and (not empty blogView.selectedPost.link)}">
- <p>[ <h:outputLink value="#{blogView.selectedPost.link}">Original post</h:outputLink> ]</p>
+ <h:panelGroup rendered="#{blogView.showLinkToOriginalPost and (not empty post.link)}">
+ <p>[ <h:outputLink value="#{post.link}">Original post</h:outputLink> ]</p>
</h:panelGroup>
<p class="post-description">
Modified: trunk/jbossblog.ipr
===================================================================
--- trunk/jbossblog.ipr 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/jbossblog.ipr 2007-04-04 10:23:22 UTC (rev 113)
@@ -84,15 +84,15 @@
<used_levels>
<error>
<option name="myName" value="ERROR" />
- <option name="myVal" value="400" />
+ <option name="myVal" value="200" />
</error>
<warning>
<option name="myName" value="WARNING" />
- <option name="myVal" value="300" />
+ <option name="myVal" value="100" />
</warning>
<information>
<option name="myName" value="INFO" />
- <option name="myVal" value="200" />
+ <option name="myVal" value="100" />
</information>
<server>
<option name="myName" value="SERVER PROBLEM" />
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2007-03-30 23:45:31 UTC (rev 112)
+++ trunk/jbossblog.iws 2007-04-04 10:23:22 UTC (rev 113)
@@ -17,9 +17,27 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/common.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/common.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.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="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" afterPath="" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/simple" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/tld" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-portlet.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-portlet.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossblog.iws" afterPath="$PROJECT_DIR$/jbossblog.iws" />
+ <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/java/org/jboss/blog/ui/BlogView.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog.taglib.xml" afterPath="" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/post_view.jsp" />
+ <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/faces-config.off.xml" />
+ <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$/jbossblog.ipr" afterPath="$PROJECT_DIR$/jbossblog.ipr" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/tld/portlet.tld" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog.taglib.off.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/blog_view.jsp" />
+ <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/web/WEB-INF/portlet-instances.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -144,75 +162,53 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="MyFacesGenericPortletExt.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java">
+ <file leaf-file-name="portlet.xml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="75" column="50" selection-start="2721" selection-end="2721" vertical-scroll-proportion="0.27541372">
+ <state line="9" column="40" selection-start="559" selection-end="559" vertical-scroll-proportion="0.16033255">
<folding />
</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">
+ <file leaf-file-name="BlogFacesPortlet.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="20" selection-start="1663" selection-end="1663" vertical-scroll-proportion="0.69512194">
+ <state line="11" column="13" selection-start="238" selection-end="238" vertical-scroll-proportion="0.12470309">
<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">
+ <file leaf-file-name="BlogPortlet.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="56" column="52" selection-start="2656" selection-end="2656" vertical-scroll-proportion="0.6402439">
- <folding />
+ <state line="21" column="52" selection-start="582" selection-end="582" vertical-scroll-proportion="0.37410927">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <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">
+ <file leaf-file-name="blog_view.jsp" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog_view.jsp">
<provider selected="true" editor-type-id="text-editor">
- <state line="227" column="9" selection-start="6810" selection-end="6810" vertical-scroll-proportion="0.4503546">
+ <state line="13" column="35" selection-start="445" selection-end="445" vertical-scroll-proportion="0.23159145">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="faces-config.xml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
+ <file leaf-file-name="post_view.jsp" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/post_view.jsp">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="4" selection-start="768" selection-end="768" vertical-scroll-proportion="0.3292683">
+ <state line="29" column="42" selection-start="943" selection-end="943" vertical-scroll-proportion="0.5166271">
<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="common.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/common.xhtml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="20" column="41" selection-start="919" selection-end="919" vertical-scroll-proportion="0.36585367">
- <folding />
- </state>
- </provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -360,94 +356,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="blog-hibernate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </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-hibernate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-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-hibernate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/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-hibernate/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/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-hibernate/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-hibernate/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-hibernate/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-hibernate/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-hibernate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/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>
@@ -536,36 +444,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/web/WEB-INF" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/web/WEB-INF/tags" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/web/views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -800,57 +678,27 @@
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java" />
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org" />
<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="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/etc" />
+ <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/etc/META-INF" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet" />
<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-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </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-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/simple" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -860,152 +708,22 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="blog-common" />
+ <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-common" />
+ <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-common/src" />
+ <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-common/src/java" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/etc" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/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-common/src/java/org/jboss/blog" />
- <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-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/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-common/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/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-common/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-common/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-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/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-common/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/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-common/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-common/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-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/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-common/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/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-common/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-common/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-common/src/java/org/jboss/blog/model/impl" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -1019,7 +737,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" />
+ <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -1063,15 +781,24 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager">
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
+ <option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <module name="" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <method>
+ <option name="Make" value="true" />
+ </method>
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
@@ -1092,24 +819,15 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- <method>
- <option name="Make" value="true" />
- </method>
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <module name="" />
</configuration>
</component>
<component name="ScopeViewComponent">
@@ -1188,14 +906,14 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="25" width="1690" height="1004" extended-state="6" />
+ <frame x="0" y="25" width="1680" height="1000" extended-state="0" />
<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" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" order="7" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3274065" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32695866" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32760596" order="1" />
<window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1770512" order="7" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22565866" order="9" />
@@ -1264,7 +982,6 @@
<option name="RECURSIVE" value="false" />
</CheckinOptions>
<AddOptions>
- <option name="COMMENT" value="" />
<option name="STORE_ONLY_LATEST_VERSION" value="false" />
<option name="CHECK_OUT_IMMEDIATELY" value="false" />
<option name="FILE_TYPE" value="0" />
@@ -1299,44 +1016,37 @@
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="0.16666667" version="1">
<option name="myLastEditedConfigurable" value="Local Scopes" />
</component>
- <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667" version="1">
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="portlet-api-lib.jar" />
+ <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/post_del.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.off.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">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
+ <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
<state />
</provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_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">
+ <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
<state />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="40" selection-start="974" selection-end="974" vertical-scroll-proportion="0.39007092">
+ <state line="78" column="60" selection-start="2712" selection-end="2712" vertical-scroll-proportion="0.6947743">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_mod.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="27" column="57" selection-start="1184" selection-end="1184" vertical-scroll-proportion="0.4695122">
+ <state line="9" column="51" selection-start="455" selection-end="455" vertical-scroll-proportion="0.16544117">
<folding />
</state>
</provider>
@@ -1344,9 +1054,9 @@
<state />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/id_edit.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="20" selection-start="2618" selection-end="2618" vertical-scroll-proportion="0.85365856">
+ <state line="33" column="108" selection-start="1446" selection-end="1469" vertical-scroll-proportion="0.6066176">
<folding />
</state>
</provider>
@@ -1354,9 +1064,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/post_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="20" selection-start="1072" selection-end="1072" vertical-scroll-proportion="0.47560975">
+ <state line="29" column="41" selection-start="1185" selection-end="1185" vertical-scroll-proportion="0.3125">
<folding />
</state>
</provider>
@@ -1364,92 +1074,77 @@
<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/post_view.jsp">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="20" selection-start="1432" selection-end="1432" vertical-scroll-proportion="0.6402439">
+ <state line="29" column="42" selection-start="943" selection-end="943" vertical-scroll-proportion="0.5166271">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/blog_view.jsp">
<provider selected="true" editor-type-id="text-editor">
- <state line="75" column="50" selection-start="2721" selection-end="2721" vertical-scroll-proportion="0.27541372">
+ <state line="13" column="35" selection-start="445" selection-end="445" vertical-scroll-proportion="0.23159145">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/admin_panel.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="20" selection-start="1965" selection-end="1965" vertical-scroll-proportion="0.8597561">
+ <state line="11" column="13" selection-start="238" selection-end="238" vertical-scroll-proportion="0.12470309">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/simple/BlogPortlet.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="21" column="52" selection-start="582" selection-end="582" vertical-scroll-proportion="0.37410927">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/common.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-app.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="20" column="41" selection-start="919" selection-end="919" vertical-scroll-proportion="0.36585367">
+ <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/web/views/post_view.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-portlet.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="15" selection-start="653" selection-end="653" vertical-scroll-proportion="-0.0060975607">
+ <state line="8" column="28" selection-start="235" selection-end="235" vertical-scroll-proportion="0.14251782">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/jboss-web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="56" column="52" selection-start="2656" selection-end="2656" vertical-scroll-proportion="0.6402439">
+ <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/web/views/view.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="20" selection-start="1663" selection-end="1663" vertical-scroll-proportion="0.69512194">
+ <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/ui/BlogView.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="227" column="9" selection-start="6810" selection-end="6810" vertical-scroll-proportion="0.4503546">
+ <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/web/WEB-INF/faces-config.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="4" selection-start="768" selection-end="768" vertical-scroll-proportion="0.3292683">
+ <state line="9" column="40" selection-start="559" selection-end="559" vertical-scroll-proportion="0.16033255">
<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>
</component>
</project>
Modified: trunk/lib/jboss-portal/portal-faces-lib.jar
===================================================================
(Binary files differ)
Modified: trunk/lib/jboss-portal/portal-identity-lib.jar
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list