[jboss-cvs] JBossBlog SVN: r13 - in trunk: . blog-core blog-core/src/etc/META-INF blog-core/src/java/org/jboss/blog/model blog-core/src/java/org/jboss/blog/service/configuration blog-core/src/java/org/jboss/blog/tools blog-core/src/java/org/jboss/blog/ui blog-core/src/web/WEB-INF blog-core/src/web/views lib/myfaces
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 17 17:02:24 EDT 2006
Author: adamw
Date: 2006-10-17 17:01:50 -0400 (Tue, 17 Oct 2006)
New Revision: 13
Added:
trunk/blog-core/src/java/org/jboss/blog/model/DoesNotExistBlogEntry.java
trunk/blog-core/src/web/views/viewentry.xhtml
trunk/lib/myfaces/commons-beanutils-1.7.0.jar
trunk/lib/myfaces/commons-codec-1.3.jar
trunk/lib/myfaces/commons-collections-3.1.jar
trunk/lib/myfaces/commons-digester-1.6.jar
trunk/lib/myfaces/commons-el-1.0.jar
trunk/lib/myfaces/commons-lang-2.1.jar
trunk/lib/myfaces/commons-logging-1.0.4.jar
Modified:
trunk/blog-core/blog-core.iml
trunk/blog-core/src/etc/META-INF/jboss-service.xml
trunk/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java
trunk/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java
trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java
trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java
trunk/blog-core/src/java/org/jboss/blog/tools/BlogTools.java
trunk/blog-core/src/java/org/jboss/blog/ui/CurrentView.java
trunk/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java
trunk/blog-core/src/web/WEB-INF/faces-config.xml
trunk/blog-core/src/web/WEB-INF/web.xml
trunk/blog-core/src/web/views/viewblog.xhtml
trunk/jbossblog.ipr
trunk/jbossblog.iws
Log:
http://jira.jboss.com/jira/browse/JBBLOG-7
Modified: trunk/blog-core/blog-core.iml
===================================================================
--- trunk/blog-core/blog-core.iml 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/blog-core.iml 2006-10-17 21:01:50 UTC (rev 13)
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
+<module version="4" relativePaths="true" type="J2EE_WEB_MODULE">
+ <component name="AppServerSpecificValidatorsManager" />
<component name="ModuleRootManager" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
+ <exclude-exploded />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
</content>
@@ -11,6 +13,43 @@
<orderEntry type="module-library">
<library>
<CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" name="jsf" level="project" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../lib/facelets/jsf-facelets-portlet.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../lib/facelets/jsf-facelets.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../lib/jboss/jboss-jmx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
<root url="jar://$MODULE_DIR$/../lib/jboss/jboss-system.jar!/" />
</CLASSES>
<JAVADOC />
@@ -47,7 +86,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jboss/jboss-jmx.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/xdoclet/xdoclet-jmx-module-1.2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -56,7 +95,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/facelets/jsf-facelets.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/xdoclet/commons-collections-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -65,17 +104,16 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/myfaces/myfaces-api.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/xdoclet/xdoclet-jboss-module-1.2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" name="xdoclet" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/facelets/jsf-facelets-portlet.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/xdoclet/xdoclet-ejb-module-1.2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -84,7 +122,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/myfaces/myfaces-impl.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/xdoclet/log4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -93,7 +131,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jstl/standard.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/xdoclet/xdoclet-web-module-1.2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -102,7 +140,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jstl/jstl.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/xdoclet/commons-logging.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -111,7 +149,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/servlet/javax.servlet.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/xdoclet/xdoclet-1.2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -120,7 +158,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/servlet/javax.servlet.jsp.jar!/" />
+ <root url="jar://$MODULE_DIR$/../lib/xdoclet/xjavadoc-1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -128,5 +166,111 @@
</orderEntry>
<orderEntryProperties />
</component>
+ <component name="WebModuleBuildComponent">
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="SYNC_EXPLODED_DIR" value="true" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="RUN_JASPER_VALIDATION" value="true" />
+ </component>
+ <component name="WebModuleProperties">
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/jsf-facelets-portlet.jar" />
+ <url>jar://$MODULE_DIR$/../lib/facelets/jsf-facelets-portlet.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/jsf-facelets.jar" />
+ <url>jar://$MODULE_DIR$/../lib/facelets/jsf-facelets.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/jboss-jmx.jar" />
+ <url>jar://$MODULE_DIR$/../lib/jboss/jboss-jmx.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/jboss-system.jar" />
+ <url>jar://$MODULE_DIR$/../lib/jboss/jboss-system.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/portlet-api-lib.jar" />
+ <url>jar://$MODULE_DIR$/../lib/portlet/portlet-api-lib.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/jdom-1.0.jar" />
+ <url>jar://$MODULE_DIR$/../lib/rome/jdom-1.0.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/rome-0.8.jar" />
+ <url>jar://$MODULE_DIR$/../lib/rome/rome-0.8.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-collections-2.0.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xdoclet/commons-collections-2.0.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xdoclet/commons-logging.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/log4j.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xdoclet/log4j.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/xdoclet-1.2.3.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xdoclet/xdoclet-1.2.3.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/xdoclet-ejb-module-1.2.3.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xdoclet/xdoclet-ejb-module-1.2.3.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/xdoclet-jboss-module-1.2.3.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xdoclet/xdoclet-jboss-module-1.2.3.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/xdoclet-jmx-module-1.2.3.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xdoclet/xdoclet-jmx-module-1.2.3.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/xdoclet-web-module-1.2.3.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xdoclet/xdoclet-web-module-1.2.3.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/xjavadoc-1.1.jar" />
+ <url>jar://$MODULE_DIR$/../lib/xdoclet/xjavadoc-1.1.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="0" />
+ <attribute name="URI" value="<N/A>" />
+ <url>jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/</url>
+ </containerElement>
+ <containerElement type="library" name="jsf" level="project">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib" />
+ </containerElement>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/web/WEB-INF/web.xml" optional="false" version="2.3" />
+ <webroots>
+ <root url="file://$MODULE_DIR$/src/web" relative="/" />
+ </webroots>
+ </component>
+ <component name="WeblogicWebModuleProperties" />
</module>
Modified: trunk/blog-core/src/etc/META-INF/jboss-service.xml
===================================================================
--- trunk/blog-core/src/etc/META-INF/jboss-service.xml 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/etc/META-INF/jboss-service.xml 2006-10-17 21:01:50 UTC (rev 13)
@@ -17,6 +17,7 @@
xmbean-dd="org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.xml" >
<attribute name="NumberOfEntriesPerPageName">numberOfEntriesPerPage</attribute>
<attribute name="ViewEntriesOnSeparatePageName">viewEntriesOnSeparatePage</attribute>
+ <attribute name="ViewAllEntriesName">viewAllEntries</attribute>
</mbean>
<mbean
Added: trunk/blog-core/src/java/org/jboss/blog/model/DoesNotExistBlogEntry.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/model/DoesNotExistBlogEntry.java 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/java/org/jboss/blog/model/DoesNotExistBlogEntry.java 2006-10-17 21:01:50 UTC (rev 13)
@@ -0,0 +1,12 @@
+package org.jboss.blog.model;
+
+import java.util.Date;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public class DoesNotExistBlogEntry extends BlogEntry {
+ public DoesNotExistBlogEntry(String author, String title) {
+ super(author, title, "", new Date(), null, null, null);
+ }
+}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java 2006-10-17 21:01:50 UTC (rev 13)
@@ -9,6 +9,7 @@
implements BlogConfigurationService {
private String numberOfEntriesPerPageName;
private String viewEntriesOnSeparatePageName;
+ private String viewAllEntriesName;
/**
* @jmx.managed-attribute
@@ -37,4 +38,18 @@
public void setViewEntriesOnSeparatePageName(String viewEntriesOnSeparatePageName) {
this.viewEntriesOnSeparatePageName = viewEntriesOnSeparatePageName;
}
+
+ /**
+ * @jmx.managed-attribute
+ */
+ public String getViewAllEntriesName() {
+ return viewAllEntriesName;
+ }
+
+ /**
+ * @jmx.managed-attribute
+ */
+ public void setViewAllEntriesName(String viewAllEntriesName) {
+ this.viewAllEntriesName = viewAllEntriesName;
+ }
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java 2006-10-17 21:01:50 UTC (rev 13)
@@ -10,7 +10,8 @@
/**
*
* @param request Request from which to read the configuration.
- * @return Number of entries to be shown on the main blog view page.
+ * @return Number of entries to be shown on the main blog view page. Shuld
+ * never return null.
*/
public Integer getNumberOfEntriesPerPage(Object request);
@@ -19,7 +20,18 @@
* @param request Request from which to read the configuration.
* @return True iff entries body should be viewable on a separate page,
* that is, after clicking on an entry title, should a special entry-view
- * page be opened, or should the entry be expanded.
+ * page be opened, or should the entry be expanded. Should never return
+ * null.
*/
public Boolean getViewEntriesOnSeparatePage(Object request);
+
+ /**
+ *
+ * @param request Request from which to read the configuration.
+ * @return True iff all entries should be expanded by default.
+ * Still, entries can be viewed on a separate pages, if the
+ * configuration states so. This can be useful for blogs with
+ * comments.
+ */
+ public Boolean getViewAllEntries(Object request);
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java 2006-10-17 21:01:50 UTC (rev 13)
@@ -29,8 +29,16 @@
* @jmx.managed-parameter type="java.lang.Object"
*/
public Boolean getViewEntriesOnSeparatePage(Object request) {
-
return Boolean.valueOf(BlogTools.getInitParam(
getViewEntriesOnSeparatePageName()));
}
+
+ /**
+ * @jmx.managed-operation
+ * @jmx.managed-parameter type="java.lang.Object"
+ */
+ public Boolean getViewAllEntries(Object request) {
+ return Boolean.valueOf(BlogTools.getInitParam(
+ getViewAllEntriesName()));
+ }
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java 2006-10-17 21:01:50 UTC (rev 13)
@@ -34,4 +34,14 @@
BlogTools.castToPortletRequest(this, request),
getViewEntriesOnSeparatePageName()));
}
+
+ /**
+ * @jmx.managed-operation
+ * @jmx.managed-parameter type="java.lang.Object"
+ */
+ public Boolean getViewAllEntries(Object request) {
+ return Boolean.valueOf(BlogTools.getPortletPreference(
+ BlogTools.castToPortletRequest(this, request),
+ getViewAllEntriesName()));
+ }
}
Modified: trunk/blog-core/src/java/org/jboss/blog/tools/BlogTools.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/tools/BlogTools.java 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/BlogTools.java 2006-10-17 21:01:50 UTC (rev 13)
@@ -105,12 +105,19 @@
/**
* Converts the given string to an id-friendly form. Specifially, replaces any
- * characters that are not letters, digits, _ or - to _.
- * @param toConvert String to convert.
+ * characters that are not letters, digits, _ or - to _. Also, if the first
+ * character is a digit, prepends the string with a _.
+ * @param toConvert String to convert. Cannot be null.
* @return The original string with all occurences of characters that are not
- * letters, digits, underscores or dashes replaced by an underscore.
+ * letters, digits, underscores or dashes replaced by an underscore; prepended
+ * with _ if the first letter is a digit.
*/
public static String convertToId(String toConvert) {
- return toConvert.replaceAll("[^A-Za-z0-9_-]", "_");
+ String ret = toConvert.replaceAll("[^A-Za-z0-9_-]", "_");
+ if ((ret.length() > 0) && (ret.charAt(0) >= '0') && (ret.charAt(0) <= '9')) {
+ return "_" + ret;
+ } else {
+ return ret;
+ }
}
}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/CurrentView.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/CurrentView.java 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/CurrentView.java 2006-10-17 21:01:50 UTC (rev 13)
@@ -2,12 +2,14 @@
import org.jboss.blog.model.BlogModel;
import org.jboss.blog.model.BlogModelDoesNotExistException;
+import org.jboss.blog.model.BlogEntry;
+import org.jboss.blog.model.DoesNotExistBlogEntry;
import org.jboss.blog.BlogName;
import org.jboss.blog.tools.BlogTools;
import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.AbortProcessingException;
+import javax.faces.component.UIData;
+import java.util.List;
/**
* A request-scoped bean allowing to access current view setup - what and how
@@ -15,20 +17,22 @@
* @author Adam Warski (adamw at aster.pl)
*/
public class CurrentView {
- private GlobalViewState viewState;
-
- private BlogName blogName;
- private BlogModel blogModel;
- private Integer numberOfEntriesPerPage;
- private Boolean viewEntriesOnSeparatePage;
public CurrentView() {
}
- private Object getRequest() {
- return FacesContext.getCurrentInstance().getExternalContext().getRequest();
+ // Faces-managed properties
+ private UIData entriesData;
+ private GlobalViewState viewState;
+
+ public UIData getEntriesData() {
+ return entriesData;
}
+ public void setEntriesData(UIData entriesData) {
+ this.entriesData = entriesData;
+ }
+
public GlobalViewState getViewState() {
return viewState;
}
@@ -37,8 +41,21 @@
this.viewState = viewState;
}
+ // Cached properties
+ private BlogName blogName;
+ private BlogModel blogModel;
+ private BlogViewState blogViewState;
+ private Integer numberOfEntriesPerPage;
+ private Boolean viewEntriesOnSeparatePage;
+ private Boolean viewAllEntries;
+ private Boolean entriesExpandable;
+
+ private Object getRequest() {
+ return FacesContext.getCurrentInstance().getExternalContext().getRequest();
+ }
+
public BlogName getBlogName() {
- if (blogName == null) {
+ if (blogName == null) {
blogName = BlogTools.getBlogService().getNameService().getBlogName(getRequest());
}
@@ -67,7 +84,7 @@
return numberOfEntriesPerPage;
}
- public Boolean isViewEntriesOnSeparatePage() {
+ public Boolean getViewEntriesOnSeparatePage() {
if (viewEntriesOnSeparatePage == null) {
viewEntriesOnSeparatePage = BlogTools.getBlogService().getConfigurationService().
getViewEntriesOnSeparatePage(getRequest());
@@ -76,6 +93,34 @@
return viewEntriesOnSeparatePage;
}
+ public Boolean getViewAllEntries() {
+ if (viewAllEntries == null) {
+ viewAllEntries = BlogTools.getBlogService().getConfigurationService().
+ getViewAllEntries(getRequest());
+ }
+
+ return viewAllEntries;
+ }
+
+ public BlogViewState getBlogViewState() {
+ if (blogViewState == null) {
+ blogViewState = viewState.getBlogViewState(getBlogName());
+ }
+
+ return blogViewState;
+ }
+
+ public Boolean getEntriesExpandable() {
+ if (entriesExpandable == null) {
+ entriesExpandable = Boolean.valueOf(!getViewAllEntries().booleanValue() ||
+ getViewEntriesOnSeparatePage().booleanValue());
+ }
+
+ return entriesExpandable;
+ }
+
+ //
+
public boolean getHasPrevious() {
return getFrom().intValue() > 0;
}
@@ -85,30 +130,102 @@
}
public Integer getTo() {
- return new Integer(getFrom().intValue() + getNumberOfEntriesPerPage().intValue() - 1);
+ return new Integer(getFrom().intValue() + getNumberOfEntriesPerPage().intValue());
}
public Integer getFrom() {
- return viewState.getFrom(this);
+ return getBlogViewState().getFrom();
}
+ private void setFrom(Integer from) {
+ BlogViewState bvs = getBlogViewState();
+ bvs.setFrom(from);
+ setSelectedEntryId(null);
+ }
+
+ public List getEntries() {
+ return getBlogModel().getEntries().subList(getFrom().intValue(), getTo().intValue());
+ }
+
public String getSelectedEntryId() {
- return viewState.getSelectedEntryId(this);
+ return getBlogViewState().getSelectedEntryId();
}
+ private void setSelectedEntryId(String selectedEntryId) {
+ getBlogViewState().setSelectedEntryId(selectedEntryId);
+ }
+
+ private BlogEntry getDoesNotExistBlogEntry() {
+ return new DoesNotExistBlogEntry("JBoss Blog", "This entry doesn't exist");
+ }
+
+ private BlogEntry searchForBlogEntry(List entries, String id, int from, int to) {
+ for (int i=from; i<=to; i++) {
+ BlogEntry current = (BlogEntry) entries.get(i);
+ if (id.equals(current.getTitleAsId())) {
+ return current;
+ }
+ }
+
+ return null;
+ }
+
+ public BlogEntry getSelectedEntry() {
+ String id = getSelectedEntryId();
+ List entries = getBlogModel().getEntries();
+
+ if (id == null) {
+ return getDoesNotExistBlogEntry();
+ }
+
+ BlogEntry ret;
+
+ // First looking in the specified range.
+ ret = searchForBlogEntry(entries, id, Math.max(getFrom().intValue(), 0),
+ Math.min(getTo().intValue(), entries.size()-1));
+
+ // If unsuccessfull, looking in all entries (we may find something if
+ // after selecting the entry, new entries have been added/ remvoed).
+ if (ret == null) {
+ ret = searchForBlogEntry(entries, id, 0, entries.size()-1);
+ }
+
+ if (ret == null) {
+ return getDoesNotExistBlogEntry();
+ }
+
+ return ret;
+ }
+
// Actions
public String next() {
- return viewState.next(this);
+ setFrom(new Integer(getFrom().intValue() + getNumberOfEntriesPerPage().intValue()));
+
+ return null;
}
public String previous() {
- return viewState.previous(this);
+ setFrom(new Integer(Math.max(getFrom().intValue() - getNumberOfEntriesPerPage().intValue(), 0)));
+
+ return null;
}
- // Action listeners
+ public String back() {
+ setSelectedEntryId(null);
- public void entrySelected(ActionEvent actionEvent) throws AbortProcessingException {
- viewState.setSelectedEntryId(this, actionEvent.getComponent().getId());
+ return "back";
}
+
+ public String viewEntry() {
+ BlogEntry selected = (BlogEntry) entriesData.getRowData();
+
+ setSelectedEntryId(selected.getTitleAsId());
+
+ if (getViewEntriesOnSeparatePage().booleanValue()) {
+ return "viewentry";
+ } else {
+ return null;
+ }
+ }
}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java 2006-10-17 21:01:50 UTC (rev 13)
@@ -1,12 +1,13 @@
package org.jboss.blog.ui;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.AbortProcessingException;
+import org.jboss.blog.BlogName;
+
import java.util.Map;
import java.util.HashMap;
/**
+ * A session-scoped bean that remembers the current view state for each blog
+ * that has been viewed.
* @author Adam Warski (adamw at aster.pl)
*/
public class GlobalViewState {
@@ -17,52 +18,13 @@
blogViewStates = new HashMap();
}
- private BlogViewState getBlogViewState(CurrentView currentView) {
- BlogViewState ret = (BlogViewState) blogViewStates.get(currentView.getBlogName());
+ public BlogViewState getBlogViewState(BlogName blogName) {
+ BlogViewState ret = (BlogViewState) blogViewStates.get(blogName);
if (ret == null) {
ret = new BlogViewState();
- blogViewStates.put(currentView.getBlogName(), ret);
+ blogViewStates.put(blogName, ret);
}
return ret;
}
-
- public Integer getFrom(CurrentView currentView) {
- return getBlogViewState(currentView).getFrom();
- }
-
- public String getSelectedEntryId(CurrentView currentView) {
- return getBlogViewState(currentView).getSelectedEntryId();
- }
-
- public void setSelectedEntryId(CurrentView currentView, String selectedEntryId) {
- getBlogViewState(currentView).setSelectedEntryId(selectedEntryId);
- }
-
- private void setFrom(CurrentView currentView, Integer from) {
- BlogViewState bvs = getBlogViewState(currentView);
- bvs.setFrom(from);
- bvs.setSelectedEntryId(null);
- }
-
- public String next(CurrentView currentView) {
- setFrom(currentView, new Integer(getFrom(currentView).intValue() +
- currentView.getNumberOfEntriesPerPage().intValue()));
-
- return null;
- }
-
- public String previous(CurrentView currentView) {
- setFrom(currentView, new Integer(Math.max(
- getFrom(currentView).intValue() -
- currentView.getNumberOfEntriesPerPage().intValue(),
- 0)));
-
- return null;
- }
-
- /*private CurrentView getCurrentView() {
- return (CurrentView) FacesContext.getCurrentInstance().getApplication().getVariableResolver().
- resolveVariable(FacesContext.getCurrentInstance(), "currentView");
- }*/
}
Modified: trunk/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.xml 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.xml 2006-10-17 21:01:50 UTC (rev 13)
@@ -29,15 +29,23 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
- <!--<navigation-rule>
- <from-view-id>/views/viewblog.xhtml</from-view-id>
+ <navigation-rule>
+ <from-view-id>/views/index.xhtml</from-view-id>
<navigation-case>
<from-outcome>viewentry</from-outcome>
<to-view-id>/views/viewentry.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
- <managed-bean>
+ <navigation-rule>
+ <from-view-id>/views/viewentry.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>back</from-outcome>
+ <to-view-id>/views/index.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <!--<managed-bean>
<managed-bean-name>conServer</managed-bean-name>
<managed-bean-class>org.jboss.forge.contributor.ConServer</managed-bean-class>
<managed-bean-scope>application</managed-bean-scope>
Modified: trunk/blog-core/src/web/WEB-INF/web.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/web.xml 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/web/WEB-INF/web.xml 2006-10-17 21:01:50 UTC (rev 13)
@@ -30,6 +30,10 @@
</context-param>
<context-param>
<param-name>viewEntriesOnSeparatePage</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>viewAllEntries</param-name>
<param-value>false</param-value>
</context-param>
@@ -40,7 +44,6 @@
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-
<load-on-startup>1</load-on-startup>
</servlet>
Modified: trunk/blog-core/src/web/views/viewblog.xhtml
===================================================================
--- trunk/blog-core/src/web/views/viewblog.xhtml 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/web/views/viewblog.xhtml 2006-10-17 21:01:50 UTC (rev 13)
@@ -12,22 +12,29 @@
<h2>Entries</h2>
<ul>
- <c:forEach items="#{currentView.blogModel.entries}" var="entry"
- begin="#{currentView.from}" end="#{currentView.to}">
+ <h:dataTable value="#{currentView.entries}" var="entry" binding="#{currentView.entriesData}">
+ <h:column>
<li>
- <b>#{entry.title}</b><br />
- #{entry.description}
+ <h:form>
+ <b>
+ <h:commandLink value="#{entry.title}"
+ action="#{currentView.viewEntry}"
+ rendered="#{currentView.entriesExpandable}" />
- <h:form>
- <h:commandLink value="Click me!" id="#{entry.titleAsId}"
- actionListener="#{currentView.entrySelected}" />
+ <h:outputText value="#{entry.title}"
+ rendered="#{!currentView.entriesExpandable}" />
+ </b><br />
</h:form>
-
- <h:panelGroup rendered="#{currentView.selectedEntryId == entry.titleAsId}">
- <b>Selected!</b>
+
+ <h:panelGroup rendered="#{currentView.viewAllEntries ||
+ (currentView.selectedEntryId == entry.titleAsId)}">
+ #{entry.description}
</h:panelGroup>
+
+ <hr />
</li>
- </c:forEach>
+ </h:column>
+ </h:dataTable>
</ul>
<h2>Navigation</h2>
Added: trunk/blog-core/src/web/views/viewentry.xhtml
===================================================================
--- trunk/blog-core/src/web/views/viewentry.xhtml 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/blog-core/src/web/views/viewentry.xhtml 2006-10-17 21:01:50 UTC (rev 13)
@@ -0,0 +1,24 @@
+<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">
+<ui:composition template="userview_t.xhtml">
+ <ui:define name="main">
+ <h2>Info</h2>
+ Title: #{currentView.blogModel.title} <br />
+ Description: #{currentView.blogModel.description} <br />
+ Author: #{currentView.blogModel.author}
+
+ <h2>Entry</h2>
+
+ <b>#{currentView.selectedEntry.title}</b><br />
+ #{currentView.selectedEntry.description}
+
+ <h2>Navigation</h2>
+ <h:form>
+ <h:commandLink action="#{currentView.back}">Back</h:commandLink>
+ </h:form>
+ </ui:define>
+</ui:composition>
+</div>
\ No newline at end of file
Modified: trunk/jbossblog.ipr
===================================================================
--- trunk/jbossblog.ipr 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/jbossblog.ipr 2006-10-17 21:01:50 UTC (rev 13)
@@ -312,7 +312,9 @@
<component name="com.intellij.jsf.UserDefinedFacesConfigs">
<option name="USER_DEFINED_CONFIGS">
<value>
- <list size="0" />
+ <list size="1">
+ <item index="0" class="java.lang.String" itemvalue="blog-core/src/web/WEB-INF/faces-config.xml" />
+ </list>
</value>
</option>
</component>
@@ -332,6 +334,25 @@
<JAVADOC />
<SOURCES />
</library>
+ <library name="jsf">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/myfaces/commons-beanutils-1.7.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/myfaces/commons-codec-1.3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/myfaces/commons-collections-3.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/myfaces/commons-digester-1.6.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/myfaces/commons-el-1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/myfaces/commons-lang-2.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/myfaces/commons-logging-1.0.4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/myfaces/myfaces-api.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/myfaces/myfaces-impl.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/servlet/javax.servlet.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/servlet/javax.servlet.jsp.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jstl/jstl.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jstl/standard.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
</component>
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2006-10-12 18:34:52 UTC (rev 12)
+++ trunk/jbossblog.iws 2006-10-17 21:01:50 UTC (rev 13)
@@ -17,24 +17,19 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/BlogTools.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/BlogTools.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml" afterPath="$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogEntry.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogEntry.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogService.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name/AbstractBlogNameService.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/DoesNotExistBlogEntry.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/build.xml" afterPath="$PROJECT_DIR$/blog-core/build.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/ViewState.java" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CurrentView.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CurrentView.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogViewState.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/viewentry.xhtml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/blog-core.iml" afterPath="$PROJECT_DIR$/blog-core/blog-core.iml" />
</list>
</component>
@@ -160,19 +155,31 @@
</component>
<component name="FileEditorManager">
<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">
+ <file leaf-file-name="web.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="57" selection-start="293" selection-end="293" vertical-scroll-proportion="0.18867925">
+ <state line="30" column="38" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.6163522">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="viewentry.xhtml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/viewentry.xhtml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="13" column="29" selection-start="515" selection-end="515" vertical-scroll-proportion="0.31967214">
+ <folding />
+ </state>
+ </provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="CurrentView.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CurrentView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="100" column="26" selection-start="2805" selection-end="2805" vertical-scroll-proportion="0.8584906">
+ <state line="55" column="55" selection-start="1478" selection-end="1478" vertical-scroll-proportion="0.5283019">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -180,10 +187,21 @@
</provider>
</entry>
</file>
+ <file leaf-file-name="GlobalViewState.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="9" column="24" selection-start="215" selection-end="215" vertical-scroll-proportion="0.21226415">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="viewblog.xhtml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="44" column="23" selection-start="1686" selection-end="1686" vertical-scroll-proportion="1.0819672">
+ <state line="24" column="60" selection-start="1048" selection-end="1048" vertical-scroll-proportion="0.59016395">
<folding />
</state>
</provider>
@@ -192,17 +210,6 @@
</provider>
</entry>
</file>
- <file leaf-file-name="GlobalViewState.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="38" column="74" selection-start="1180" selection-end="1180" vertical-scroll-proportion="0.46215782">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -334,10 +341,6 @@
<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/WEB-INF" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -360,24 +363,10 @@
<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>
- <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/web/views" />
<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>
<PATH>
<PATH_ELEMENT>
@@ -396,14 +385,6 @@
<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/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -430,10 +411,6 @@
<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/ui" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -461,7 +438,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/tools" />
+ <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>
@@ -525,108 +502,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/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/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/name" />
- <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/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/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -649,36 +524,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/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/etc" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -722,7 +567,7 @@
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure ProjectPane="false" Scope="false" PackagesPane="false" Favorites="false" />
+ <showStructure Favorites="false" Scope="false" PackagesPane="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -730,9 +575,11 @@
</component>
<component name="PropertiesComponent">
<property name="MemberChooser.copyJavadoc" value="false" />
+ <property name="TEMP_MODULE_EXPLODED_DIR_FOR_blog-core" value="/tmp/webExplodedDir50075tmp" />
<property name="GoToClass.includeLibraries" value="false" />
<property name="MemberChooser.showClasses" value="true" />
<property name="MemberChooser.sorted" value="false" />
+ <property name="Web Module Deployment Descriptor Default Version" value="2.3" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
</component>
@@ -747,6 +594,23 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager">
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_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="" />
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -778,23 +642,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_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="" />
- </configuration>
</component>
<component name="ScopeViewComponent">
<subPane subId="Project">
@@ -876,7 +723,7 @@
<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.23997532" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21714991" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" order="1" />
<window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24984577" order="7" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2279496" order="9" />
@@ -884,7 +731,7 @@
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="4" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="10" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.273905" order="1" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24491055" order="1" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298969" order="11" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24984577" order="2" />
@@ -979,7 +826,7 @@
<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="blog-core" />
</component>
@@ -987,108 +834,102 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogEntry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="0" selection-start="37" selection-end="37" vertical-scroll-proportion="-0.16504854">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="12" column="13" selection-start="255" selection-end="255" vertical-scroll-proportion="0.017814728">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/DoesNotExistBlogEntry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="30" selection-start="937" selection-end="1487" vertical-scroll-proportion="0.8955224">
+ <state line="7" column="13" selection-start="116" selection-end="116" vertical-scroll-proportion="0.1699029">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
+ <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="13" selection-start="253" selection-end="253" vertical-scroll-proportion="0.2669903">
+ <state line="4" column="28" selection-start="171" selection-end="171" vertical-scroll-proportion="0.073529415">
<folding />
</state>
</provider>
+ <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
+ <entry file="jar://$APPLICATION_HOME_DIR$/lib/resources.jar!/standardSchemas/facelets.xsd">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="71" selection-start="362" selection-end="406" vertical-scroll-proportion="0.24271844">
+ <state line="84" column="2" selection-start="2315" selection-end="2315" vertical-scroll-proportion="0.76840854">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogViewState.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="46" selection-start="1267" selection-end="1267" vertical-scroll-proportion="0.89805824">
+ <state line="8" column="13" selection-start="217" selection-end="217" vertical-scroll-proportion="0.18867925">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="44" selection-start="343" selection-end="343" vertical-scroll-proportion="0.1699029">
+ <state line="19" column="59" selection-start="1023" selection-end="1023" vertical-scroll-proportion="0.46116504">
<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/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="57" selection-start="293" selection-end="293" vertical-scroll-proportion="0.18867925">
+ <state line="7" column="22" selection-start="163" selection-end="163" vertical-scroll-proportion="-0.275">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/etc/META-INF/jboss-service.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="89" selection-start="624" selection-end="624" vertical-scroll-proportion="0.3482587">
+ <state line="41" column="39" selection-start="1268" selection-end="1268" vertical-scroll-proportion="0.84951454">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/BlogTools.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="114" column="19" selection-start="4074" selection-end="4074" vertical-scroll-proportion="0.80582523">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="20" column="51" selection-start="657" selection-end="657" vertical-scroll-proportion="0.4854369">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogEntry.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="19" selection-start="1844" selection-end="1844" vertical-scroll-proportion="0.70873785">
+ <state line="33" column="16" selection-start="1249" selection-end="1249" vertical-scroll-proportion="0.80097085">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogModel.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="0" selection-start="31" selection-end="31" vertical-scroll-proportion="0.04368932">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="24" column="60" selection-start="1048" selection-end="1048" vertical-scroll-proportion="0.59016395">
+ <folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogViewState.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="29" selection-start="26" selection-end="26" vertical-scroll-proportion="0.0">
+ <state line="30" column="38" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.6163522">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/viewentry.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="74" selection-start="1180" selection-end="1180" vertical-scroll-proportion="0.46215782">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="44" column="23" selection-start="1686" selection-end="1686" vertical-scroll-proportion="1.0819672">
+ <state line="13" column="29" selection-start="515" selection-end="515" vertical-scroll-proportion="0.31967214">
<folding />
</state>
</provider>
@@ -1096,9 +937,18 @@
<state />
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/GlobalViewState.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="9" column="24" selection-start="215" selection-end="215" vertical-scroll-proportion="0.21226415">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/CurrentView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="100" column="26" selection-start="2805" selection-end="2805" vertical-scroll-proportion="0.8584906">
+ <state line="55" column="55" selection-start="1478" selection-end="1478" vertical-scroll-proportion="0.5283019">
<folding>
<element signature="imports" expanded="true" />
</folding>
Added: trunk/lib/myfaces/commons-beanutils-1.7.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/myfaces/commons-beanutils-1.7.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/myfaces/commons-codec-1.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/myfaces/commons-codec-1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/myfaces/commons-collections-3.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/myfaces/commons-collections-3.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/myfaces/commons-digester-1.6.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/myfaces/commons-digester-1.6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/myfaces/commons-el-1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/myfaces/commons-el-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/myfaces/commons-lang-2.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/myfaces/commons-lang-2.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/myfaces/commons-logging-1.0.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/myfaces/commons-logging-1.0.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-cvs-commits
mailing list