[jboss-cvs] JBossBlog SVN: r9 - in trunk: . blog-core blog-core/src/etc blog-core/src/etc/META-INF blog-core/src/java/org/jboss/blog blog-core/src/java/org/jboss/blog/service blog-core/src/java/org/jboss/blog/service/model blog-core/src/java/org/jboss/blog/service/name blog-core/src/java/org/jboss/blog/service/permissions 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
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 6 19:00:14 EDT 2006
Author: adamw
Date: 2006-10-06 19:00:04 -0400 (Fri, 06 Oct 2006)
New Revision: 9
Added:
trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java
trunk/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java
trunk/blog-core/src/java/org/jboss/blog/ui/
trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
Removed:
trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java
Modified:
trunk/blog-core/build.xml
trunk/blog-core/src/etc/META-INF/jboss-service.xml
trunk/blog-core/src/etc/Messages.properties
trunk/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java
trunk/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java
trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java
trunk/blog-core/src/java/org/jboss/blog/service/permissions/BasicBlogPermissionsService.java
trunk/blog-core/src/java/org/jboss/blog/tools/BlogTools.java
trunk/blog-core/src/web/WEB-INF/faces-config.xml
trunk/blog-core/src/web/WEB-INF/portlet-instances.xml
trunk/blog-core/src/web/WEB-INF/portlet.xml
trunk/blog-core/src/web/views/userview_t.xhtml
trunk/blog-core/src/web/views/viewblog.xhtml
trunk/jbossblog.iws
Log:
Blog viewing
Modified: trunk/blog-core/build.xml
===================================================================
--- trunk/blog-core/build.xml 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/build.xml 2006-10-06 23:00:04 UTC (rev 9)
@@ -57,7 +57,7 @@
</target>
- <target name="build" depends="init">
+ <target name="build" depends="init,clean">
<mkdir dir="${build}" />
<!-- Compiling the source -->
<javac srcdir="${src.java}" destdir="${build}" target="1.4" source="1.4">
@@ -89,8 +89,6 @@
<!-- Copying dependency jars -->
<copy todir="${dist.lib.dir}"><fileset refid="rome.jars"/></copy>
- <copy todir="${dist.lib.dir}"><fileset refid="facelets.jars"/></copy>
- <copy todir="${dist.lib.dir}"><fileset refid="jstl.jars"/></copy>
</target>
<target name="deploy" depends="dist,undeploy">
Modified: trunk/blog-core/src/etc/META-INF/jboss-service.xml
===================================================================
--- trunk/blog-core/src/etc/META-INF/jboss-service.xml 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/etc/META-INF/jboss-service.xml 2006-10-06 23:00:04 UTC (rev 9)
@@ -28,9 +28,7 @@
<mbean
code="org.jboss.blog.service.permissions.BasicBlogPermissionsService"
name="blog:service=Permissions"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
+ xmbean-dd="org/jboss/blog/service/permissions/BasicBlogPermissionsService.xml">
<attribute name="AllowedToView">*</attribute>
<attribute name="AllowedToComment">Administrator</attribute>
<attribute name="AllowedToAdd">Administrator</attribute>
@@ -38,13 +36,11 @@
</mbean>
<mbean
- code="org.jboss.blog.service.BlogService"
+ code="org.jboss.blog.service.BlogServiceImpl"
name="blog:service=Main"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
- <xmbean/>
+ xmbean-dd="org/jboss/blog/service/BlogServiceImpl.xml">
<depends
- optional-attribute-name="NameService"
+ optional-attribute-name="NameService"
proxy-type="attribute">blog:service=Name</depends>
<depends
optional-attribute-name="ModelService"
Modified: trunk/blog-core/src/etc/Messages.properties
===================================================================
--- trunk/blog-core/src/etc/Messages.properties 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/etc/Messages.properties 2006-10-06 23:00:04 UTC (rev 9)
@@ -0,0 +1 @@
+hello_world = Hello World!
\ No newline at end of file
Deleted: trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java 2006-10-06 23:00:04 UTC (rev 9)
@@ -1,66 +0,0 @@
-package org.jboss.blog.service;
-
-import org.jboss.blog.service.name.BlogNameService;
-import org.jboss.blog.service.model.BlogModelService;
-import org.jboss.blog.service.permissions.BlogPermissionsService;
-import org.jboss.system.ServiceMBeanSupport;
-
-/**
- * A central point tieing all other blog servcies and providing a way to access
- * them.
- * @author Adam Warski (adamw at aster.pl)
- *
- * @jmx.mbean
- * @jboss.xmbean
- */
-public class BlogService extends ServiceMBeanSupport {
- public BlogService() {
-
- }
-
- private BlogNameService nameService;
- private BlogModelService modelService;
- private BlogPermissionsService permissionsService;
-
- /**
- * @jmx.managed-attribute
- */
- public BlogPermissionsService getPermissionsService() {
- return permissionsService;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setPermissionsService(BlogPermissionsService permissionsService) {
- this.permissionsService = permissionsService;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public BlogNameService getNameService() {
- return nameService;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setNameService(BlogNameService nameService) {
- this.nameService = nameService;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public BlogModelService getModelService() {
- return modelService;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setModelService(BlogModelService modelService) {
- this.modelService = modelService;
- }
-}
Added: trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java 2006-10-06 23:00:04 UTC (rev 9)
@@ -0,0 +1,21 @@
+package org.jboss.blog.service;
+
+import org.jboss.blog.service.permissions.BlogPermissionsService;
+import org.jboss.blog.service.name.BlogNameService;
+import org.jboss.blog.service.model.BlogModelService;
+
+/**
+ * A central point tieing all other blog servcies and providing a way to access
+ * them.
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public interface BlogService {
+ public BlogPermissionsService getPermissionsService();
+ public void setPermissionsService(BlogPermissionsService permissionsService);
+
+ public BlogNameService getNameService();
+ public void setNameService(BlogNameService nameService);
+
+ public BlogModelService getModelService();
+ public void setModelService(BlogModelService modelService);
+}
Copied: trunk/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java (from rev 6, trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java)
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/BlogService.java 2006-10-06 16:21:00 UTC (rev 6)
+++ trunk/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java 2006-10-06 23:00:04 UTC (rev 9)
@@ -0,0 +1,64 @@
+package org.jboss.blog.service;
+
+import org.jboss.blog.service.name.BlogNameService;
+import org.jboss.blog.service.model.BlogModelService;
+import org.jboss.blog.service.permissions.BlogPermissionsService;
+import org.jboss.system.ServiceMBeanSupport;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ *
+ * @jmx.mbean
+ * @jboss.xmbean
+ */
+public class BlogServiceImpl extends ServiceMBeanSupport implements BlogService {
+ public BlogServiceImpl() {
+
+ }
+
+ private BlogNameService nameService;
+ private BlogModelService modelService;
+ private BlogPermissionsService permissionsService;
+
+ /**
+ * @jmx.managed-attribute
+ */
+ public BlogPermissionsService getPermissionsService() {
+ return permissionsService;
+ }
+
+ /**
+ * @jmx.managed-attribute
+ */
+ public void setPermissionsService(BlogPermissionsService permissionsService) {
+ this.permissionsService = permissionsService;
+ }
+
+ /**
+ * @jmx.managed-attribute
+ */
+ public BlogNameService getNameService() {
+ return nameService;
+ }
+
+ /**
+ * @jmx.managed-attribute
+ */
+ public void setNameService(BlogNameService nameService) {
+ this.nameService = nameService;
+ }
+
+ /**
+ * @jmx.managed-attribute
+ */
+ public BlogModelService getModelService() {
+ return modelService;
+ }
+
+ /**
+ * @jmx.managed-attribute
+ */
+ public void setModelService(BlogModelService modelService) {
+ this.modelService = modelService;
+ }
+}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java 2006-10-06 23:00:04 UTC (rev 9)
@@ -20,6 +20,7 @@
/**
* @jmx.managed-operation
+ * @jmx.managed-parameter type="org.jboss.blog.BlogName"
*/
public BlogModel getBlogModel(BlogName name) throws BlogModelDoesNotExistException {
return delegateModelService.getBlogModel(name);
Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java 2006-10-06 23:00:04 UTC (rev 9)
@@ -33,6 +33,7 @@
/**
* @jmx.managed-operation
+ * @jmx.managed-parameter type="org.jboss.blog.BlogName"
*/
public BlogModel getBlogModel(BlogName name) throws BlogModelDoesNotExistException {
if (name.getId() == null) {
Modified: trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java 2006-10-06 23:00:04 UTC (rev 9)
@@ -49,15 +49,19 @@
/**
* @jmx.managed-operation
+ * @jmx.managed-parameter type="java.lang.Object"
*/
public BlogName getBlogName(Object request) {
+ System.out.println("Getting blog name");
if (!(request instanceof PortletRequest)) {
throw new IllegalArgumentException(this.getClass().getName() +
" accepts only PortletRequest parameters, not of class: " +
(request == null ? "NULL" : request.getClass().getName()));
}
-
+
PortletRequest req = (PortletRequest) request;
+ System.out.println("From preference: " + idPreferenceName + " = " +
+ getPreference(req, idPreferenceName));
return new BlogName(getPreference(req, idPreferenceName),
getPreference(req, categoryPreferenceName));
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/permissions/BasicBlogPermissionsService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/permissions/BasicBlogPermissionsService.java 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/java/org/jboss/blog/service/permissions/BasicBlogPermissionsService.java 2006-10-06 23:00:04 UTC (rev 9)
@@ -21,6 +21,8 @@
/**
* @jmx.managed-operation
+ * @jmx.managed-parameter type="org.jboss.blog.BlogName"
+ * @jmx.managed-parameter type="java.lang.String"
*/
public boolean canView(BlogName blogName, String userName) {
return allowedToViewSet.contains(userName);
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-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/BlogTools.java 2006-10-06 23:00:04 UTC (rev 9)
@@ -1,5 +1,9 @@
package org.jboss.blog.tools;
+import org.jboss.blog.service.BlogService;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.MBeanServerLocator;
+
/**
* Various common and usefull functions.
* @author Adam Warski (adamw at aster.pl)
@@ -14,4 +18,29 @@
public static boolean isEmpty(String s) {
return (s == null) || s.equals("");
}
+
+ private static BlogService instance;
+
+ /**
+ *
+ * @return An instance of the blog service.
+ */
+ public static BlogService getBlogService() {
+ try {
+ if (instance == null) {
+ synchronized (BlogTools.class) {
+ if (instance == null) {
+ instance = (BlogService) MBeanProxyExt.create(
+ BlogService.class,
+ "blog:service=Main",
+ MBeanServerLocator.locate());
+ }
+ }
+ }
+
+ return instance;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
}
Added: trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2006-10-06 23:00:04 UTC (rev 9)
@@ -0,0 +1,38 @@
+package org.jboss.blog.ui;
+
+import org.jboss.blog.model.BlogModel;
+import org.jboss.blog.model.BlogModelDoesNotExistException;
+import org.jboss.blog.BlogName;
+import org.jboss.blog.tools.BlogTools;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * @author Adam Warski (adamw at aster.pl)
+ */
+public class BlogView {
+ private BlogName blogName;
+ private BlogModel blogModel;
+
+ public BlogName getBlogName() {
+ if (blogName == null) {
+ blogName = BlogTools.getBlogService().getNameService().getBlogName(
+ FacesContext.getCurrentInstance().getExternalContext().getRequest());
+ }
+
+ return blogName;
+ }
+
+ public BlogModel getBlogModel() {
+ if (blogModel == null) {
+ try {
+ blogModel = BlogTools.getBlogService().getModelService().getBlogModel(
+ getBlogName());
+ } catch (BlogModelDoesNotExistException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ return blogModel;
+ }
+}
Modified: trunk/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.xml 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.xml 2006-10-06 23:00:04 UTC (rev 9)
@@ -12,6 +12,12 @@
</locale-config>
</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-bean>
+
<!--<navigation-rule>
<from-view-id>/repo-access/default/contributor/contributor.jsp</from-view-id>
<navigation-case>
Modified: trunk/blog-core/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/portlet-instances.xml 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/web/WEB-INF/portlet-instances.xml 2006-10-06 23:00:04 UTC (rev 9)
@@ -1,10 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployments>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>BlogPortletInstance</instance-id>
- <portlet-ref>BlogPortlet</portlet-ref>
- </instance>
- </deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <instance>
+ <instance-id>BlogPortletInstance</instance-id>
+ <portlet-ref>BlogPortlet</portlet-ref>
+ <preferences>
+ <preference>
+ <name>blogId</name>
+ <value>http://finance.yahoo.com/rss/headline?s=rhat</value>
+ </preference>
+ <preference>
+ <name>blogCategory</name>
+ <value></value>
+ </preference>
+ </preferences>
+ </instance>
+ </deployment>
</deployments>
\ No newline at end of file
Modified: trunk/blog-core/src/web/WEB-INF/portlet.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/portlet.xml 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/web/WEB-INF/portlet.xml 2006-10-06 23:00:04 UTC (rev 9)
@@ -18,5 +18,15 @@
<portlet-info>
<title>Blog portlet</title>
</portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>blogId</name>
+ <value>http://labs.jboss.org/feeds/shotoku/rss2</value>
+ </preference>
+ <preference>
+ <name>blogCategory</name>
+ <value></value>
+ </preference>
+ </portlet-preferences>
</portlet>
</portlet-app>
Modified: trunk/blog-core/src/web/views/userview_t.xhtml
===================================================================
--- trunk/blog-core/src/web/views/userview_t.xhtml 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/web/views/userview_t.xhtml 2006-10-06 23:00:04 UTC (rev 9)
@@ -3,7 +3,7 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <link rel='stylesheet' type='text/css' href='/portal-forums/subSilver/styles.css' media='screen'/>
+ <!--<link rel='stylesheet' type='text/css' href='/???.css' media='screen'/>-->
<f:loadBundle basename="Messages" var="messages"/>
Modified: trunk/blog-core/src/web/views/viewblog.xhtml
===================================================================
--- trunk/blog-core/src/web/views/viewblog.xhtml 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/blog-core/src/web/views/viewblog.xhtml 2006-10-06 23:00:04 UTC (rev 9)
@@ -5,7 +5,20 @@
xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="userview_t.xhtml">
<ui:define name="main">
- Hello world! (main)
+ <h2>Info</h2>
+ Title: #{blogView.blogModel.title} <br />
+ Description: #{blogView.blogModel.description} <br />
+ Author: #{blogView.blogModel.author}
+
+ <h2>Entries</h2>
+ <ul>
+ <ui:repeat value="#{blogView.blogModel.entries}" var="entry">
+ <li>
+ <b>#{entry.title}</b><br />
+ #{entry.description}
+ </li>
+ </ui:repeat>
+ </ul>
</ui:define>
</ui:composition>
</div>
\ No newline at end of file
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2006-10-06 18:00:28 UTC (rev 8)
+++ trunk/jbossblog.iws 2006-10-06 23:00:04 UTC (rev 9)
@@ -17,12 +17,23 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/index.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/index.xhtml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/userview_t.xhtml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/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/service/permissions/BasicBlogPermissionsService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/BasicBlogPermissionsService.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="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/etc/Messages.properties" afterPath="$PROJECT_DIR$/blog-core/src/etc/Messages.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/build.xml" afterPath="$PROJECT_DIR$/blog-core/build.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java" />
+ <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/web/WEB-INF/faces-config.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/blog-core.iml" afterPath="$PROJECT_DIR$/blog-core/blog-core.iml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java" />
+ <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/BlogView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/CachingBlogModelService.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/userview_t.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/userview_t.xhtml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui" />
+ <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" />
@@ -147,67 +158,74 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="index.xhtml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/index.xhtml">
+ <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="2" column="19" selection-start="112" selection-end="112" vertical-scroll-proportion="0.04918033">
- <folding />
+ <state line="17" column="31" selection-start="445" selection-end="445" vertical-scroll-proportion="0.41262135">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
</file>
- <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
+ <file leaf-file-name="BlogModel.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogModel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="41" selection-start="581" selection-end="581" vertical-scroll-proportion="0.30660376">
+ <state line="11" column="13" selection-start="277" selection-end="277" vertical-scroll-proportion="-0.2184466">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="userview_t.xhtml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/userview_t.xhtml">
+ <file leaf-file-name="BlogServiceImpl.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="3" column="32" selection-start="171" selection-end="171" vertical-scroll-proportion="0.075630255">
+ <state line="62" column="5" selection-start="1502" selection-end="1502" vertical-scroll-proportion="1.4320388">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <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">
+ <file leaf-file-name="PortletPreferencesBlogNameService.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="3" column="41" selection-start="180" selection-end="180" vertical-scroll-proportion="0.07377049">
+ <state line="46" column="47" selection-start="1227" selection-end="1227" vertical-scroll-proportion="0.5145631">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
+ </entry>
+ </file>
+ <file leaf-file-name="BlogService.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="19" column="63" selection-start="737" selection-end="737" vertical-scroll-proportion="0.46116504">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </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="16" column="1" selection-start="546" selection-end="546" vertical-scroll-proportion="0.3773585">
+ <state line="15" column="35" selection-start="487" selection-end="487" vertical-scroll-proportion="0.36407766">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="blog-object.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog-object.xml">
+ <file leaf-file-name="viewblog.xhtml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="3" column="22" selection-start="92" selection-end="92" vertical-scroll-proportion="0.070754714">
+ <state line="19" column="44" selection-start="727" selection-end="727" vertical-scroll-proportion="0.4814189">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
</file>
</leaf>
@@ -450,7 +468,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service" />
+ <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>
@@ -480,13 +498,39 @@
<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="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions" />
+ <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>
<PATH>
<PATH_ELEMENT>
@@ -518,7 +562,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name" />
+ <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>
@@ -552,7 +596,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model" />
+ <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>
@@ -582,9 +626,13 @@
<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/rome" />
+ <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>
@@ -664,6 +712,28 @@
<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/dist" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/dist/jboss-blog.sar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -820,7 +890,7 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="25" width="1680" height="1000" extended-state="0" />
- <editor active="false" />
+ <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="8" />
@@ -829,7 +899,7 @@
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2535472" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2279496" order="8" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2279496" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
<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="8" />
@@ -939,115 +1009,111 @@
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/BasicBlogPermissionsService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="50" selection-start="300" selection-end="300" vertical-scroll-proportion="0.12820514">
+ <state line="24" column="52" selection-start="646" selection-end="646" vertical-scroll-proportion="0.46153846">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/BlogModelService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/BlogTools.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="20" column="21" selection-start="741" selection-end="741" vertical-scroll-proportion="0.3276699">
- <folding />
+ <state line="1" column="0" selection-start="30" selection-end="30" vertical-scroll-proportion="-0.23786408">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/RomeParsingBlogModelService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="43" selection-start="1619" selection-end="1619" vertical-scroll-proportion="0.5747837">
+ <state line="46" column="47" selection-start="1227" selection-end="1227" vertical-scroll-proportion="0.5145631">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.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="63" column="0" selection-start="1831" selection-end="1877" vertical-scroll-proportion="0.3776722">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="61" column="7" selection-start="1447" selection-end="1447" vertical-scroll-proportion="0.8052257">
+ <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/etc/META-INF/jboss-service.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="41" selection-start="1297" selection-end="1297" vertical-scroll-proportion="0.4311164">
+ <state line="9" column="72" selection-start="463" selection-end="463" vertical-scroll-proportion="0.2184466">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/name/BlogNameService.java">
+ <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="51" selection-start="609" selection-end="609" vertical-scroll-proportion="0.2672209">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="54" column="61" selection-start="2448" selection-end="2448" vertical-scroll-proportion="0.39320388">
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="8" column="40" selection-start="294" selection-end="294" vertical-scroll-proportion="0.19417475">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="11" column="67" selection-start="638" selection-end="638" vertical-scroll-proportion="0.27363184">
<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/ui/BlogView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="16" column="1" selection-start="546" selection-end="546" vertical-scroll-proportion="0.3773585">
- <folding />
+ <state line="17" column="31" selection-start="445" selection-end="445" vertical-scroll-proportion="0.41262135">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog-object.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="3" column="22" selection-start="92" selection-end="92" vertical-scroll-proportion="0.070754714">
+ <state line="62" column="5" selection-start="1502" selection-end="1502" vertical-scroll-proportion="1.4320388">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/model/BlogModel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="41" selection-start="581" selection-end="581" vertical-scroll-proportion="0.30660376">
+ <state line="11" column="13" selection-start="277" selection-end="277" vertical-scroll-proportion="-0.2184466">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/userview_t.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/BlogService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="3" column="32" selection-start="171" selection-end="171" vertical-scroll-proportion="0.075630255">
+ <state line="19" column="63" selection-start="737" selection-end="737" vertical-scroll-proportion="0.46116504">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="15" column="35" selection-start="487" selection-end="487" vertical-scroll-proportion="0.36407766">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml">
+ <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="3" column="41" selection-start="180" selection-end="180" vertical-scroll-proportion="0.07377049">
+ <state line="10" column="13" selection-start="215" selection-end="215" vertical-scroll-proportion="0.19417475">
<folding />
</state>
</provider>
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/index.xhtml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/viewblog.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="19" selection-start="112" selection-end="112" vertical-scroll-proportion="0.04918033">
+ <state line="19" column="44" selection-start="727" selection-end="727" vertical-scroll-proportion="0.4814189">
<folding />
</state>
</provider>
More information about the jboss-cvs-commits
mailing list