[jboss-cvs] JBossBlog SVN: r120 - in trunk: blog-common and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 21 06:04:34 EDT 2007
Author: adamw
Date: 2007-06-21 06:04:33 -0400 (Thu, 21 Jun 2007)
New Revision: 120
Added:
trunk/blog-common/src/java/org/jboss/blog/service/permissions/SecurityContext.java
trunk/blog-core/src/java/org/jboss/blog/service/permissions/DefaultBlogPermissionsService.java
Removed:
trunk/blog-common/src/java/org/jboss/blog/service/permissions/context/
trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/
trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/
trunk/blog-hibernate/
Modified:
trunk/
trunk/blog-common/build.xml
trunk/blog-common/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java
trunk/blog-core/build.xml
trunk/blog-core/src/etc/META-INF/jboss-service.xml
trunk/blog-core/src/java/org/jboss/blog/portlet/BlogViewPortlet.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/java/org/jboss/blog/ui/BlogViewState.java
trunk/blog-core/src/java/org/jboss/blog/ui/State.java
trunk/build.xml
Log:
Refactoring
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- target
dist
build
+ .classpath
.project
target
dist
build
Modified: trunk/blog-common/build.xml
===================================================================
--- trunk/blog-common/build.xml 2007-06-18 19:04:03 UTC (rev 119)
+++ trunk/blog-common/build.xml 2007-06-21 10:04:33 UTC (rev 120)
@@ -5,8 +5,6 @@
<path id="base.jars">
<fileset refid="rome.jars" />
<fileset refid="jboss.jars" />
- <fileset refid="myfaces.jars" />
- <fileset refid="jboss.portal.jars" />
<fileset refid="portlet.jars" />
</path>
@@ -19,7 +17,7 @@
<target name="build">
<mkdir dir="${build}" />
<!-- Compiling the source -->
- <javac srcdir="${src.java}" destdir="${build}" target="1.4" source="1.4">
+ <javac srcdir="${src.java}" destdir="${build}" target="1.5" source="1.5">
<classpath refid="base.jars" />
</javac>
</target>
Modified: trunk/blog-common/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java 2007-06-18 19:04:03 UTC (rev 119)
+++ trunk/blog-common/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java 2007-06-21 10:04:33 UTC (rev 120)
@@ -1,6 +1,5 @@
package org.jboss.blog.service.permissions;
-import org.jboss.blog.service.permissions.context.SecurityContext;
/**
* A service which enables to check, if a given user can gain access to given
Added: trunk/blog-common/src/java/org/jboss/blog/service/permissions/SecurityContext.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/service/permissions/SecurityContext.java (rev 0)
+++ trunk/blog-common/src/java/org/jboss/blog/service/permissions/SecurityContext.java 2007-06-21 10:04:33 UTC (rev 120)
@@ -0,0 +1,9 @@
+package org.jboss.blog.service.permissions;
+
+/**
+ * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
+ */
+public interface SecurityContext
+{
+ public Object getIdentity();
+}
Modified: trunk/blog-core/build.xml
===================================================================
--- trunk/blog-core/build.xml 2007-06-18 19:04:03 UTC (rev 119)
+++ trunk/blog-core/build.xml 2007-06-21 10:04:33 UTC (rev 120)
@@ -7,8 +7,6 @@
<fileset refid="jboss.jars" />
<fileset refid="jboss.portal.jars" />
<fileset refid="portlet.jars" />
- <fileset refid="facelets.jars" />
- <fileset refid="myfaces.jars" />
<fileset refid="jstl.jars" />
<fileset refid="servlet.jars" />
@@ -41,7 +39,7 @@
<target name="build">
<mkdir dir="${build}" />
<!-- Compiling the source -->
- <javac srcdir="${src.java}" destdir="${build}" target="1.4" source="1.4">
+ <javac srcdir="${src.java}" destdir="${build}" target="1.5" source="1.5">
<classpath refid="base.jars" />
<!-- Dependency on the blog-common classes -->
<classpath path="../blog-common/${build}" />
@@ -78,7 +76,6 @@
<!-- Copying dependency jars -->
<copy todir="${dist.lib.dir}"><fileset refid="rome.jars"/></copy>
- <copy todir="${dist.lib.dir}"><fileset refid="jboss.jaae.jars"/></copy>
<copy todir="${dist.lib.dir}"><fileset refid="jboss.portal.identity.jars"/></copy>
<copy todir="${dist.lib.dir}"><fileset refid="jexl.jars"/></copy>
Modified: trunk/blog-core/src/etc/META-INF/jboss-service.xml
===================================================================
--- trunk/blog-core/src/etc/META-INF/jboss-service.xml 2007-06-18 19:04:03 UTC (rev 119)
+++ trunk/blog-core/src/etc/META-INF/jboss-service.xml 2007-06-21 10:04:33 UTC (rev 120)
@@ -57,18 +57,9 @@
</mbean>
<!-- Permissions service -->
- <mbean code="org.jboss.blog.service.permissions.acl.AclBlogPermissionsService"
+ <mbean code="org.jboss.blog.service.permissions.DefaultBlogPermissionsService"
name="blog:service=Permissions"
- xmbean-dd="org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.xml">
- <depends>portal:service=Module,type=IdentityServiceController</depends>
+ xmbean-dd="org/jboss/blog/service/permissions/DefaultBlogPermissionsService.xml">
+ <!--<depends>portal:service=Module,type=IdentityServiceController</depends>-->
</mbean>
-
- <!-- Store service -->
- <mbean code="org.jboss.blog.service.store.hibernate.HibernateBlogStoreService"
- name="blog:service=Store"
- xmbean-dd="org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.xml" >
- <depends optional-attribute-name="PermissionsService"
- proxy-type="attribute">blog:service=Permissions</depends>
- <depends>jboss.jca:name=BlogDS,service=DataSourceBinding</depends>
- </mbean>
</server>
\ No newline at end of file
Modified: trunk/blog-core/src/java/org/jboss/blog/portlet/BlogViewPortlet.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/portlet/BlogViewPortlet.java 2007-06-18 19:04:03 UTC (rev 119)
+++ trunk/blog-core/src/java/org/jboss/blog/portlet/BlogViewPortlet.java 2007-06-21 10:04:33 UTC (rev 120)
@@ -43,7 +43,7 @@
BlogView blogViewBean = getBlogViewBean(request, getStateBean(request));
String jsp;
- if ((blogViewBean.getPostParam() != null) &&
+ if ((blogViewBean.getSelectedPostTitleAsId() != null) &&
(blogViewBean.getViewPostsOnSeparatePage().booleanValue())) {
jsp = jspPrefix + "post_view.jsp";
} else {
Added: trunk/blog-core/src/java/org/jboss/blog/service/permissions/DefaultBlogPermissionsService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/permissions/DefaultBlogPermissionsService.java (rev 0)
+++ trunk/blog-core/src/java/org/jboss/blog/service/permissions/DefaultBlogPermissionsService.java 2007-06-21 10:04:33 UTC (rev 120)
@@ -0,0 +1,10 @@
+package org.jboss.blog.service.permissions;
+
+import org.jboss.blog.service.AbstractBlogService;
+
+public class DefaultBlogPermissionsService extends AbstractBlogService implements BlogPermissionsService {
+ public boolean hasAccess(SecurityContext context) {
+ return true;
+ }
+
+}
Modified: trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2007-06-18 19:04:03 UTC (rev 119)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2007-06-21 10:04:33 UTC (rev 120)
@@ -1,44 +1,17 @@
package org.jboss.blog.tools;
-import org.jboss.blog.BlogName;
-
-import javax.faces.context.FacesContext;
import javax.portlet.RenderResponse;
import javax.portlet.PortletURL;
/**
+ * TODO
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public class UITools {
- public static final String BLOG_VIEW = "blog_view";
- public static final String POST_VIEW = "post_view";
-
public static final String POST_ID_PARAM_NAME = "post";
public static final String FROM_PARAM_NAME = "from";
- public static void addInfoMessage(String message) {
- // TODO
- }
-
- public static void addErrorMessage(String message) {
- // TODO
- }
-
- public static void addMessageBlogDoesntExist(BlogName blogName) {
- addErrorMessage("The blog you requested does not exist: " + blogName.toString() + ".");
- }
-
- public static void addMessagePostDoesntExist(String id) {
- addErrorMessage("The post you requested: " + id + " does not exist.");
- }
-
- public static void addMessageCommentDoesntExist() {
- addErrorMessage("The comment you requested does not exist.");
- }
-
- public static String createPostLink(String post) {
- Object response = FacesContext.getCurrentInstance().getExternalContext().getResponse();
-
+ public static String createPostLink(Object response, String post) {
if (response instanceof RenderResponse) {
PortletURL url = ((RenderResponse) response).createRenderURL();
url.setParameter(UITools.POST_ID_PARAM_NAME, post);
@@ -49,9 +22,7 @@
}
}
- public static String createFromLink(Integer from) {
- Object response = FacesContext.getCurrentInstance().getExternalContext().getResponse();
-
+ public static String createFromLink(Object response, Integer from) {
if (response instanceof RenderResponse) {
PortletURL url = ((RenderResponse) response).createRenderURL();
if (from != null) {
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2007-06-18 19:04:03 UTC (rev 119)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2007-06-21 10:04:33 UTC (rev 120)
@@ -4,13 +4,9 @@
import org.jboss.blog.model.impl.EmptyBlogPost;
import org.jboss.blog.model.impl.EmptyBlogModel;
import org.jboss.blog.BlogName;
-import org.jboss.blog.tools.UITools;
import org.jboss.blog.tools.BasicTools;
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIData;
-import javax.portlet.PortletRequest;
-
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -24,21 +20,6 @@
private Object postParam;
private Object fromParam;
private Object request;
-
- // Cached properties
- private BlogName blogName;
- private BlogModel blogModel;
- private BlogViewState blogViewState;
- private Integer numberOfPostsPerPage;
- private Boolean viewPostsOnSeparatePage;
- private Boolean viewAllPosts;
- private Boolean commentsEnabled;
- private Boolean postsExpandable;
- private Boolean defaultBlog;
- private Boolean showLinkToOriginalBlog;
- private Boolean showLinkToOriginalPost;
- private Boolean linkPostsToOriginal;
- private Map<String, String> feedLinks;
public BlogView(State state, Object request) {
super();
@@ -53,10 +34,21 @@
public Object getRequest() {
return request;
}
-
+
// Cached properties
+ private BlogName blogName;
+ private BlogModel blogModel;
+ private BlogViewState blogViewState;
+ private Integer numberOfPostsPerPage;
+ private Boolean viewPostsOnSeparatePage;
+ private Boolean viewAllPosts;
+ private Boolean commentsEnabled;
+ private Boolean postsExpandable;
+ private Boolean showLinkToOriginalBlog;
+ private Boolean showLinkToOriginalPost;
+ private Boolean linkPostsToOriginal;
+ private Map<String, String> feedLinks;
-
/* A list of posts to show in the current view, plus the next post,
* if such a post exists (used to checking if there is a next page). */
private List<? extends BlogPost> postsWithNext;
@@ -75,21 +67,13 @@
return blogName;
}
- public Boolean getDefaultBlog() {
- if (defaultBlog == null) {
- defaultBlog = Boolean.valueOf(getState().getSelectedBlogName() == null);
- }
-
- return defaultBlog;
- }
-
public BlogModel getBlogModel() {
if (blogModel == null) {
try {
blogModel = BasicTools.getBlogService().getModelService().retrieveBlogModel(
getBlogName());
} catch (BlogModelDoesNotExistException e) {
- UITools.addMessageBlogDoesntExist(getBlogName());
+ addMessageBlogDoesntExist(getBlogName());
blogModel = new EmptyBlogModel();
}
}
@@ -235,6 +219,8 @@
bvs.setFrom(from);
}
+ //
+
public Object getPostParam() {
return postParam;
}
@@ -243,7 +229,23 @@
this.postParam = postParam;
if (postParam != null) {
- accomodateFrom(postParam.toString());
+ String titleAsId = postParam.toString();
+
+ BlogPostWithIndex bpwi;
+ try {
+ bpwi = getBlogModel().getPostByTitleAsId(titleAsId);
+ } catch (BlogPostDoesNotExistException e) {
+ setFrom(0);
+ setSelectedPostTitleAsId(null);
+ return;
+ }
+
+ // Setting a new "from".
+ int postsOnPage = getNumberOfPostsPerPage().intValue();
+ int currentPost = bpwi.getIndex();
+
+ setFrom((currentPost / postsOnPage) * postsOnPage);
+ setSelectedPostTitleAsId(titleAsId);
}
}
@@ -264,22 +266,6 @@
}
}
- 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());
@@ -296,7 +282,7 @@
}
private BlogPost postDoesNotExist(String id) {
- UITools.addMessagePostDoesntExist(id);
+ addMessagePostDoesntExist(id);
return new EmptyBlogPost();
}
@@ -323,50 +309,41 @@
return postDoesNotExist(titleAsId);
}
}
-
- // Actions
-
- public String postView() {
- postSelect();
-
- if (getViewPostsOnSeparatePage().booleanValue()) {
- return UITools.POST_VIEW;
- } else {
- return null;
- }
+
+ // Messages support
+
+ private List<String> infoMessages;
+ private List<String> errorMessages;
+
+ public List<String> getInfoMessages() {
+ if (infoMessages == null) {
+ infoMessages = new ArrayList<String>();
+ }
+
+ return infoMessages;
}
-
- public String blogView() {
- postClear();
-
- return UITools.BLOG_VIEW;
+
+ public List<String> getErrorMessages() {
+ if (errorMessages == null) {
+ errorMessages = new ArrayList<String>();
+ }
+
+ return errorMessages;
}
-
- public String returnToDefault() {
- getState().setSelectedBlogName(null);
- resetBlogData();
-
- return null;
+
+ public void addInfoMessage(String message) {
+ getInfoMessages().add(message);
}
- // Helper methods
-
- private void postSelect() {
- BlogPost selected = (BlogPost) postsData.getRowData();
- setSelectedPostTitleAsId(selected.getTitleAsId());
+ public void addErrorMessage(String message) {
+ getErrorMessages().add(message);
}
- private void postClear() {
- setSelectedPostTitleAsId(null);
+ public void addMessageBlogDoesntExist(BlogName blogName) {
+ addErrorMessage("The blog you requested does not exist: " + blogName.toString() + ".");
}
- String getReturnTo() {
- String viewName = state.getReturnTo();
- if ((viewName == null) || (UITools.BLOG_VIEW.equals(viewName))) {
- viewName = UITools.BLOG_VIEW;
- postClear();
- }
-
- return viewName;
+ public void addMessagePostDoesntExist(String id) {
+ addErrorMessage("The post you requested: " + id + " does not exist.");
}
}
\ No newline at end of file
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogViewState.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogViewState.java 2007-06-18 19:04:03 UTC (rev 119)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogViewState.java 2007-06-21 10:04:33 UTC (rev 120)
@@ -1,7 +1,5 @@
package org.jboss.blog.ui;
-import java.io.Serializable;
-
/**
* A view state of one specific blog:
* - number of a post that should be shown as the first one
@@ -11,7 +9,6 @@
public class BlogViewState {
private int from;
private String selectedPostTitleAsId;
- private Serializable selectedCommentId;
public BlogViewState() {
from = 0;
@@ -32,12 +29,4 @@
public void setSelectedPostTitleAsId(String selectedPostTitleAsId) {
this.selectedPostTitleAsId = selectedPostTitleAsId;
}
-
- public Serializable getSelectedCommentId() {
- return selectedCommentId;
- }
-
- public void setSelectedCommentId(Serializable selectedCommentId) {
- this.selectedCommentId = selectedCommentId;
- }
}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/State.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/State.java 2007-06-18 19:04:03 UTC (rev 119)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/State.java 2007-06-21 10:04:33 UTC (rev 120)
@@ -14,11 +14,8 @@
// Map BlogName --> BlogViewState.
private Map<BlogName, BlogViewState> blogViewStates;
- private String selectedBlogId;
private BlogName selectedBlogName;
- private String returnTo;
-
public State() {
blogViewStates = new HashMap<BlogName, BlogViewState>();
}
@@ -34,20 +31,8 @@
}
/**
- * Gets the id of the selected blog.
- * @return Id of the blog selected for editing.
- */
- public String getSelectedBlogId() {
- return selectedBlogId;
- }
-
- public void setSelectedBlogId(String selectedBlogId) {
- this.selectedBlogId = selectedBlogId;
- }
-
- /**
* Gets the name of the selected blog.
- * @return Name of the blog selected for viewing/ editing.
+ * @return Name of the blog selected for viewing.
*/
public BlogName getSelectedBlogName() {
return selectedBlogName;
@@ -56,18 +41,4 @@
public void setSelectedBlogName(BlogName selectedBlogName) {
this.selectedBlogName = selectedBlogName;
}
-
- /**
- * Gets the return to value.
- * @return A string naming a view, to which the user should be directed
- * after completing operations in the current view. Only relevant when
- * the new view name depends on the originating view.
- */
- public String getReturnTo() {
- return returnTo;
- }
-
- public void setReturnTo(String returnTo) {
- this.returnTo = returnTo;
- }
}
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-06-18 19:04:03 UTC (rev 119)
+++ trunk/build.xml 2007-06-21 10:04:33 UTC (rev 120)
@@ -49,8 +49,6 @@
<target name="each-module">
<ant dir="blog-common" inheritrefs="true" target="${target.name}" />
<ant dir="blog-core" inheritrefs="true" target="${target.name}" />
- <ant dir="blog-hibernate" inheritrefs="true" target="${target.name}" />
- <ant dir="blog-jaae" inheritrefs="true" target="${target.name}" />
</target>
<!-- Main tasks -->
More information about the jboss-cvs-commits
mailing list