[jboss-cvs] JBossBlog SVN: r103 - in trunk: blog-common/src/java/org/jboss/blog/model and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 25 18:16:38 EDT 2007
Author: adamw
Date: 2007-03-25 18:16:37 -0400 (Sun, 25 Mar 2007)
New Revision: 103
Added:
trunk/blog-common/src/java/org/jboss/blog/model/BlogPostWithIndex.java
trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java
trunk/blog-core/src/web/WEB-INF/tags/
trunk/blog-core/src/web/WEB-INF/tags/post_link.xhtml
trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogPostWithIndex.java
Modified:
trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java
trunk/blog-common/src/java/org/jboss/blog/model/BlogModel.java
trunk/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java
trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
trunk/blog-core/src/web/WEB-INF/blog-object.xml
trunk/blog-core/src/web/WEB-INF/blog.taglib.xml
trunk/blog-core/src/web/WEB-INF/faces-config.xml
trunk/blog-core/src/web/views/blog_view.xhtml
trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java
trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
trunk/jbossblog.iws
Log:
Post id as a GET parameter
Modified: trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java 2007-03-25 22:16:37 UTC (rev 103)
@@ -8,25 +8,16 @@
* @author Adam Warski (adamw at aster.pl)
*/
public abstract class AbstractBlogModel extends AbstractBlogItem implements BlogModel {
- public BlogPost getPostByGuid(String guid)
+ public BlogPostWithIndex getPostByTitleAsId(String titleAsId)
throws BlogPostDoesNotExistException {
+ int index = 0;
for (Iterator iter = getPosts().iterator(); iter.hasNext();) {
BlogPost post = (BlogPost) iter.next();
- if (post.getGuid().equals(guid)) {
- return post;
- }
- }
-
- throw new BlogPostDoesNotExistException(guid);
- }
-
- public BlogPost getPostByTitleAsId(String titleAsId)
- throws BlogPostDoesNotExistException {
- for (Iterator iter = getPosts().iterator(); iter.hasNext();) {
- BlogPost post = (BlogPost) iter.next();
if (post.getTitleAsId().equals(titleAsId)) {
- return post;
+ return new BlogPostWithIndex(post, index);
}
+
+ index++;
}
throw new BlogPostDoesNotExistException(titleAsId);
Modified: trunk/blog-common/src/java/org/jboss/blog/model/BlogModel.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/BlogModel.java 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-common/src/java/org/jboss/blog/model/BlogModel.java 2007-03-25 22:16:37 UTC (rev 103)
@@ -35,6 +35,5 @@
*/
public Set getCategories();
- public BlogPost getPostByGuid(String guid) throws BlogPostDoesNotExistException;
- public BlogPost getPostByTitleAsId(String titleAsId) throws BlogPostDoesNotExistException;
+ public BlogPostWithIndex getPostByTitleAsId(String titleAsId) throws BlogPostDoesNotExistException;
}
Added: trunk/blog-common/src/java/org/jboss/blog/model/BlogPostWithIndex.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/BlogPostWithIndex.java (rev 0)
+++ trunk/blog-common/src/java/org/jboss/blog/model/BlogPostWithIndex.java 2007-03-25 22:16:37 UTC (rev 103)
@@ -0,0 +1,22 @@
+package org.jboss.blog.model;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public class BlogPostWithIndex {
+ private BlogPost post;
+ private int index;
+
+ public BlogPostWithIndex(BlogPost post, int index) {
+ this.post = post;
+ this.index = index;
+ }
+
+ public BlogPost getPost() {
+ return post;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+}
Modified: trunk/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java 2007-03-25 22:16:37 UTC (rev 103)
@@ -1,24 +1,128 @@
package org.jboss.blog.portlet;
-import org.apache.myfaces.portlet.MyFacesGenericPortlet;
+import org.jboss.blog.tools.UITools;
+import org.jboss.blog.tools.BasicTools;
-import javax.portlet.PortletException;
-import javax.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
+import javax.portlet.*;
+import javax.faces.context.FacesContext;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Iterator;
/**
* @author Adam Warski (adamw at aster.pl)
*/
-public class BlogFacesPortlet extends MyFacesGenericPortlet {
+public class BlogFacesPortlet extends MyFacesGenericPortletExt {
+ public String getViewIdParameterName() {
+ return "view";
+ }
+
+ public String translateToViewId(RenderRequest request, String param) {
+ if (param == null) {
+ if (request.getParameter(UITools.POST_ID_PARAM_NAME) != null) {
+ FacesContext fc = (FacesContext) request.getPortletSession().getAttribute(MyFacesGenericPortletExt.CURRENT_FACES_CONTEXT);
+ if (fc == null) {
+ return null;
+ }
+
+ // Checking where to display the selected post.
+ Boolean viewOnSeparatePage = BasicTools.getBlogService().getConfigurationService().
+ getViewPostsOnSeparatePage(fc.getExternalContext().getRequest());
+
+ if ((viewOnSeparatePage != null) && (viewOnSeparatePage.booleanValue())) {
+ param = UITools.POST_VIEW;
+ } else {
+ param = UITools.BLOG_VIEW;
+ }
+ } else {
+ param = UITools.BLOG_VIEW;
+ }
+ }
+
+ return "/views/" + param + ".xhtml";
+ }
+
+ public String translateToParam(String viewId) {
+ String ret = viewId;
+
+ if (ret == null) {
+ return ret;
+ }
+
+ if (ret.length() > 7) {
+ ret = ret.substring(7);
+
+ if (ret.length() > 6) {
+ ret = ret.substring(0, ret.length()-6);
+ }
+ }
+
+ return ret;
+ }
+
protected void facesRender(RenderRequest request, RenderResponse response)
throws PortletException, java.io.IOException {
- if (sessionTimedOut(request) || request.getPortletSession().
+ /*if (sessionTimedOut(request) || request.getPortletSession().
getAttribute(CURRENT_FACES_CONTEXT) == null) {
setPortletRequestFlag(request);
nonFacesRequest(request, response);
return;
- }
+ }*/
super.facesRender(request, response);
}
+
+ private String printValue(Object o) {
+ if (o instanceof String[]) {
+ String[] a = (String[]) o;
+ String result = "[";
+ if (a.length > 0) {
+ result += a[0]; // start with the first element
+ for (int i=1; i<a.length; i++) {
+ result = result + ", " + a[i];
+ }
+ }
+
+ return result + "]";
+ } else {
+ return o.toString();
+ }
+ }
+
+ private void printMap(String s, Map m) {
+ System.out.println(s + " parameters:");
+ for (Iterator iter = m.keySet().iterator(); iter.hasNext();) {
+ Object key = iter.next();
+ System.out.println(" " + key + " = " + printValue(m.get(key)));
+ }
+ System.out.println("---");
+ System.out.println(" ");
+ }
+
+ protected void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException {
+ printMap("VIEW", request.getParameterMap());
+ super.doView(request, response);
+ }
+
+ private static String[] copyParams = { UITools.POST_ID_PARAM_NAME };
+
+ protected String[] getCopyParams() {
+ return copyParams;
+ }
+
+ public void processAction(ActionRequest request, ActionResponse response) throws PortletException, IOException {
+ printMap("ACTION", request.getParameterMap());
+
+ super.processAction(request, response);
+ }
+
+ protected void doEdit(RenderRequest request, RenderResponse response) throws PortletException, IOException {
+ printMap("EDIT", request.getParameterMap());
+ super.doEdit(request, response);
+ }
+
+ protected void doHelp(RenderRequest request, RenderResponse response) throws PortletException, IOException {
+ printMap("HELP", request.getParameterMap());
+ super.doHelp(request, response);
+ }
}
Added: trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java (rev 0)
+++ trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java 2007-03-25 22:16:37 UTC (rev 103)
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.blog.portlet;
+
+import java.io.IOException;
+
+import javax.faces.FactoryFinder;
+import javax.faces.application.ApplicationFactory;
+import javax.faces.application.ViewHandler;
+import javax.faces.context.FacesContext;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.context.servlet.ServletFacesContextImpl;
+import org.apache.myfaces.portlet.MyFacesGenericPortlet;
+
+/**
+ * This portlet extends the MyFacesGenericPortlet with the possibility to handle
+ * user-friendly URLs.
+ *
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ * @author Stan Silvert (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public abstract class MyFacesGenericPortletExt extends MyFacesGenericPortlet {
+ private static final Log log = LogFactory.getLog(MyFacesGenericPortletExt.class);
+
+ /**
+ * Creates a new instance of MyFacesPortlet
+ */
+ public MyFacesGenericPortletExt() {
+ }
+
+ protected abstract String getViewIdParameterName();
+ protected abstract String translateToViewId(RenderRequest request, String param);
+ protected abstract String translateToParam(String viewId);
+
+ private void copyParams(ActionRequest request, ActionResponse response, String[] params) {
+ String p;
+ for (int i=0; i<params.length; i++) {
+ p = request.getParameter(params[i]);
+ if (p != null) {
+ response.setRenderParameter(params[i], p);
+ }
+ }
+ }
+
+ protected abstract String[] getCopyParams();
+
+ /**
+ * Called by the portlet container to allow the portlet to process an action request.
+ */
+ public void processAction(ActionRequest request, ActionResponse response)
+ throws PortletException, IOException
+ {
+ if (log.isTraceEnabled()) log.trace("called processAction");
+
+ if (sessionTimedOut(request)) return;
+
+ copyParams(request, response, getCopyParams());
+
+ setPortletRequestFlag(request);
+
+ FacesContext facesContext = facesContext(request, response);
+
+ try
+ {
+ lifecycle.execute(facesContext);
+
+ if (!facesContext.getResponseComplete())
+ {
+ response.setRenderParameter(getViewIdParameterName(), translateToParam(facesContext.getViewRoot().getViewId()));
+ }
+
+ request.getPortletSession().setAttribute(CURRENT_FACES_CONTEXT, facesContext);
+ }
+ catch (Throwable e)
+ {
+ facesContext.release();
+ handleExceptionFromLifecycle(e);
+ }
+ }
+
+ /**
+ * Render a JSF view.
+ */
+ protected void facesRender(RenderRequest request, RenderResponse response)
+ throws PortletException, java.io.IOException
+ {
+ if (log.isTraceEnabled()) log.trace("called facesRender");
+
+ if (request.getPortletSession().getAttribute(CURRENT_FACES_CONTEXT) == null) {
+ request.getPortletSession().setAttribute(CURRENT_FACES_CONTEXT, facesContext(request, response));
+ }
+
+ setContentType(request, response);
+ setPortletRequestFlag(request);
+
+ String viewId = translateToViewId(request, request.getParameter(getViewIdParameterName()));
+ if ((viewId == null) || sessionTimedOut(request)) {
+ nonFacesRequest(request, response);
+ return;
+ }
+
+ try {
+ ServletFacesContextImpl facesContext = (ServletFacesContextImpl)request.
+ getPortletSession().
+ getAttribute(CURRENT_FACES_CONTEXT);
+
+ if (facesContext.getViewRoot() == null) {
+ ApplicationFactory appFactory =
+ (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
+ ViewHandler viewHandler = appFactory.getApplication().getViewHandler();
+ facesContext.setViewRoot(viewHandler.createView(facesContext, viewId));
+ }
+
+ if (request.getParameter(getViewIdParameterName()) == null) {
+ facesContext.getViewRoot().setViewId(viewId);
+ }
+
+ facesContext.setExternalContext(makeExternalContext(request, response));
+ lifecycle.render(facesContext);
+ } catch (Throwable e) {
+ handleExceptionFromLifecycle(e);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2007-03-25 22:16:37 UTC (rev 103)
@@ -4,6 +4,8 @@
import javax.faces.context.FacesContext;
import javax.faces.application.FacesMessage;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletURL;
/**
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
@@ -25,6 +27,8 @@
public static final String ADMIN_PANEL = "admin_panel";
public static final String ID_EDIT = "id_edit";
+ public static final String POST_ID_PARAM_NAME = "post";
+
public static void addInfoMessage(String message) {
FacesContext.getCurrentInstance().addMessage(null,
new FacesMessage(FacesMessage.SEVERITY_INFO, message, ""));
@@ -46,4 +50,17 @@
public static void addMessageCommentDoesntExist() {
addErrorMessage("The comment you requested does not exist.");
}
+
+ public static String createPostLink(String post) {
+ Object response = FacesContext.getCurrentInstance().getExternalContext().getResponse();
+
+ if (response instanceof RenderResponse) {
+ PortletURL url = ((RenderResponse) response).createRenderURL();
+ url.setParameter(UITools.POST_ID_PARAM_NAME, post);
+
+ return url.toString();
+ } else {
+ return "";
+ }
+ }
}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2007-03-25 22:16:37 UTC (rev 103)
@@ -1,9 +1,6 @@
package org.jboss.blog.ui;
-import org.jboss.blog.model.BlogModel;
-import org.jboss.blog.model.BlogModelDoesNotExistException;
-import org.jboss.blog.model.BlogPost;
-import org.jboss.blog.model.BlogPostDoesNotExistException;
+import org.jboss.blog.model.*;
import org.jboss.blog.model.impl.EmptyBlogPost;
import org.jboss.blog.model.impl.EmptyBlogModel;
import org.jboss.blog.BlogName;
@@ -14,7 +11,6 @@
import javax.faces.context.FacesContext;
import javax.faces.component.UIData;
-import javax.portlet.PortletRequest;
import java.util.List;
/**
@@ -30,6 +26,7 @@
// Faces-managed properties
private UIData postsData;
private State state;
+ private Object postParam;
public UIData getPostsData() {
return postsData;
@@ -217,10 +214,44 @@
private void setFrom(int from) {
BlogViewState bvs = getBlogViewState();
bvs.setFrom(from);
- setSelectedPostTitleAsId(null);
}
+ public Object getPostParam() {
+ return postParam;
+ }
+
+ public void setPostParam(Object postParam) {
+ this.postParam = postParam;
+
+ if (postParam != null) {
+ accomodateFrom(postParam.toString());
+ }
+ }
+
+ private void accomodateFrom(String titleAsId) {
+ BlogPostWithIndex bpwi;
+ try {
+ bpwi = getBlogModel().getPostByTitleAsId(titleAsId);
+ } catch (BlogPostDoesNotExistException e) {
+ setFrom(0);
+ return;
+ }
+
+ // Setting a new "from".
+ int postsOnPage = getNumberOfPostsPerPage().intValue();
+ int currentPost = bpwi.getIndex();
+
+ setFrom((currentPost / postsOnPage) * postsOnPage);
+ }
+
public String getSelectedPostTitleAsId() {
+ String post = BasicTools.safeToString(getPostParam());
+
+ if (post != null) {
+ setSelectedPostTitleAsId(post);
+ return post;
+ }
+
return getBlogViewState().getSelectedPostTitleAsId();
}
@@ -239,7 +270,7 @@
}
ModifiableBlogPost getModifiableSelectedPost()
- throws BlogPostDoesNotExistException, BlogModelDoesNotExistException {
+ throws BlogPostDoesNotExistException, BlogModelDoesNotExistException {
return getModifiableModel().getModifiableBlogPostByTitleAsId(
getSelectedPostTitleAsId());
}
@@ -263,7 +294,7 @@
// If unsuccessfull, looking in all entries (we may find something if
// after selecting the entry, new entries have been added/ remvoed).
try {
- return blogModel.getPostByTitleAsId(titleAsId);
+ return getBlogModel().getPostByTitleAsId(titleAsId).getPost();
} catch (BlogPostDoesNotExistException e) {
return postDoesNotExist(titleAsId);
}
@@ -273,6 +304,7 @@
public String next() {
setFrom(getFrom() + getNumberOfPostsPerPage().intValue());
+ setSelectedPostTitleAsId(null);
resetPosts();
return null;
@@ -280,6 +312,7 @@
public String previous() {
setFrom(Math.max(getFrom() - getNumberOfPostsPerPage().intValue(), 0));
+ setSelectedPostTitleAsId(null);
resetPosts();
return null;
Modified: trunk/blog-core/src/web/WEB-INF/blog-object.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/blog-object.xml 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-core/src/web/WEB-INF/blog-object.xml 2007-03-25 22:16:37 UTC (rev 103)
@@ -4,6 +4,19 @@
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
<page>
+ <page-name>blog0</page-name>
+ <window>
+ <window-name>BlogPortletJBossWindow</window-name>
+ <instance-ref>BlogPortletJBossInstance</instance-ref>
+ <region>center</region>
+ <height>1</height>
+ </window>
+ </page>
+ </deployment>
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <parent-ref>default</parent-ref>
+ <page>
<page-name>blog1</page-name>
<window>
<window-name>BlogPortletRedHatWindow</window-name>
Modified: trunk/blog-core/src/web/WEB-INF/blog.taglib.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/blog.taglib.xml 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-core/src/web/WEB-INF/blog.taglib.xml 2007-03-25 22:16:37 UTC (rev 103)
@@ -8,4 +8,15 @@
<tag-name>isAllowed</tag-name>
<handler-class>org.jboss.blog.service.permissions.acl.ACLTagHandler</handler-class>
</tag>
+
+ <tag>
+ <tag-name>postLink</tag-name>
+ <source>tags/post_link.xhtml</source>
+ </tag>
+
+ <function>
+ <function-name>postLink</function-name>
+ <function-class>org.jboss.blog.tools.UITools</function-class>
+ <function-signature>java.lang.String createPostLink(java.lang.String)</function-signature>
+ </function>
</facelet-taglib>
\ No newline at end of file
Modified: trunk/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.xml 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.xml 2007-03-25 22:16:37 UTC (rev 103)
@@ -25,6 +25,10 @@
<property-name>state</property-name>
<value>#{state}</value>
</managed-property>
+ <managed-property>
+ <property-name>postParam</property-name>
+ <value>#{param.post}</value>
+ </managed-property>
</managed-bean>
<managed-bean>
Added: trunk/blog-core/src/web/WEB-INF/tags/post_link.xhtml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/tags/post_link.xhtml (rev 0)
+++ trunk/blog-core/src/web/WEB-INF/tags/post_link.xhtml 2007-03-25 22:16:37 UTC (rev 103)
@@ -0,0 +1,3 @@
+<ui:composition xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html">
+ <h:outputLink value="#{blog:postLink(post)}">#{value}</h:outputLink>
+</ui:composition>
\ No newline at end of file
Modified: trunk/blog-core/src/web/views/blog_view.xhtml
===================================================================
--- trunk/blog-core/src/web/views/blog_view.xhtml 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-core/src/web/views/blog_view.xhtml 2007-03-25 22:16:37 UTC (rev 103)
@@ -38,9 +38,9 @@
rowClasses="posts-row,posts-row-alternate" styleClass="posts">
<h:column>
<span class="post-title">
- <h:commandLink value="#{post.title}"
- action="#{blogView.postView}"
- rendered="#{blogView.postsExpandable}" />
+ <h:panelGroup rendered="#{blogView.postsExpandable}">
+ <blog:postLink post="#{post.titleAsId}" value="#{post.title}" />
+ </h:panelGroup>
<h:outputText value="#{post.title}"
rendered="#{!blogView.postsExpandable}" />
Modified: trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java
===================================================================
--- trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java 2007-03-25 22:16:37 UTC (rev 103)
@@ -3,10 +3,7 @@
import org.jboss.blog.service.store.model.ModifiableBlogModel;
import org.jboss.blog.service.store.model.ModifiableBlogPost;
import org.jboss.blog.service.store.model.BlogModelAlreadyExistsException;
-import org.jboss.blog.model.AbstractBlogModel;
-import org.jboss.blog.model.BlogPost;
-import org.jboss.blog.model.BlogPostDoesNotExistException;
-import org.jboss.blog.model.BlogAuthor;
+import org.jboss.blog.model.*;
import org.jboss.blog.BlogName;
import org.jboss.blog.tools.BasicTools;
@@ -165,17 +162,22 @@
public ModifiableBlogPost getModifiableBlogPostByTitleAsId(String titleAsId)
throws BlogPostDoesNotExistException {
- HBlogPost p = storeService.getPostByTitleAsId(this, titleAsId);
+ HBlogPostWithIndex p = storeService.getPostByTitleAsId(this, titleAsId, true);
if (p == null) {
throw new BlogPostDoesNotExistException(titleAsId);
}
- return p;
+ return p.getPost();
}
- public BlogPost getPostByTitleAsId(String titleAsId)
+ public BlogPostWithIndex getPostByTitleAsId(String titleAsId)
throws BlogPostDoesNotExistException {
- return getModifiableBlogPostByTitleAsId(titleAsId);
+ HBlogPostWithIndex p = storeService.getPostByTitleAsId(this, titleAsId, true);
+ if (p == null) {
+ throw new BlogPostDoesNotExistException(titleAsId);
+ }
+
+ return p.getBlogPostWithIndex();
}
public void addPost(ModifiableBlogPost post) throws IllegalArgumentException {
Added: trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogPostWithIndex.java
===================================================================
--- trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogPostWithIndex.java (rev 0)
+++ trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogPostWithIndex.java 2007-03-25 22:16:37 UTC (rev 103)
@@ -0,0 +1,28 @@
+package org.jboss.blog.service.store.hibernate;
+
+import org.jboss.blog.model.BlogPostWithIndex;
+
+/**
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
+ */
+public class HBlogPostWithIndex {
+ private HBlogPost post;
+ private Integer index;
+
+ public HBlogPostWithIndex(HBlogPost post, Integer index) {
+ this.post = post;
+ this.index = index;
+ }
+
+ public HBlogPost getPost() {
+ return post;
+ }
+
+ public Integer getIndex() {
+ return index;
+ }
+
+ public BlogPostWithIndex getBlogPostWithIndex() {
+ return new BlogPostWithIndex(post, index == null ? 0 : index.intValue());
+ }
+}
Modified: trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
===================================================================
--- trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java 2007-03-25 22:16:37 UTC (rev 103)
@@ -393,18 +393,32 @@
* Gets a post with the specified title.
* @param model Model to which the post should belong.
* @param titleAsId Title converted to an id of the post.
- * @return Post with the given title in the given model or null, if no such
+ * @param withIndex Should the post index also be retrieved.
+ * @return A pair of a post with the given title in the given model and index
+ * of that post, counting from the youngest, or null, if no such
* post exists.
*/
- HBlogPost getPostByTitleAsId(HBlogModel model, String titleAsId) {
+ HBlogPostWithIndex getPostByTitleAsId(HBlogModel model, String titleAsId, boolean withIndex) {
HBlogPost ret = (HBlogPost) sf.getCurrentSession().createQuery(
"select bmp.post from HBlogModelPost bmp where bmp.model = :model " +
"and bmp.post.titleAsId = :titleAsId").setEntity("model", model)
.setParameter("titleAsId", titleAsId).uniqueResult();
+ if (ret == null) {
+ return null;
+ }
+
+ Integer index = null;
+ if (withIndex) {
+ index = (Integer) sf.getCurrentSession().createQuery(
+ "select count(bmp.post) from HBlogModelPost bmp where bmp.model = :model " +
+ "and bmp.post.created < :created").setEntity("model", model)
+ .setParameter("created", ret.getCreated()).uniqueResult();
+ }
+
ret.setStoreService(this);
- return ret;
+ return new HBlogPostWithIndex(ret, index);
}
/**
Modified: trunk/jbossblog.iws
===================================================================
--- trunk/jbossblog.iws 2007-03-22 16:37:07 UTC (rev 102)
+++ trunk/jbossblog.iws 2007-03-25 22:16:37 UTC (rev 103)
@@ -17,7 +17,23 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog.taglib.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog.taglib.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model/BlogPostWithIndex.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java" afterPath="$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossblog.iws" afterPath="$PROJECT_DIR$/jbossblog.iws" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/tags" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogPostWithIndex.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model/BlogModel.java" afterPath="$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model/BlogModel.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog-object.xml" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog-object.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java" afterPath="$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java" afterPath="$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/blog-core/src/web/WEB-INF/tags/post_link.xhtml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml" afterPath="$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java" afterPath="$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -145,21 +161,68 @@
<file leaf-file-name="BlogView.java" pinned="false" current="true" current-in-tab="true">
<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="312" column="15" selection-start="8826" selection-end="8826" vertical-scroll-proportion="0.34085512">
+ <state line="212" column="33" selection-start="5951" selection-end="5951" vertical-scroll-proportion="0.08788598">
<folding />
</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="blog_view.xhtml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="19" selection-start="514" selection-end="514" vertical-scroll-proportion="0.017814728">
+ <state line="41" column="34" selection-start="1779" selection-end="1779" vertical-scroll-proportion="0.6433824">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
</file>
+ <file leaf-file-name="blog.taglib.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/blog.taglib.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="12" column="26" selection-start="447" selection-end="447" vertical-scroll-proportion="0.21377672">
+ <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="28" column="21" selection-start="1165" selection-end="1165" vertical-scroll-proportion="0.3492647">
+ <folding />
+ </state>
+ </provider>
+ <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
+ <state />
+ </provider>
+ <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
+ <state />
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="MyFacesGenericPortletExt.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="31" column="66" selection-start="1185" selection-end="1185" vertical-scroll-proportion="0.30285037">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="UITools.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="53" column="25" selection-start="1903" selection-end="1903" vertical-scroll-proportion="0.8551069">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -198,10 +261,6 @@
<option name="myItemId" value="jbossblog.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -212,10 +271,6 @@
<option name="myItemId" value="blog-core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -227,13 +282,9 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="org.jboss" />
+ <option name="myItemId" value="org.jboss.blog" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -245,17 +296,13 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="org.jboss" />
+ <option name="myItemId" value="org.jboss.blog" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="blog" />
+ <option name="myItemId" value="portlet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -263,202 +310,10 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
+ <option name="myItemId" value="blog-common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="store" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="store" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="model" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="store" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hibernate" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="permissions" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="permissions" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="portal" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="permissions" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="model" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-core" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="org.jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="permissions" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="acl" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</component>
<component name="PerforceChangeBrowserSettings">
@@ -508,10 +363,6 @@
<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="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -519,13 +370,9 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="main" />
+ <option name="myItemId" value="blog-hibernate" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -533,21 +380,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="blog-jaae" />
+ <option name="myItemId" value="blog-hibernate" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-jaae" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -557,83 +394,45 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="blog-jaae" />
+ <option name="myItemId" value="blog-hibernate" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src/java" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/src/java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src/java/org" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/src/java/org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src/java/org/jboss" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/src/java/org/jboss" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src/java/org/jboss/security" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src/java/org/jboss/security/acl" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- </PATH>
- <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-jaae" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/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-jaae/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/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-jaae/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-jaae/src/java/org/jboss/blog/service/permissions" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src/java/org/jboss/blog/service/permissions/acl" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -641,38 +440,24 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="blog-jaae" />
+ <option name="myItemId" value="blog-hibernate" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-hibernate/src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src/etc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-jaae/src/etc/META-INF" />
- <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>
- <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>
@@ -761,27 +546,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/web/views" />
+ <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>
- <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/WEB-INF/tags" />
<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>
@@ -801,25 +572,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" />
+ <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/java/org" />
+ <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/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -838,22 +597,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" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -889,7 +632,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>
@@ -927,17 +670,9 @@
<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_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -976,10 +711,6 @@
<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>
@@ -1019,9 +750,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/service/model" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/permissions/acl" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1064,10 +799,6 @@
<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_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/rome" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1111,7 +842,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/caching" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/model/rome" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -1149,48 +880,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" />
- <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>
- </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" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -1335,7 +1024,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -1373,148 +1062,14 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/store" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model/impl" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/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-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/portal" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jbossblog.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="blog-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/service/permissions/context" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -1572,6 +1127,16 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager">
+ <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="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -1603,16 +1168,6 @@
<option name="Make" value="true" />
</method>
</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="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -1810,131 +1365,127 @@
</component>
<component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="blog-core" />
+ <option name="myLastEditedConfigurable" value="portlet-api-lib.jar" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667,0.5642857" version="1">
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/State.java">
+ <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model/impl/BlogModelImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="25" selection-start="586" selection-end="586" vertical-scroll-proportion="0.33254156">
+ <state line="19" column="47" selection-start="520" selection-end="520" vertical-scroll-proportion="0.25485438">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet.xml">
+ <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model/BlogModel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="27" column="45" selection-start="1186" selection-end="1186" vertical-scroll-proportion="0.49150485">
+ <state line="36" column="0" selection-start="1296" selection-end="1296" vertical-scroll-proportion="0.6371359">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/PortletTools.java">
+ <entry file="file://$PROJECT_DIR$/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="25" selection-start="1395" selection-end="1395" vertical-scroll-proportion="0.6371359">
+ <state line="9" column="81" selection-start="266" selection-end="266" vertical-scroll-proportion="0.14563107">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java">
+ <entry file="file://$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogPostWithIndex.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="61" selection-start="705" selection-end="705" vertical-scroll-proportion="0.20024271">
+ <state line="25" column="81" selection-start="635" selection-end="635" vertical-scroll-proportion="0.45509708">
<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/web/WEB-INF/blog-object.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="71" selection-start="1738" selection-end="1758" vertical-scroll-proportion="0.5344418">
+ <state line="22" column="20" selection-start="759" selection-end="759" vertical-scroll-proportion="0.40048543">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="35" selection-start="1380" selection-end="1380" vertical-scroll-proportion="0.50970876">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.3276699">
<folding />
</state>
</provider>
</entry>
- <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 editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/tags/post_link.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="46" selection-start="644" selection-end="644" vertical-scroll-proportion="0.2757353">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/common.xhtml">
<provider editor-type-id="HtmlPreview">
<state />
</provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/tools/UITools.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="8" column="64" selection-start="429" selection-end="429" vertical-scroll-proportion="0.14705883">
+ <state line="53" column="25" selection-start="1903" selection-end="1903" vertical-scroll-proportion="0.8551069">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/view.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="67" selection-start="92" selection-end="92" vertical-scroll-proportion="0.018382354">
+ <state line="164" column="53" selection-start="4227" selection-end="4227" vertical-scroll-proportion="0.34085512">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/index.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/blog-hibernate/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java">
<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="389" column="42" selection-start="13693" selection-end="13693" vertical-scroll-proportion="0.24940617">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="59" column="56" selection-start="2605" selection-end="2605" vertical-scroll-proportion="0.4117647">
- <folding />
+ <state line="31" column="66" selection-start="1185" selection-end="1185" vertical-scroll-proportion="0.30285037">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/portlet-instances.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/WEB-INF/faces-config.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="76" column="28" selection-start="2787" selection-end="2787" vertical-scroll-proportion="0.33254156">
+ <state line="28" column="21" selection-start="1165" selection-end="1165" vertical-scroll-proportion="0.3492647">
<folding />
</state>
</provider>
+ <provider editor-type-id="com.intellij.jsf.ui.FacesConfigEditorProvider">
+ <state />
+ </provider>
+ <provider editor-type-id="com.intellij.jsf.yfilesGraph.editor.FacesNavigationFileEditorProvider">
+ <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/web/WEB-INF/blog.taglib.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="17" selection-start="1903" selection-end="1903" vertical-scroll-proportion="0.9263658">
+ <state line="12" column="26" selection-start="447" selection-end="447" vertical-scroll-proportion="0.21377672">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/blog-core/build.xml">
+ <entry file="file://$PROJECT_DIR$/blog-core/src/web/views/blog_view.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="19" selection-start="514" selection-end="514" vertical-scroll-proportion="0.017814728">
+ <state line="41" column="34" selection-start="1779" selection-end="1779" vertical-scroll-proportion="0.6433824">
<folding />
</state>
</provider>
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
</entry>
<entry file="file://$PROJECT_DIR$/blog-core/src/java/org/jboss/blog/ui/BlogView.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="312" column="15" selection-start="8826" selection-end="8826" vertical-scroll-proportion="0.34085512">
+ <state line="212" column="33" selection-start="5951" selection-end="5951" vertical-scroll-proportion="0.08788598">
<folding />
</state>
</provider>
More information about the jboss-cvs-commits
mailing list