[jboss-cvs] JBossBlog SVN: r108 - in trunk: blog-core/src/web/WEB-INF and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 26 04:54:27 EDT 2007
Author: adamw
Date: 2007-03-26 04:54:27 -0400 (Mon, 26 Mar 2007)
New Revision: 108
Removed:
trunk/blog-core/src/web/views/index.xhtml
Modified:
trunk/blog-core/src/web/WEB-INF/faces-config.xml
trunk/blog-core/src/web/WEB-INF/portlet.xml
trunk/jbossblog.iws
Log:
Fix for actions
Modified: trunk/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.xml 2007-03-26 08:41:36 UTC (rev 107)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.xml 2007-03-26 08:54:27 UTC (rev 108)
@@ -94,7 +94,7 @@
<from-view-id>*</from-view-id>
<navigation-case>
<from-outcome>blog_view</from-outcome>
- <to-view-id>/views/index.xhtml</to-view-id>
+ <to-view-id>/views/blog_view.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
@@ -108,7 +108,7 @@
<!-- Post edit/new/del -->
<navigation-rule>
- <from-view-id>/views/index.xhtml</from-view-id>
+ <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>
@@ -124,7 +124,7 @@
</navigation-rule>
<navigation-rule>
- <from-view-id>/views/index.xhtml</from-view-id>
+ <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>
@@ -151,7 +151,7 @@
<!-- Admin -->
<navigation-rule>
- <from-view-id>/views/index.xhtml</from-view-id>
+ <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>
@@ -176,7 +176,7 @@
<!-- Blog edit/new/del -->
<navigation-rule>
- <from-view-id>/views/index.xhtml</from-view-id>
+ <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>
Modified: trunk/blog-core/src/web/WEB-INF/portlet.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/portlet.xml 2007-03-26 08:41:36 UTC (rev 107)
+++ trunk/blog-core/src/web/WEB-INF/portlet.xml 2007-03-26 08:54:27 UTC (rev 108)
@@ -7,7 +7,7 @@
<portlet-class>org.jboss.blog.portlet.BlogFacesPortlet</portlet-class>
<init-param>
<name>default-view</name>
- <value>/views/index.xhtml</value>
+ <value>/views/blog_view.xhtml</value>
</init-param>
<expiration-cache>0</expiration-cache>
<supports>
Deleted: trunk/blog-core/src/web/views/index.xhtml
===================================================================
--- trunk/blog-core/src/web/views/index.xhtml 2007-03-26 08:41:36 UTC (rev 107)
+++ trunk/blog-core/src/web/views/index.xhtml 2007-03-26 08:54:27 UTC (rev 108)
@@ -1,8 +0,0 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:blog="http://www.jboss.org/portal/jbossblog">
-<ui:include src="blog_view.xhtml" />
-</div>
\ No newline at end of file
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2007-03-26 08:41:36 UTC (rev 107)
+++ trunk/jbossblog.iws 2007-03-26 08:54:27 UTC (rev 108)
@@ -17,8 +17,10 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <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="MODIFICATION" beforePath="$PROJECT_DIR$/jbossblog.iws" afterPath="$PROJECT_DIR$/jbossblog.iws" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/web/views/index.xhtml" afterPath="" />
+ <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" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -146,43 +148,16 @@
<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="386" column="17" selection-start="10517" selection-end="10517" vertical-scroll-proportion="6.309976">
+ <state line="355" column="27" selection-start="9910" selection-end="9910" vertical-scroll-proportion="0.4655582">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="from_link.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/tags/from_link.xhtml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1" column="45" selection-start="145" selection-end="145" vertical-scroll-proportion="0.018382354">
- <folding />
- </state>
- </provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
- </entry>
- </file>
- <file leaf-file-name="faces-config.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="32" column="31" selection-start="1324" selection-end="1324" vertical-scroll-proportion="0.5882353">
- <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="MyFacesGenericPortletExt.java" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="MyFacesGenericPortletExt.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="112" selection-start="1242" selection-end="1242" vertical-scroll-proportion="0.05344418">
+ <state line="88" column="13" selection-start="3025" selection-end="3025" vertical-scroll-proportion="0.6235154">
<folding />
</state>
</provider>
@@ -191,16 +166,16 @@
<file leaf-file-name="UITools.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="73" column="59" selection-start="2745" selection-end="2745" vertical-scroll-proportion="0.83966744">
+ <state line="73" column="59" selection-start="2745" selection-end="2745" vertical-scroll-proportion="1.2114015">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="BlogFacesPortlet.java" pinned="false" current="true" current-in-tab="true">
+ <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="6" column="40" selection-start="175" selection-end="175" vertical-scroll-proportion="0.10688836">
+ <state line="6" column="40" selection-start="175" selection-end="175" vertical-scroll-proportion="-0.15795724">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -211,7 +186,7 @@
<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="79" column="52" selection-start="3430" selection-end="3430" vertical-scroll-proportion="0.8112745">
+ <state line="15" column="87" selection-start="746" selection-end="746" vertical-scroll-proportion="0.2757353">
<folding />
</state>
</provider>
@@ -1410,13 +1385,6 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model/BlogPostWithIndex.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="8" column="41" selection-start="181" selection-end="181" vertical-scroll-proportion="0.14563107">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogPostWithIndex.java">
<provider selected="true" editor-type-id="text-editor">
<state line="25" column="48" selection-start="590" selection-end="590" vertical-scroll-proportion="0.45509708">
@@ -1459,63 +1427,65 @@
</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/views/post_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="386" column="17" selection-start="10517" selection-end="10517" vertical-scroll-proportion="6.309976">
+ <state line="109" column="75" selection-start="4355" selection-end="4355" vertical-scroll-proportion="0.8161765">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/tags/from_link.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="45" selection-start="145" selection-end="145" vertical-scroll-proportion="0.018382354">
+ <state line="73" column="59" selection-start="2745" selection-end="2745" vertical-scroll-proportion="1.2114015">
<folding />
</state>
</provider>
- <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_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="31" selection-start="1324" selection-end="1324" vertical-scroll-proportion="0.5882353">
+ <state line="15" column="87" selection-start="746" selection-end="746" vertical-scroll-proportion="0.2757353">
<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/tools/UITools.java">
+ <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="73" column="59" selection-start="2745" selection-end="2745" vertical-scroll-proportion="0.83966744">
- <folding />
+ <state line="6" column="40" selection-start="175" selection-end="175" vertical-scroll-proportion="-0.15795724">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</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/WEB-INF/portlet.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="112" selection-start="1242" selection-end="1242" vertical-scroll-proportion="0.05344418">
+ <state line="18" column="45" selection-start="874" selection-end="874" vertical-scroll-proportion="0.3276699">
<folding />
</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/faces-config.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="79" column="52" selection-start="3430" selection-end="3430" vertical-scroll-proportion="0.8112745">
+ <state line="209" column="29" selection-start="7326" selection-end="7326" vertical-scroll-proportion="0.5955882">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
+ <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
<state />
</provider>
+ <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/post_view.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/tags/from_link.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="109" column="75" selection-start="4355" selection-end="4355" vertical-scroll-proportion="0.8161765">
+ <state line="1" column="45" selection-start="145" selection-end="145" vertical-scroll-proportion="0.018382354">
<folding />
</state>
</provider>
@@ -1523,15 +1493,20 @@
<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/src/java/org/jboss/blog/ui/BlogView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="40" selection-start="175" selection-end="175" vertical-scroll-proportion="0.10688836">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="355" column="27" selection-start="9910" selection-end="9910" vertical-scroll-proportion="0.4655582">
+ <folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="88" column="13" selection-start="3025" selection-end="3025" vertical-scroll-proportion="0.6235154">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
More information about the jboss-cvs-commits
mailing list