[jboss-cvs] JBossBlog SVN: r118 - in trunk: blog-common/src/java/org/jboss/blog and 21 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 18 15:02:24 EDT 2007
Author: adamw
Date: 2007-06-18 15:02:23 -0400 (Mon, 18 Jun 2007)
New Revision: 118
Removed:
trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalUserBlogAuthor.java
trunk/blog-common/src/java/org/jboss/blog/service/store/
trunk/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java
trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java
trunk/blog-core/src/java/org/jboss/blog/portlet/simple/
trunk/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java
trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java
trunk/blog-core/src/java/org/jboss/blog/service/model/StoreModelService.java
trunk/blog-core/src/java/org/jboss/blog/service/name/AbstractBlogNameService.java
trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java
trunk/blog-core/src/java/org/jboss/blog/tools/FacesTools.java
trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java
trunk/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java
trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java
trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java
trunk/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java
trunk/blog-core/src/web/WEB-INF/blog.taglib.off.xml
trunk/blog-core/src/web/WEB-INF/faces-config.off.xml
trunk/blog-jaae/
trunk/lib/jboss-jaae/
Modified:
trunk/blog-common/src/java/org/jboss/blog/BlogName.java
trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogItem.java
trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java
trunk/blog-common/src/java/org/jboss/blog/model/BlogCommentDoesNotExistException.java
trunk/blog-common/src/java/org/jboss/blog/model/BlogItem.java
trunk/blog-common/src/java/org/jboss/blog/model/BlogModel.java
trunk/blog-common/src/java/org/jboss/blog/model/BlogModelDoesNotExistException.java
trunk/blog-common/src/java/org/jboss/blog/model/BlogPost.java
trunk/blog-common/src/java/org/jboss/blog/model/BlogPostDoesNotExistException.java
trunk/blog-common/src/java/org/jboss/blog/model/impl/BlogModelImpl.java
trunk/blog-common/src/java/org/jboss/blog/model/impl/BlogPostImpl.java
trunk/blog-common/src/java/org/jboss/blog/model/impl/EmptyBlogModel.java
trunk/blog-common/src/java/org/jboss/blog/model/impl/EmptyBlogPost.java
trunk/blog-common/src/java/org/jboss/blog/rome/CommentRssModuleGenerator.java
trunk/blog-common/src/java/org/jboss/blog/rome/CommentRssModuleImpl.java
trunk/blog-common/src/java/org/jboss/blog/service/BlogService.java
trunk/blog-common/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java
trunk/blog-common/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java
trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/AbstractPortalBlogPermissionsService.java
trunk/blog-common/src/java/org/jboss/blog/tools/BasicTools.java
trunk/blog-core/src/etc/META-INF/jboss-service.xml
trunk/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java
trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java
trunk/blog-core/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java
trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java
trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java
trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java
trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AuthorizationListener.java
trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.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/State.java
trunk/blog-core/src/web/WEB-INF/blog-object.xml
trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml
trunk/blog-core/src/web/WEB-INF/portlet-instances.xml
trunk/blog-core/src/web/WEB-INF/portlet.xml
trunk/blog-core/src/web/WEB-INF/web.xml
Log:
Starting refactoring
Modified: trunk/blog-common/src/java/org/jboss/blog/BlogName.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/BlogName.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/BlogName.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -5,22 +5,22 @@
import java.io.Serializable;
/**
- * Class representing a name of a blog. This name consists of a blog id
- * and a category. Having it defined, it can be determined what blog should
+ * Class representing a name of a blog. This name consists of a blog id.
+ * Having it defined, it can be determined what blog should
* be displayed/ edited/ etc.
* @author Adam Warski (adamw at aster.pl)
*/
public class BlogName implements Serializable {
- private String id;
- private String category;
+ private static final long serialVersionUID = 4824526531562227669L;
+
+ private String id;
public BlogName() {
}
- public BlogName(String id, String category) {
+ public BlogName(String id) {
this.id = id;
- this.category = category;
}
public String getId() {
@@ -31,17 +31,8 @@
this.id = id;
}
- public String getCategory() {
- return category;
- }
-
- public void setCategory(String category) {
- this.category = category;
- }
-
public int hashCode() {
- return (id == null ? 0 : id.hashCode()) +
- (category == null ? 0 : category.hashCode());
+ return id == null ? 0 : id.hashCode();
}
public boolean equals(Object obj) {
@@ -51,11 +42,10 @@
BlogName bn = (BlogName) obj;
- return BasicTools.objectsEqual(id, bn.id) &&
- BasicTools.objectsEqual(category, bn.category);
+ return BasicTools.objectsEqual(id, bn.id);
}
public String toString() {
- return "(" + id + ", " + category + ")";
+ return "(" + id + ")";
}
}
Modified: trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogItem.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogItem.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogItem.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -35,8 +35,8 @@
return createdTime;
}
- public int compareTo(Object o) {
- BlogPost post = (BlogPost) o;
- return post.getCreated().compareTo(getCreated());
+ public int compareTo(BlogItem o) {
+ BlogItem item = (BlogItem) o;
+ return item.getCreated().compareTo(getCreated());
}
}
Modified: trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/AbstractBlogModel.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,6 +1,5 @@
package org.jboss.blog.model;
-import java.util.Iterator;
import java.util.List;
/**
@@ -11,8 +10,7 @@
public BlogPostWithIndex getPostByTitleAsId(String titleAsId)
throws BlogPostDoesNotExistException {
int index = 0;
- for (Iterator iter = getPosts().iterator(); iter.hasNext();) {
- BlogPost post = (BlogPost) iter.next();
+ for (BlogPost post : getPosts()) {
if (post.getTitleAsId().equalsIgnoreCase(titleAsId)) {
return new BlogPostWithIndex(post, index);
}
@@ -23,8 +21,8 @@
throw new BlogPostDoesNotExistException(titleAsId);
}
- public List getPosts(int from, int to) {
- List posts = getPosts();
+ public List<? extends BlogPost> getPosts(int from, int to) {
+ List<? extends BlogPost> posts = getPosts();
to = Math.min(posts.size(), to);
from = Math.min(to, from);
Modified: trunk/blog-common/src/java/org/jboss/blog/model/BlogCommentDoesNotExistException.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/BlogCommentDoesNotExistException.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/BlogCommentDoesNotExistException.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -4,7 +4,9 @@
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public class BlogCommentDoesNotExistException extends Exception {
- public BlogCommentDoesNotExistException() {
+ private static final long serialVersionUID = -2454793574505070644L;
+
+ public BlogCommentDoesNotExistException() {
}
public BlogCommentDoesNotExistException(String message) {
Modified: trunk/blog-common/src/java/org/jboss/blog/model/BlogItem.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/BlogItem.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/BlogItem.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -6,7 +6,7 @@
* A base class for blog items: models, posts and comments.
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
-public interface BlogItem extends Comparable{
+public interface BlogItem extends Comparable<BlogItem> {
public BlogAuthor getAuthor();
public String getTitle();
public String getDescription();
Modified: trunk/blog-common/src/java/org/jboss/blog/model/BlogModel.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/BlogModel.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/BlogModel.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -14,7 +14,7 @@
* discouraged. If possible, use {@link BlogModel#getPosts(int, int)}.
* @return Sorted, immutable list of {@link BlogPost} - posts for this blog model.
*/
- public List getPosts();
+ public List<? extends BlogPost> getPosts();
/**
* Gets a specified sublist of {@link BlogModel#getPosts()}. This method
@@ -26,14 +26,14 @@
* @return Sorted sublist of {@link BlogPost}, containing posts on
* positions from <code>from</code> to <code>to</code>.
*/
- public List getPosts(int from, int to);
+ public List<? extends BlogPost> getPosts(int from, int to);
/**
*
- * @return Immutable set of {@link java.lang.String} - name of categories to
+ * @return Immutable set of names of categories to
* which this model belongs.
*/
- public Set getCategories();
+ public Set<String> getCategories();
public BlogPostWithIndex getPostByTitleAsId(String titleAsId) throws BlogPostDoesNotExistException;
}
Modified: trunk/blog-common/src/java/org/jboss/blog/model/BlogModelDoesNotExistException.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/BlogModelDoesNotExistException.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/BlogModelDoesNotExistException.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -5,7 +5,9 @@
* @author Adam Warski (adamw at aster.pl)
*/
public class BlogModelDoesNotExistException extends Exception {
- public BlogModelDoesNotExistException() {
+ private static final long serialVersionUID = -2631045437135973674L;
+
+ public BlogModelDoesNotExistException() {
}
public BlogModelDoesNotExistException(String message) {
Modified: trunk/blog-common/src/java/org/jboss/blog/model/BlogPost.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/BlogPost.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/BlogPost.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -32,12 +32,12 @@
* situation where a blog supports comments, but there are no comments
* to this post - in this case, an empty list is returned).
*/
- public List getComments();
+ public List<BlogComment> getComments();
/**
*
- * @return Immutable set of {@link java.lang.String} - name of categories to
+ * @return Immutable set of names of categories to
* which this post belongs.
*/
- public Set getCategories();
+ public Set<String> getCategories();
}
Modified: trunk/blog-common/src/java/org/jboss/blog/model/BlogPostDoesNotExistException.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/BlogPostDoesNotExistException.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/BlogPostDoesNotExistException.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -5,7 +5,9 @@
* @author Adam Warski (adamw at aster.pl)
*/
public class BlogPostDoesNotExistException extends Exception {
- public BlogPostDoesNotExistException() {
+ private static final long serialVersionUID = 3535893824036084160L;
+
+ public BlogPostDoesNotExistException() {
}
public BlogPostDoesNotExistException(String message) {
Modified: trunk/blog-common/src/java/org/jboss/blog/model/impl/BlogModelImpl.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/impl/BlogModelImpl.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/impl/BlogModelImpl.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -2,6 +2,7 @@
import org.jboss.blog.model.AbstractBlogModel;
import org.jboss.blog.model.BlogAuthor;
+import org.jboss.blog.model.BlogPost;
import java.util.Date;
import java.util.Set;
@@ -17,12 +18,12 @@
private String description;
private String link;
private Date created;
- private List posts;
- private Set categories;
+ private List<? extends BlogPost> posts;
+ private Set<String> categories;
public BlogModelImpl(BlogAuthor author, String title, String description,
- String link, Date created, List posts,
- Set categories) {
+ String link, Date created, List<? extends BlogPost> posts,
+ Set<String> categories) {
this.author = author;
this.title = title;
this.description = description;
@@ -52,11 +53,11 @@
return created;
}
- public List getPosts() {
+ public List<? extends BlogPost> getPosts() {
return posts;
}
- public Set getCategories() {
+ public Set<String> getCategories() {
return categories;
}
}
Modified: trunk/blog-common/src/java/org/jboss/blog/model/impl/BlogPostImpl.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/impl/BlogPostImpl.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/impl/BlogPostImpl.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -2,6 +2,7 @@
import org.jboss.blog.model.AbstractBlogPost;
import org.jboss.blog.model.BlogAuthor;
+import org.jboss.blog.model.BlogComment;
import java.util.Date;
import java.util.List;
@@ -18,13 +19,13 @@
private Date created;
private String link;
private String guid;
- private Set categories;
+ private Set<String> categories;
private String commentLink;
- private List comments;
+ private List<BlogComment> comments;
public BlogPostImpl(BlogAuthor author, String title, String description,
Date created, String link, String guid,
- Set categories, String commentLink, List comments) {
+ Set<String> categories, String commentLink, List<BlogComment> comments) {
this.author = author;
this.title = title;
this.description = description;
@@ -60,7 +61,7 @@
return guid;
}
- public Set getCategories() {
+ public Set<String> getCategories() {
return categories;
}
@@ -68,7 +69,7 @@
return commentLink;
}
- public List getComments() {
+ public List<BlogComment> getComments() {
return comments;
}
}
Modified: trunk/blog-common/src/java/org/jboss/blog/model/impl/EmptyBlogModel.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/impl/EmptyBlogModel.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/impl/EmptyBlogModel.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -2,11 +2,13 @@
import java.util.*;
+import org.jboss.blog.model.BlogPost;
+
/**
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public class EmptyBlogModel extends BlogModelImpl {
public EmptyBlogModel() {
- super(new EmptyBlogAuthor(), "", "", "", new Date(), new ArrayList(), new HashSet());
+ super(new EmptyBlogAuthor(), "", "", "", new Date(), new ArrayList<BlogPost>(), new HashSet<String>());
}
}
Modified: trunk/blog-common/src/java/org/jboss/blog/model/impl/EmptyBlogPost.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/model/impl/EmptyBlogPost.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/model/impl/EmptyBlogPost.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -8,6 +8,6 @@
*/
public class EmptyBlogPost extends BlogPostImpl {
public EmptyBlogPost() {
- super(new EmptyBlogAuthor(), "", "", new Date(), "", "", new HashSet(), null, null);
+ super(new EmptyBlogAuthor(), "", "", new Date(), "", "", new HashSet<String>(), null, null);
}
}
Modified: trunk/blog-common/src/java/org/jboss/blog/rome/CommentRssModuleGenerator.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/rome/CommentRssModuleGenerator.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/rome/CommentRssModuleGenerator.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -21,17 +21,17 @@
return CommentRssModule.URI;
}
- private static Set NAMESPACES;
+ private static Set<Namespace> NAMESPACES;
static {
- Set nss = new HashSet();
+ Set<Namespace> nss = new HashSet<Namespace>();
//noinspection unchecked
nss.add(CommentRssModuleGenerator.COMM_RSS_NS);
//noinspection unchecked
CommentRssModuleGenerator.NAMESPACES = Collections.unmodifiableSet(nss);
}
- public Set getNamespaces() {
+ public Set<Namespace> getNamespaces() {
return CommentRssModuleGenerator.NAMESPACES;
}
Modified: trunk/blog-common/src/java/org/jboss/blog/rome/CommentRssModuleImpl.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/rome/CommentRssModuleImpl.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/rome/CommentRssModuleImpl.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -7,7 +7,9 @@
*/
public class CommentRssModuleImpl extends ModuleImpl
implements CommentRssModule {
- private String commentRss;
+ private static final long serialVersionUID = -4314519479803024449L;
+
+ private String commentRss;
public CommentRssModuleImpl() {
super(CommentRssModule.class, CommentRssModule.URI);
@@ -21,7 +23,7 @@
this.commentRss = commentRss;
}
- public Class getInterface() {
+ public Class<CommentRssModule> getInterface() {
return CommentRssModule.class;
}
Modified: trunk/blog-common/src/java/org/jboss/blog/service/BlogService.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/service/BlogService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/service/BlogService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -4,7 +4,6 @@
import org.jboss.blog.service.name.BlogNameService;
import org.jboss.blog.service.model.BlogModelService;
import org.jboss.blog.service.configuration.BlogConfigurationService;
-import org.jboss.blog.service.store.BlogStoreService;
/**
* A central point tieing all other blog services and providing a way to access
@@ -23,7 +22,4 @@
public BlogConfigurationService getConfigurationService();
public void setConfigurationService(BlogConfigurationService configurationService);
-
- public BlogStoreService getStoreService();
- public void setStoreService(BlogStoreService storeService);
}
Modified: trunk/blog-common/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/service/configuration/BlogConfigurationService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -12,7 +12,7 @@
/**
*
* @param request Request from which to read the configuration.
- * @return Number of posts to be shown on the main blog view page. Shuld
+ * @return Number of posts to be shown on the main blog view page. Should
* never return null.
*/
public Integer getNumberOfPostsPerPage(Object request);
@@ -40,8 +40,7 @@
/**
*
* @param request Request from which to read the configuration.
- * @return True iff authorized users can add comments to posts
- * in this blog.
+ * @return True iff comments should be displayed below the blog posts, if available.
*/
public Boolean getCommentsEnabled(Object request);
@@ -74,5 +73,5 @@
* @param request Request from which to read the configuration.
* @return A map of (String feed type -> String feed link).
*/
- public Map getFeedLinks(Object request);
+ public Map<String, String> getFeedLinks(Object request);
}
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-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/service/permissions/BlogPermissionsService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,11 +1,10 @@
package org.jboss.blog.service.permissions;
-import org.jboss.blog.model.BlogAuthor;
import org.jboss.blog.service.permissions.context.SecurityContext;
/**
* A service which enables to check, if a given user can gain access to given
- * contexts.
+ * context.
* @author Adam Warski (adamw at aster.pl)
*/
public interface BlogPermissionsService {
@@ -15,14 +14,4 @@
* @return True iff the given user can access the given context.
*/
public boolean hasAccess(SecurityContext context);
-
- /**
- * Gets a blog author represented by the given data. If it contains
- * request information, the currently logged-in user will be returned.
- * @param data Request data from which to read the blog author
- * information.
- * @return A {@link BlogAuthor} representation of the user represented
- * by the given data, or null, if no such user exists.
- */
- public BlogAuthor retrieveBlogAuthor(Object data);
}
Modified: trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/AbstractPortalBlogPermissionsService.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/AbstractPortalBlogPermissionsService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/AbstractPortalBlogPermissionsService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -3,14 +3,10 @@
import org.jboss.portal.identity.UserModule;
import org.jboss.portal.identity.UserProfileModule;
import org.jboss.portal.identity.MembershipModule;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.blog.model.BlogAuthor;
-import org.jboss.blog.model.impl.EmptyBlogAuthor;
import org.jboss.blog.service.AbstractBlogService;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.portlet.PortletRequest;
/**
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
@@ -56,23 +52,4 @@
return mm;
}
-
- public BlogAuthor retrieveBlogAuthor(Object data) {
- try {
- if (data instanceof PortletRequest) {
- return new PortalUserBlogAuthor(this,
- getUserModule().findUserByUserName(
- ((PortletRequest) data).getRemoteUser()));
- }
-
- if (data instanceof Long) {
- return new PortalUserBlogAuthor(this,
- getUserModule().findUserById(data));
- }
- } catch (IdentityException e) {
- return new EmptyBlogAuthor();
- }
-
- throw new IllegalArgumentException("Invalid data from which blog author was to be read.");
- }
}
Deleted: trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalUserBlogAuthor.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalUserBlogAuthor.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/service/permissions/portal/PortalUserBlogAuthor.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,46 +0,0 @@
-package org.jboss.blog.service.permissions.portal;
-
-import org.jboss.blog.model.AbstractBlogAuthor;
-import org.jboss.blog.service.permissions.portal.PortalBlogPermissionsService;
-import org.jboss.blog.tools.BasicTools;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.IdentityException;
-
-/**
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-public class PortalUserBlogAuthor extends AbstractBlogAuthor {
- private PortalBlogPermissionsService pbps;
- private User user;
-
- public PortalUserBlogAuthor(PortalBlogPermissionsService pbps, User user) {
- this.pbps = pbps;
- this.user = user;
- }
-
- public String getUserName() {
- return user.getUserName();
- }
-
- public String getGivenName() {
- try {
- return BasicTools.safeToString(pbps.getUserProfileModule().getProperty(user,
- User.INFO_USER_NAME_GIVEN));
- } catch (IdentityException e) {
- return null;
- }
- }
-
- public String getFamilyName() {
- try {
- return BasicTools.safeToString(pbps.getUserProfileModule().getProperty(user,
- User.INFO_USER_NAME_FAMILY));
- } catch (IdentityException e) {
- return null;
- }
- }
-
- public User getUser() {
- return user;
- }
-}
Modified: trunk/blog-common/src/java/org/jboss/blog/tools/BasicTools.java
===================================================================
--- trunk/blog-common/src/java/org/jboss/blog/tools/BasicTools.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-common/src/java/org/jboss/blog/tools/BasicTools.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -70,8 +70,10 @@
}
}
- private static Set emptySet = new HashSet() {
- public boolean add(Object o) {
+ private static Set<Object> emptySet = new HashSet<Object>() {
+ private static final long serialVersionUID = 2865744915015152683L;
+
+ public boolean add(Object o) {
return false;
}
};
@@ -80,7 +82,7 @@
* Gets an immutable empty set.
* @return An immutable empty set.
*/
- public static Set emptySet() {
+ public static Set<Object> emptySet() {
return emptySet;
}
@@ -99,33 +101,6 @@
|| link.startsWith("https:") || link.startsWith("file:");
}
- /**
- * In <code>str</code>, replaces each occurence of <code>pattern</code>
- * with <code>replace</code>.
- *
- * @param str
- * String in which to replace.
- * @param pattern
- * Pattern to search for.
- * @param replace
- * String to replace with.
- * @return <code>str</code> with each occurence of <code>pattern</code>
- * replaced with <code>replace</code>.
- */
- public static String replace(String str, String pattern, String replace) {
- int s = 0;
- int e;
- StringBuffer result = new StringBuffer();
-
- while ((e = str.indexOf(pattern, s)) >= 0) {
- result.append(str.substring(s, e));
- result.append(replace);
- s = e + pattern.length();
- }
- result.append(str.substring(s));
- return result.toString();
- }
-
public static BlogService instance;
/**
@@ -147,6 +122,11 @@
}
}
+ /**
+ * A safe "toString()" method.
+ * @param o Object that should be converted to a string.
+ * @return o.toString if o is not null, null otherwise.
+ */
public static String safeToString(Object o) {
if (o == null) {
return null;
Modified: trunk/blog-core/src/etc/META-INF/jboss-service.xml
===================================================================
--- trunk/blog-core/src/etc/META-INF/jboss-service.xml 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/etc/META-INF/jboss-service.xml 2007-06-18 19:02:23 UTC (rev 118)
@@ -22,24 +22,12 @@
<!-- Name service -->
<mbean code="org.jboss.blog.service.name.PortletPreferencesBlogNameService"
name="blog:service=Name"
- xmbean-dd="org/jboss/blog/service/name/PortletPreferencesBlogNameService.xml" >
- <attribute name="IdName">blogId</attribute>
- <attribute name="CategoryName">blogCategory</attribute>
- </mbean>
+ xmbean-dd="org/jboss/blog/service/name/PortletPreferencesBlogNameService.xml" />
<!-- Configuration service -->
<mbean code="org.jboss.blog.service.configuration.PortletPreferencesBlogConfigurationService"
name="blog:service=Configuration"
- xmbean-dd="org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.xml" >
- <attribute name="NumberOfPostsPerPageName">numberOfPostsPerPage</attribute>
- <attribute name="ViewPostsOnSeparatePageName">viewPostsOnSeparatePage</attribute>
- <attribute name="ViewAllPostsName">viewAllPosts</attribute>
- <attribute name="CommentsEnabledName">commentsEnabled</attribute>
- <attribute name="ShowLinkToOriginalBlogName">showLinkToOriginalBlog</attribute>
- <attribute name="ShowLinkToOriginalPostName">showLinkToOriginalPost</attribute>
- <attribute name="LinkPostsToOriginalName">linkPostsToOriginal</attribute>
- <attribute name="FeedLinksName">feedLinks</attribute>
- </mbean>
+ xmbean-dd="org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.xml" />
<!-- Model service -->
<mbean code="org.jboss.blog.service.model.DelegatingModelService"
@@ -74,15 +62,6 @@
xmbean-dd="org/jboss/blog/service/permissions/acl/AclBlogPermissionsService.xml">
<depends>portal:service=Module,type=IdentityServiceController</depends>
</mbean>
- <!-- JAAE service -->
- <mbean code="org.jboss.security.acl.AclKernelFactory"
- name="org.jboss.security.acl.AclKernelFactory:service=aclKernelFactory"
- xmbean-dd="org/jboss/security/acl/AclKernelFactory.xml">
- <attribute name="aclKernel">org.jboss.security.acl.JBossAclKernel</attribute>
- <!-- A "dummy" dependency, so that this service is started after the portal,
- which assures that the jsf libs will be already loaded. -->
- <depends>portal:controller=Core</depends>
- </mbean>
<!-- Store service -->
<mbean code="org.jboss.blog.service.store.hibernate.HibernateBlogStoreService"
Deleted: trunk/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/portlet/BlogFacesPortlet.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,67 +0,0 @@
-package org.jboss.blog.portlet;
-
-import org.jboss.blog.tools.UITools;
-import org.jboss.blog.tools.BasicTools;
-
-import javax.portlet.*;
-import javax.faces.context.FacesContext;
-
-/**
- * @author Adam Warski (adamw at aster.pl)
- */
-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;
- }
- }
-
- request.setAttribute("windowState", request.getWindowState());
-
- 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;
- }
-
- private static String[] copyParams = { UITools.POST_ID_PARAM_NAME, UITools.FROM_PARAM_NAME };
-
- protected String[] getCopyParams() {
- return copyParams;
- }
-}
Deleted: trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/portlet/MyFacesGenericPortletExt.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,145 +0,0 @@
-/*
- * 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/service/BlogServiceImpl.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/BlogServiceImpl.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -4,7 +4,6 @@
import org.jboss.blog.service.model.BlogModelService;
import org.jboss.blog.service.permissions.BlogPermissionsService;
import org.jboss.blog.service.configuration.BlogConfigurationService;
-import org.jboss.blog.service.store.BlogStoreService;
import org.jboss.system.ServiceMBeanSupport;
/**
@@ -22,7 +21,6 @@
private BlogModelService modelService;
private BlogPermissionsService permissionsService;
private BlogConfigurationService configurationService;
- private BlogStoreService storeService;
/**
* @jmx.managed-attribute
@@ -79,18 +77,4 @@
public void setConfigurationService(BlogConfigurationService configurationService) {
this.configurationService = configurationService;
}
-
- /**
- * @jmx.managed-attribute
- */
- public BlogStoreService getStoreService() {
- return storeService;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setStoreService(BlogStoreService storeService) {
- this.storeService = storeService;
- }
}
Deleted: trunk/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/configuration/AbstractPreferencesBlogConfigurationService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,134 +0,0 @@
-package org.jboss.blog.service.configuration;
-
-import org.jboss.blog.service.AbstractBlogService;
-
-/**
- * @author Adam Warski (adamw at aster.pl)
- */
-public abstract class AbstractPreferencesBlogConfigurationService extends AbstractBlogService
- implements BlogConfigurationService {
- private String numberOfPostsPerPageName;
- private String viewPostsOnSeparatePageName;
- private String viewAllPostsName;
- private String commentsEnabledName;
- private String showLinkToOriginalBlogName;
- private String showLinkToOriginalPostName;
- private String linkPostsToOriginalName;
- private String feedLinksName;
-
- /**
- * @jmx.managed-attribute
- * @return Name of the property under which the number of posts per page
- * to display can be found.
- */
- public String getNumberOfPostsPerPageName() {
- return numberOfPostsPerPageName;
- }
-
- /**
- * @param numberOfPostsPerPageName Name of the property under which the
- * number of posts per page to display can be found.
- * @jmx.managed-attribute
- */
- public void setNumberOfPostsPerPageName(String numberOfPostsPerPageName) {
- this.numberOfPostsPerPageName = numberOfPostsPerPageName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public String getViewPostsOnSeparatePageName() {
- return viewPostsOnSeparatePageName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setViewPostsOnSeparatePageName(String viewPostsOnSeparatePageName) {
- this.viewPostsOnSeparatePageName = viewPostsOnSeparatePageName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public String getViewAllPostsName() {
- return viewAllPostsName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setViewAllPostsName(String viewAllPostsName) {
- this.viewAllPostsName = viewAllPostsName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public String getCommentsEnabledName() {
- return commentsEnabledName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setCommentsEnabledName(String commentsEnabledName) {
- this.commentsEnabledName = commentsEnabledName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public String getFeedLinksName() {
- return feedLinksName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setFeedLinksName(String feedLinksName) {
- this.feedLinksName = feedLinksName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public String getShowLinkToOriginalBlogName() {
- return showLinkToOriginalBlogName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setShowLinkToOriginalBlogName(String showLinkToOriginalBlogName) {
- this.showLinkToOriginalBlogName = showLinkToOriginalBlogName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public String getShowLinkToOriginalPostName() {
- return showLinkToOriginalPostName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setShowLinkToOriginalPostName(String showLinkToOriginalPostName) {
- this.showLinkToOriginalPostName = showLinkToOriginalPostName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public String getLinkPostsToOriginalName() {
- return linkPostsToOriginalName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setLinkPostsToOriginalName(String linkPostsToOriginalName) {
- this.linkPostsToOriginalName = linkPostsToOriginalName;
- }
-}
Deleted: trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/configuration/InitParamsBlogConfigurationService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,100 +0,0 @@
-package org.jboss.blog.service.configuration;
-
-import org.jboss.blog.tools.BasicTools;
-import org.jboss.blog.tools.FacesTools;
-
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * A name service which reads blog configuration from init parameters.
- * @author Adam Warski (adamw at aster.pl)
- *
- * @jmx.mbean
- * @jboss.xmbean
- */
-public class InitParamsBlogConfigurationService
- extends AbstractPreferencesBlogConfigurationService {
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
- public Integer getNumberOfPostsPerPage(Object request) {
- BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
- try {
- return Integer.valueOf(FacesTools.getInitParam(
- getNumberOfPostsPerPageName()));
- } catch (NumberFormatException e) {
- return new Integer(0);
- }
- }
-
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
- public Boolean getViewPostsOnSeparatePage(Object request) {
- BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
- return Boolean.valueOf(FacesTools.getInitParam(
- getViewPostsOnSeparatePageName()));
- }
-
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
- public Boolean getViewAllPosts(Object request) {
- BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
- return Boolean.valueOf(FacesTools.getInitParam(
- getViewAllPostsName()));
- }
-
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
- public Boolean getCommentsEnabled(Object request) {
- BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
- return Boolean.valueOf(FacesTools.getInitParam(
- getCommentsEnabledName()));
- }
-
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
- public Boolean getShowLinkToOriginalBlog(Object request) {
- BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
- return Boolean.valueOf(FacesTools.getInitParam(
- getShowLinkToOriginalBlogName()));
- }
-
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
- public Boolean getShowLinkToOriginalPost(Object request) {
- BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
- return Boolean.valueOf(FacesTools.getInitParam(
- getShowLinkToOriginalPostName()));
- }
-
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
- public Boolean getLinkPostsToOriginal(Object request) {
- BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
- return Boolean.valueOf(FacesTools.getInitParam(
- getLinkPostsToOriginalName()));
- }
-
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
- public Map getFeedLinks(Object request) {
- // TODO
- return Collections.EMPTY_MAP;
- }
-}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/configuration/PortletPreferencesBlogConfigurationService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,5 +1,6 @@
package org.jboss.blog.service.configuration;
+import org.jboss.blog.service.AbstractBlogService;
import org.jboss.blog.tools.BasicTools;
import org.jboss.blog.tools.PortletTools;
@@ -14,8 +15,8 @@
* @jmx.mbean
* @jboss.xmbean
*/
-public class PortletPreferencesBlogConfigurationService
- extends AbstractPreferencesBlogConfigurationService {
+public class PortletPreferencesBlogConfigurationService extends AbstractBlogService
+ implements BlogConfigurationService {
/**
* @jmx.managed-operation
* @jmx.managed-parameter type="java.lang.Object"
@@ -25,7 +26,7 @@
try {
return Integer.valueOf(PortletTools.getPortletPreference(
PortletTools.castToPortletRequest(this, request),
- getNumberOfPostsPerPageName()));
+ "numberOfPostsPerPage"));
} catch (NumberFormatException e) {
return new Integer(0);
}
@@ -39,7 +40,7 @@
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
PortletTools.castToPortletRequest(this, request),
- getViewPostsOnSeparatePageName()));
+ "viewPostsOnSeparatePage"));
}
/**
@@ -50,7 +51,7 @@
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
PortletTools.castToPortletRequest(this, request),
- getViewAllPostsName()));
+ "viewAllPosts"));
}
/**
@@ -61,7 +62,7 @@
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
PortletTools.castToPortletRequest(this, request),
- getCommentsEnabledName()));
+ "commentsEnabled"));
}
/**
@@ -72,7 +73,7 @@
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
PortletTools.castToPortletRequest(this, request),
- getShowLinkToOriginalBlogName()));
+ "showLinkToOriginalBlog"));
}
/**
@@ -83,7 +84,7 @@
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
PortletTools.castToPortletRequest(this, request),
- getShowLinkToOriginalPostName()));
+ "showLinkToOriginalPost"));
}
/**
@@ -94,24 +95,24 @@
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
return Boolean.valueOf(PortletTools.getPortletPreference(
PortletTools.castToPortletRequest(this, request),
- getLinkPostsToOriginalName()));
+ "linkPostsToOriginal"));
}
/**
* @jmx.managed-operation
* @jmx.managed-parameter type="java.lang.Object"
*/
- public Map getFeedLinks(Object request) {
+ public Map<String, String> getFeedLinks(Object request) {
BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
String[] links = PortletTools.getPortletMultiPreference(
PortletTools.castToPortletRequest(this, request),
- getFeedLinksName());
+ "feedLinks");
if (links == null) {
- return Collections.EMPTY_MAP;
+ return Collections.emptyMap();
}
- Map ret = new LinkedHashMap();
+ Map<String, String> ret = new LinkedHashMap<String, String>();
for (int i=0; i<links.length; i++) {
if (links[i] == null) {
continue;
@@ -126,7 +127,7 @@
String[] typeTokens = linkTokens[0].split("[,]");
for (int j=0; j<typeTokens.length; j++) {
- ret.put(typeTokens[j], BasicTools.replace(linkTokens[1], "${type}", typeTokens[j]));
+ ret.put(typeTokens[j], linkTokens[1].replace("${type}", typeTokens[j]));
}
}
Deleted: trunk/blog-core/src/java/org/jboss/blog/service/model/StoreModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/StoreModelService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/StoreModelService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,43 +0,0 @@
-package org.jboss.blog.service.model;
-
-import org.jboss.blog.service.AbstractBlogService;
-import org.jboss.blog.service.store.BlogStoreService;
-import org.jboss.blog.model.BlogModel;
-import org.jboss.blog.model.BlogModelDoesNotExistException;
-import org.jboss.blog.BlogName;
-
-/**
- * A blog model service which reads the blog model from the specified blog
- * store.
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- *
- * @jmx.mbean
- * @jboss.xmbean
- */
-public class StoreModelService extends AbstractBlogService implements BlogModelService {
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="org.jboss.blog.BlogName"
- */
- public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
- return storeService.retrieveBlogModel(name);
- }
-
- private BlogStoreService storeService;
-
- /**
- * @jmx.managed-attribute
- * @return The currently held blog store service.
- */
- public BlogStoreService getStoreService() {
- return storeService;
- }
-
- /**
- * @jmx.managed-attribute
- * @param storeService New blog store service.
- */
- public void setStoreService(BlogStoreService storeService) {
- this.storeService = storeService;
- }
-}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/caching/CachingBlogModelService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -29,7 +29,7 @@
private static Logger log = Logger.getLogger(CachingBlogModelService.class);
// Map BlogName -> lock for that blog name (an object for synchronization)
- private Map locks;
+ private Map<BlogName, BlogLock> locks;
// A thread used to update the models.
private Thread updateThread;
@@ -44,7 +44,7 @@
* @return A lock for the given blog name.
*/
private synchronized BlogLock getLock(BlogName name) {
- BlogLock ret = (BlogLock) locks.get(name);
+ BlogLock ret = locks.get(name);
if (ret == null) {
ret = new BlogLock();
locks.put(name, ret);
@@ -57,8 +57,8 @@
* Atomically gets a set of all blog names currently held in the cache.
* @return A set, being a copy of all blog names currently held in the cache.
*/
- private synchronized Set getLockNames() {
- return new HashSet(locks.keySet());
+ private synchronized Set<BlogName> getLockNames() {
+ return new HashSet<BlogName>(locks.keySet());
}
/**
@@ -122,10 +122,10 @@
}
// Getting all blog names.
- Set keys = getLockNames();
- for (Iterator iter = keys.iterator(); iter.hasNext();) {
+ Set<BlogName> keys = getLockNames();
+ for (Iterator<BlogName> iter = keys.iterator(); iter.hasNext();) {
long now = System.currentTimeMillis();
- BlogName name = (BlogName) iter.next();
+ BlogName name = iter.next();
BlogLock lock = getLock(name);
// We don't need to synchornize on the getLastUpdate(),
@@ -174,7 +174,7 @@
}
protected void startService() throws Exception {
- locks = new HashMap();
+ locks = new HashMap<BlogName, BlogLock>();
startUpdateThread();
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeBlogPost.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -4,6 +4,7 @@
import org.jboss.blog.model.impl.BlogCommentImpl;
import org.jboss.blog.model.impl.BlogAuthorImpl;
import org.jboss.blog.model.BlogAuthor;
+import org.jboss.blog.model.BlogComment;
import org.jboss.blog.tools.BasicTools;
import java.util.*;
@@ -19,14 +20,14 @@
*/
public class RomeBlogPost extends BlogPostImpl {
private boolean commentsInitialized;
- private List comments;
+ private List<BlogComment> comments;
public RomeBlogPost(BlogAuthor author, String title, String description, Date created,
- String link, String guid, Set categories, String commentLink) {
+ String link, String guid, Set<String> categories, String commentLink) {
super(author, title, description, created, link, guid, categories, commentLink, null);
}
- public List getComments() {
+ public List<BlogComment> getComments() {
if (!commentsInitialized) {
commentsInitialized = true;
@@ -39,12 +40,10 @@
SyndFeed inFeed;
inFeed = input.build(new XmlReader(new URL(getCommentLink()).openStream()));
- comments = new ArrayList();
+ comments = new ArrayList<BlogComment>();
String defaultAuthor = inFeed.getAuthor();
- for (Iterator iter = inFeed.getEntries().iterator(); iter.hasNext();) {
- SyndEntry post = (SyndEntry) iter.next();
-
+ for (SyndEntry post : ((List<SyndEntry>) inFeed.getEntries().iterator())) {
String author = post.getAuthor();
author = BasicTools.isEmpty(author) ? defaultAuthor : author;
comments.add(new BlogCommentImpl(
Modified: trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/model/rome/RomeParsingBlogModelService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -33,14 +33,14 @@
}
- private Set getStringCategories(List categories) {
+ private Set<String> getStringCategories(List<SyndCategory> categories) {
if (categories == null) {
return null;
}
- Set ret = new HashSet();
- for (Iterator iter = categories.iterator(); iter.hasNext();) {
- ret.add(((SyndCategory) iter.next()).getName());
+ Set<String> ret = new HashSet<String>();
+ for (SyndCategory cat : categories) {
+ ret.add(cat.getName());
}
return ret;
@@ -64,7 +64,8 @@
* @jmx.managed-operation
* @jmx.managed-parameter type="org.jboss.blog.BlogName"
*/
- public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
+ @SuppressWarnings("unchecked")
+ public BlogModel retrieveBlogModel(BlogName name) throws BlogModelDoesNotExistException {
if (name == null) {
throw new IllegalArgumentException("Blog name cannot be null.");
}
@@ -84,13 +85,11 @@
throw new BlogModelDoesNotExistException(e);
}
- List posts = new ArrayList();
+ List<RomeBlogPost> posts = new ArrayList<RomeBlogPost>();
String defaultAuthor = inFeed.getAuthor();
- for (Iterator iter = inFeed.getEntries().iterator(); iter.hasNext();) {
- SyndEntry post = (SyndEntry) iter.next();
-
+ for (SyndEntry post : ((List<SyndEntry>) inFeed.getEntries())) {
CommentRssModule commRssModule = (CommentRssModule)
post.getModule("http://wellformedweb.org/CommentAPI/");
String commentsRss = null;
@@ -108,13 +107,13 @@
post.getTitle(), getDescription(post),
post.getPublishedDate(), post.getLink(),
post.getUri(),
- Collections.unmodifiableSet(getStringCategories(post.getCategories())),
+ Collections.unmodifiableSet(getStringCategories((List<SyndCategory>) post.getCategories())),
commentsRss));
}
return new BlogModelImpl(new BlogAuthorImpl(inFeed.getAuthor(), inFeed.getAuthor(), ""),
inFeed.getTitle(), inFeed.getDescription(), inFeed.getLink(),
inFeed.getPublishedDate(), Collections.unmodifiableList(posts),
- Collections.unmodifiableSet(getStringCategories(inFeed.getCategories())));
+ Collections.unmodifiableSet(getStringCategories((List<SyndCategory>) inFeed.getCategories())));
}
}
Deleted: trunk/blog-core/src/java/org/jboss/blog/service/name/AbstractBlogNameService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/name/AbstractBlogNameService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/name/AbstractBlogNameService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,41 +0,0 @@
-package org.jboss.blog.service.name;
-
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.blog.service.AbstractBlogService;
-
-/**
- * @author Adam Warski (adamw at aster.pl)
- */
-public abstract class AbstractBlogNameService extends AbstractBlogService
- implements BlogNameService {
- private String idName;
- private String categoryName;
-
- /**
- * @jmx.managed-attribute
- */
- public String getIdName() {
- return idName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setIdName(String idName) {
- this.idName = idName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public String getCategoryName() {
- return categoryName;
- }
-
- /**
- * @jmx.managed-attribute
- */
- public void setCategoryName(String categoryName) {
- this.categoryName = categoryName;
- }
-}
Deleted: trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/name/InitParamsBlogNameService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,24 +0,0 @@
-package org.jboss.blog.service.name;
-
-import org.jboss.blog.BlogName;
-import org.jboss.blog.tools.BasicTools;
-import org.jboss.blog.tools.FacesTools;
-
-/**
- * A name service which reads the blog name from init parameters.
- * @author Adam Warski (adamw at aster.pl)
- *
- * @jmx.mbean
- * @jboss.xmbean
- */
-public class InitParamsBlogNameService extends AbstractBlogNameService {
- /**
- * @jmx.managed-operation
- * @jmx.managed-parameter type="java.lang.Object"
- */
- public BlogName retrieveBlogName(Object request) {
- BasicTools.assertNotNull(request, REQUEST_NULL_EX_MSG);
- return new BlogName(FacesTools.getInitParam(getIdName()),
- FacesTools.getInitParam(getCategoryName()));
- }
-}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/name/PortletPreferencesBlogNameService.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,6 +1,7 @@
package org.jboss.blog.service.name;
import org.jboss.blog.BlogName;
+import org.jboss.blog.service.AbstractBlogService;
import org.jboss.blog.tools.BasicTools;
import org.jboss.blog.tools.PortletTools;
@@ -21,7 +22,8 @@
* return-type="void"
* @jboss.xmbean
*/
-public class PortletPreferencesBlogNameService extends AbstractBlogNameService {
+public class PortletPreferencesBlogNameService extends AbstractBlogService
+ implements BlogNameService {
protected void startService() throws Exception {
@@ -40,7 +42,6 @@
PortletRequest req = PortletTools.castToPortletRequest(this, request);
- return new BlogName(PortletTools.getPortletPreference(req, getIdName()),
- PortletTools.getPortletPreference(req, getCategoryName()));
+ return new BlogName(PortletTools.getPortletPreference(req, "blogId"));
}
}
Modified: trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AuthorizationListener.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AuthorizationListener.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/AuthorizationListener.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -72,7 +72,7 @@
}
managedBean = variableResolver.resolveVariable(facesContext,methodInfo[0]);
- businessAction = managedBean.getClass().getMethod(methodInfo[1],null);
+ businessAction = managedBean.getClass().getMethod(methodInfo[1],(Class[]) null);
}
//start building the SecurityContext here for the Authorization System
Modified: trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/service/permissions/acl/JBossPortalUtil.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,9 +1,5 @@
package org.jboss.blog.service.permissions.acl;
-//core java
-import java.util.Iterator;
-import java.util.Set;
-
import javax.naming.InitialContext;
import javax.faces.context.FacesContext;
@@ -15,7 +11,6 @@
//import org.jboss.security.acl.User;
import org.jboss.portal.identity.UserModule;
-import org.jboss.portal.identity.MembershipModule;
/**
@@ -26,11 +21,11 @@
*/
public class JBossPortalUtil
{
- private static final String MEMBERSHIP_MODULE_JNDI_NAME = "java:portal/MembershipModule";
+ //private static final String MEMBERSHIP_MODULE_JNDI_NAME = "java:portal/MembershipModule";
//private static final String ROLE_MODULE_JNDI_NAME = "java:portal/RoleModule";
private static final String USER_MODULE_JNDI_NAME = "java:portal/UserModule";
- private static MembershipModule membershipModule;
+ //private static MembershipModule membershipModule;
//private static RoleModule roleModule;
private static UserModule userModule;
@@ -54,7 +49,7 @@
return userModule;
}
- private static synchronized MembershipModule getMembershipModule() throws Exception
+ /*private static synchronized MembershipModule getMembershipModule() throws Exception
{
if (membershipModule == null) {
InitialContext ctx = new InitialContext();
@@ -62,7 +57,7 @@
}
return membershipModule;
- }
+ }*/
/**/
Deleted: trunk/blog-core/src/java/org/jboss/blog/tools/FacesTools.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/tools/FacesTools.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/FacesTools.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,19 +0,0 @@
-package org.jboss.blog.tools;
-
-import javax.faces.context.FacesContext;
-
-/**
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-public class FacesTools {
- /**
- * Reads the given init parameter value..
- * @param initParamName Name of the init parameter to read.
- * @return Value of the given init parameter or null, if the init parameter
- * is not set.
- */
- public static String getInitParam(String initParamName) {
- return FacesContext.getCurrentInstance().getExternalContext().
- getInitParameter(initParamName);
- }
-}
Modified: trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/tools/UITools.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -3,7 +3,6 @@
import org.jboss.blog.BlogName;
import javax.faces.context.FacesContext;
-import javax.faces.application.FacesMessage;
import javax.portlet.RenderResponse;
import javax.portlet.PortletURL;
@@ -14,34 +13,15 @@
public static final String BLOG_VIEW = "blog_view";
public static final String POST_VIEW = "post_view";
- public static final String BLOG_EDIT = "blog_edit";
- public static final String BLOG_NEW = "blog_new";
- public static final String BLOG_DEL = "blog_del";
-
- public static final String POST_EDIT = "post_edit";
- public static final String POST_NEW = "post_new";
- public static final String POST_DEL = "post_del";
-
- public static final String COMMENT_DEL = "comment_del";
-
- 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 final String FROM_PARAM_NAME = "from";
public static void addInfoMessage(String message) {
- if (FacesContext.getCurrentInstance() != null) {
- FacesContext.getCurrentInstance().addMessage(null,
- new FacesMessage(FacesMessage.SEVERITY_INFO, message, ""));
- }
+ // TODO
}
public static void addErrorMessage(String message) {
- if (FacesContext.getCurrentInstance() != null) {
- FacesContext.getCurrentInstance().addMessage(null,
- new FacesMessage(FacesMessage.SEVERITY_ERROR, message, ""));
- }
+ // TODO
}
public static void addMessageBlogDoesntExist(BlogName blogName) {
Deleted: trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogEdit.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,171 +0,0 @@
-package org.jboss.blog.ui;
-
-import org.jboss.blog.model.BlogModel;
-import org.jboss.blog.model.BlogModelDoesNotExistException;
-import org.jboss.blog.model.impl.EmptyBlogModel;
-import org.jboss.blog.tools.UITools;
-import org.jboss.blog.tools.BasicTools;
-import org.jboss.blog.service.store.model.ModifiableBlogModel;
-import org.jboss.blog.service.store.model.BlogModelAlreadyExistsException;
-import org.jboss.blog.BlogName;
-
-import java.util.Date;
-
-/**
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-public class BlogEdit {
- private State state;
- private BlogView blogView;
-
- private boolean initDone;
-
- private String title;
- private String description;
-
- public BlogEdit() {
- initDone = false;
- }
-
- public String getTitle() {
- if (!initDone) { init(); }
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getDescription() {
- if (!initDone) { init(); }
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public State getState() {
- return state;
- }
-
- public void setState(State state) {
- this.state = state;
- }
-
- public BlogView getBlogView() {
- return blogView;
- }
-
- public void setBlogView(BlogView blogView) {
- this.blogView = blogView;
- }
-
- //
-
- private void init() {
- BlogModel model;
-
- try {
- model = BasicTools.getBlogService().getStoreService().retrieveBlogModel(
- blogView.getBlogName());
- } catch (BlogModelDoesNotExistException e) {
- model = new EmptyBlogModel();
- }
-
- title = model.getTitle();
- description = model.getDescription();
-
- initDone = true;
- }
-
- // Actions
-
- public String save() {
- try {
- ModifiableBlogModel mbm = BasicTools.getBlogService().getStoreService().retrieveBlogModel(
- blogView.getBlogName());
-
- boolean changed = false;
-
- if (!BasicTools.objectsEqual(title, mbm.getTitle())) {
- changed = true; mbm.setTitle(title); }
-
- if (!BasicTools.objectsEqual(description, mbm.getDescription())) {
- changed = true; mbm.setDescription(description); }
-
- if (changed) {
- UITools.addInfoMessage("Blog category data saved.");
- } else {
- UITools.addInfoMessage("No blog category data was modified.");
- }
- } catch (BlogModelDoesNotExistException e) {
- UITools.addMessageBlogDoesntExist(blogView.getBlogName());
- }
-
- return blogView.getReturnTo();
- }
-
- public String saveNew() {
- try {
- ModifiableBlogModel mbm = BasicTools.getBlogService().getStoreService().newBlogModel(
- getState().getSelectedBlogName());
-
- mbm.setAuthor(BasicTools.getBlogService().getStoreService().
- newBlogAuthor(getBlogView().getRequest()));
- mbm.setTitle(title);
- // TODO: sensible value here
- mbm.setLink("");
- mbm.setDescription(description);
- mbm.setCreated(new Date());
-
- BasicTools.getBlogService().getStoreService().saveNewBlogModel(mbm);
-
- UITools.addInfoMessage("New blog category created.");
- } catch (BlogModelAlreadyExistsException e) {
- UITools.addErrorMessage("Blog already exists: " + getState().getSelectedBlogName() + ".");
- }
-
- return UITools.BLOG_VIEW;
- }
-
- public String delete() {
- try {
- BlogName toDelete = getState().getSelectedBlogName();
-
- ModifiableBlogModel mbm = BasicTools.getBlogService().getStoreService().retrieveBlogModel(
- toDelete);
-
- BasicTools.getBlogService().getStoreService().deleteBlogModel(mbm);
-
- getState().setSelectedBlogName(null);
-
- UITools.addInfoMessage("Blog category deleted.");
-
- // If this was the last category with this id, we must return to the admin panel.
- if (BasicTools.getBlogService().getStoreService().retrieveAllCategories(toDelete).size() == 0) {
- return UITools.ADMIN_PANEL;
- } else {
- return UITools.ID_EDIT;
- }
- } catch (BlogModelDoesNotExistException e) {
- UITools.addMessageBlogDoesntExist(blogView.getBlogName());
-
- return UITools.ID_EDIT;
- } catch(Throwable t) {
- t.printStackTrace();
- throw new RuntimeException(t);
- }
-
- }
-
- public String backFromDelete() {
- getState().setSelectedBlogName(null);
-
- return UITools.ID_EDIT;
- }
-
- public String back() {
- return blogView.getReturnTo();
- }
-}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/BlogView.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -4,13 +4,13 @@
import org.jboss.blog.model.impl.EmptyBlogPost;
import org.jboss.blog.model.impl.EmptyBlogModel;
import org.jboss.blog.BlogName;
-import org.jboss.blog.service.store.model.ModifiableBlogPost;
-import org.jboss.blog.service.store.model.ModifiableBlogModel;
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.List;
import java.util.Map;
@@ -20,32 +20,11 @@
* @author Adam Warski (adamw at aster.pl)
*/
public class BlogView {
- public BlogView() {
-
- }
-
- // Faces-managed properties
- private UIData postsData;
private State state;
private Object postParam;
private Object fromParam;
-
- public UIData getPostsData() {
- return postsData;
- }
-
- public void setPostsData(UIData postsData) {
- this.postsData = postsData;
- }
-
- public State getState() {
- return state;
- }
-
- public void setState(State state) {
- this.state = state;
- }
-
+ private Object request;
+
// Cached properties
private BlogName blogName;
private BlogModel blogModel;
@@ -55,31 +34,35 @@
private Boolean viewAllPosts;
private Boolean commentsEnabled;
private Boolean postsExpandable;
- private Boolean blogModifiable;
private Boolean defaultBlog;
private Boolean showLinkToOriginalBlog;
private Boolean showLinkToOriginalPost;
private Boolean linkPostsToOriginal;
- private Map feedLinks;
+ 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 postsWithNext;
- // A list of posts to show in the current view.
- private List posts;
+ public BlogView(State state, Object request) {
+ super();
+ this.state = state;
+ this.request = request;
+ }
- protected Object getRequest() {
- return FacesContext.getCurrentInstance().getExternalContext().getRequest();
+ public State getState() {
+ return state;
}
- private void resetBlogData() {
- blogName = null;
- blogModel = null;
- blogModifiable = null;
- blogViewState = null;
- defaultBlog = null;
- }
+ public Object getRequest() {
+ return request;
+ }
+ // Cached properties
+
+
+ /* 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;
+ // A list of posts to show in the current view.
+ private List<? extends BlogPost> posts;
+
public BlogName getBlogName() {
if (blogName == null) {
// Blog name from the state has precedence over the default one.
@@ -177,7 +160,7 @@
return linkPostsToOriginal;
}
- public Map getFeedLinks() {
+ public Map<String, String> getFeedLinks() {
if (feedLinks == null) {
feedLinks = BasicTools.getBlogService().getConfigurationService().
getFeedLinks(getRequest());
@@ -203,16 +186,7 @@
return postsExpandable;
}
- public Boolean getBlogModifiable() {
- if (blogModifiable == null) {
- blogModifiable = Boolean.valueOf(BasicTools.getBlogService().getStoreService().
- retrieveBlogModifiable(getBlogName()));
- }
-
- return blogModifiable;
- }
-
- private List getPostsWithNext() {
+ private List<? extends BlogPost> getPostsWithNext() {
if (postsWithNext == null) {
postsWithNext = getBlogModel().getPosts(getFrom(), getTo()+1);
}
@@ -220,9 +194,9 @@
return postsWithNext;
}
- public List getPosts() {
+ public List<? extends BlogPost> getPosts() {
if (posts == null) {
- List postsWithNext = getPostsWithNext();
+ List<? extends BlogPost> postsWithNext = getPostsWithNext();
posts = postsWithNext.subList(0, Math.min(postsWithNext.size(),
getNumberOfPostsPerPage().intValue()));
}
@@ -326,17 +300,6 @@
return new EmptyBlogPost();
}
- ModifiableBlogModel getModifiableModel() throws BlogModelDoesNotExistException {
- return BasicTools.getBlogService().getStoreService().retrieveBlogModel(
- getBlogName());
- }
-
- ModifiableBlogPost getModifiableSelectedPost()
- throws BlogPostDoesNotExistException, BlogModelDoesNotExistException {
- return getModifiableModel().getModifiableBlogPostByTitleAsId(
- getSelectedPostTitleAsId());
- }
-
public BlogPost getSelectedPost() {
String titleAsId = getSelectedPostTitleAsId();
@@ -345,9 +308,8 @@
}
// First looking in the specified range.
- List posts = getPostsWithNext();
- for (int i=0; i<posts.size(); i++) {
- BlogPost current = (BlogPost) posts.get(i);
+ List<? extends BlogPost> posts = getPostsWithNext();
+ for (BlogPost current : posts) {
if (titleAsId.equals(current.getTitleAsId())) {
return current;
}
@@ -380,37 +342,6 @@
return UITools.BLOG_VIEW;
}
- public String postEditFromBlogView() {
- postSelect();
- exitFromBlogView();
-
- return UITools.POST_EDIT;
- }
-
- public String postEditFromPostView() {
- exitFromPostView();
-
- return UITools.POST_EDIT;
- }
-
- public String postNew() {
- exitFromBlogView();
-
- return UITools.POST_NEW;
- }
-
- public String blogEditFromBlogView() {
- exitFromBlogView();
-
- return UITools.BLOG_EDIT;
- }
-
- public String blogEditFromPostView() {
- exitFromPostView();
-
- return UITools.BLOG_EDIT;
- }
-
public String returnToDefault() {
getState().setSelectedBlogName(null);
resetBlogData();
@@ -429,14 +360,6 @@
setSelectedPostTitleAsId(null);
}
- private void exitFromBlogView() {
- getState().setReturnTo(UITools.BLOG_VIEW);
- }
-
- private void exitFromPostView() {
- getState().setReturnTo(UITools.POST_VIEW);
- }
-
String getReturnTo() {
String viewName = state.getReturnTo();
if ((viewName == null) || (UITools.BLOG_VIEW.equals(viewName))) {
Deleted: trunk/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/CommentEdit.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,145 +0,0 @@
-package org.jboss.blog.ui;
-
-import org.jboss.blog.tools.UITools;
-import org.jboss.blog.tools.BasicTools;
-import org.jboss.blog.service.store.model.ModifiableBlogPost;
-import org.jboss.blog.service.store.model.ModifiableBlogComment;
-import org.jboss.blog.model.*;
-import org.jboss.blog.model.impl.EmptyBlogComment;
-
-import javax.faces.component.UIData;
-import java.util.*;
-
-/**
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-public class CommentEdit {
- private BlogView blogView;
- private UIData commentsData;
-
- private String title;
- private String description;
-
- public CommentEdit() {
-
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public BlogView getBlogView() {
- return blogView;
- }
-
- public void setBlogView(BlogView blogView) {
- this.blogView = blogView;
- }
-
- public UIData getCommentsData() {
- return commentsData;
- }
-
- public void setCommentsData(UIData commentsData) {
- this.commentsData = commentsData;
- }
-
- // Actions
-
- private ModifiableBlogComment getComment() throws BlogCommentDoesNotExistException,
- BlogModelDoesNotExistException, BlogPostDoesNotExistException {
- ModifiableBlogPost post = blogView.getModifiableSelectedPost();
-
- BlogComment notModifiableComment = (BlogComment) commentsData.getRowData();
- return post.getModifiableBlogComment(notModifiableComment);
- }
-
- private ModifiableBlogComment getSelectedModifiableComment()
- throws BlogModelDoesNotExistException, BlogPostDoesNotExistException, BlogCommentDoesNotExistException {
- return blogView.getModifiableSelectedPost().getModifiableBlogComment(
- blogView.getBlogViewState().getSelectedCommentId());
- }
-
- public BlogComment getSelectedComment() {
- try {
- return getSelectedModifiableComment();
- } catch (Exception e) {
- return new EmptyBlogComment();
- }
- }
-
- public String saveNew() {
- try {
- ModifiableBlogComment comment;
-
- comment = BasicTools.getBlogService().getStoreService().newBlogComment();
-
- comment.setAuthor(BasicTools.getBlogService().getStoreService().
- newBlogAuthor(getBlogView().getRequest()));
-
- comment.setTitle(title);
- comment.setDescription(description);
- comment.setCreated(new Date());
-
- ModifiableBlogPost post = blogView.getModifiableSelectedPost();
-
- post.addComment(comment);
-
- UITools.addInfoMessage("New comment added.");
- } catch (BlogModelDoesNotExistException e) {
- UITools.addMessageBlogDoesntExist(blogView.getBlogName());
- } catch (BlogPostDoesNotExistException e) {
- UITools.addMessagePostDoesntExist(blogView.getSelectedPostTitleAsId());
- }
-
- return null;
- }
-
- public String delete() {
- try {
- ModifiableBlogComment comment = getSelectedModifiableComment();
-
- BasicTools.getBlogService().getStoreService().deleteComment(comment);
-
- UITools.addInfoMessage("Comment deleted.");
- } catch (BlogModelDoesNotExistException e) {
- UITools.addMessageBlogDoesntExist(blogView.getBlogName());
- } catch (BlogPostDoesNotExistException e) {
- UITools.addMessagePostDoesntExist(blogView.getSelectedPostTitleAsId());
- } catch (BlogCommentDoesNotExistException e) {
- UITools.addMessageCommentDoesntExist();
- }
-
- return UITools.POST_VIEW;
- }
-
- public String commentDelete() {
- try {
- blogView.getBlogViewState().setSelectedCommentId(getComment().getCommentId());
- } catch (BlogModelDoesNotExistException e) {
- UITools.addMessageBlogDoesntExist(blogView.getBlogName());
- } catch (BlogPostDoesNotExistException e) {
- UITools.addMessagePostDoesntExist(blogView.getSelectedPostTitleAsId());
- } catch (BlogCommentDoesNotExistException e) {
- UITools.addMessageCommentDoesntExist();
- }
-
- return UITools.COMMENT_DEL;
- }
-
- public String backFromDelete() {
- return UITools.POST_VIEW;
- }
-}
Deleted: trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/IdEdit.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,175 +0,0 @@
-package org.jboss.blog.ui;
-
-import org.jboss.blog.tools.UITools;
-import org.jboss.blog.tools.BasicTools;
-import org.jboss.blog.BlogName;
-
-import javax.faces.model.SelectItem;
-import java.util.List;
-import java.util.Iterator;
-import java.util.ArrayList;
-
-/**
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-public class IdEdit {
- private State state;
-
- private List rawIds;
- private List ids;
- private List categories;
-
- private String newId;
- private String existingId;
-
- private String newCategory;
- private String existingCategory;
- private String deleteCategory;
-
- private Boolean categoryExists;
-
- public IdEdit() {
-
- }
-
- public State getState() {
- return state;
- }
-
- public void setState(State state) {
- this.state = state;
- }
-
- private void populateRawIds() {
- if (rawIds == null) {
- // TODO: filter with permissions of the logged in person
- rawIds = BasicTools.getBlogService().getStoreService().retrieveAllBlogs();
- }
- }
-
- public List getIds() {
- if (ids == null) {
- populateRawIds();
- ids = new ArrayList();
-
- for (Iterator iter = rawIds.iterator(); iter.hasNext();) {
- BlogName next = (BlogName) iter.next();
- ids.add(new SelectItem(next.getId(), next.getId()));
- }
- }
-
- return ids;
- }
-
- public List getCategories() {
- if (categories == null) {
- // TODO: filter with permissions of the logged in person
- List rawCategories = BasicTools.getBlogService().getStoreService()
- .retrieveAllCategories(new BlogName(getState().getSelectedBlogId(), null));
- categories = new ArrayList();
-
- for (Iterator iter = rawCategories.iterator(); iter.hasNext();) {
- BlogName next = (BlogName) iter.next();
- categories.add(new SelectItem(next.getCategory(), next.getCategory()));
- }
- }
-
- return categories;
- }
-
- public Boolean getCategoryExists() {
- if (categoryExists == null) {
- categoryExists = Boolean.valueOf(getCategories().size() > 0);
- }
-
- return categoryExists;
- }
-
- public String getNewId() {
- return newId;
- }
-
- public void setNewId(String newId) {
- this.newId = newId;
- }
-
- public String getExistingId() {
- return existingId;
- }
-
- public void setExistingId(String existingId) {
- this.existingId = existingId;
- }
-
- public String getNewCategory() {
- return newCategory;
- }
-
- public void setNewCategory(String newCategory) {
- this.newCategory = newCategory;
- }
-
- public String getExistingCategory() {
- return existingCategory;
- }
-
- public void setExistingCategory(String existingCategory) {
- this.existingCategory = existingCategory;
- }
-
- public String getDeleteCategory() {
- return deleteCategory;
- }
-
- public void setDeleteCategory(String deleteCategory) {
- this.deleteCategory = deleteCategory;
- }
-
- // Actions
-
- public String editExisting() {
- getState().setSelectedBlogId(getExistingId());
-
- return UITools.ID_EDIT;
- }
-
- public String editNew() {
- // Checking if the new id is not empty.
- if (BasicTools.isEmpty(getNewId())) {
- UITools.addErrorMessage("New blog id cannot be null.");
- return null;
- }
-
- // And if it doesn't already exist.
- populateRawIds();
- if (rawIds.contains(new BlogName(getNewId(), null))) {
- UITools.addErrorMessage("Blog id already exists.");
- return null;
- }
-
- getState().setSelectedBlogId(getNewId());
-
- return UITools.ID_EDIT;
- }
-
- public String newCategory() {
- getState().setSelectedBlogName(new BlogName(getState().getSelectedBlogId(),
- getNewCategory()));
-
- return UITools.BLOG_NEW;
- }
-
- public String editCategory() {
- getState().setSelectedBlogName(new BlogName(getState().getSelectedBlogId(),
- getExistingCategory()));
-
- return UITools.BLOG_VIEW;
- }
-
- public String deleteCategory() {
- getState().setSelectedBlogName(new BlogName(getState().getSelectedBlogId(),
- getDeleteCategory()));
-
- return UITools.BLOG_DEL;
- }
-}
Deleted: trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/PostEdit.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,251 +0,0 @@
-package org.jboss.blog.ui;
-
-import org.jboss.blog.model.BlogModelDoesNotExistException;
-import org.jboss.blog.model.BlogPost;
-import org.jboss.blog.model.BlogPostDoesNotExistException;
-import org.jboss.blog.tools.UITools;
-import org.jboss.blog.tools.BasicTools;
-import org.jboss.blog.service.store.model.ModifiableBlogModel;
-import org.jboss.blog.service.store.model.ModifiableBlogPost;
-import org.jboss.blog.BlogName;
-
-import java.util.*;
-
-/**
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-public class PostEdit {
- private State state;
- private BlogView blogView;
-
- private boolean initDone;
-
- private String title;
- private String description;
-
- private List blogs;
-
- public PostEdit() {
- initDone = false;
- }
-
- public String getTitle() {
- if (!initDone) { init(); }
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getDescription() {
- if (!initDone) { init(); }
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public State getState() {
- return state;
- }
-
- public void setState(State state) {
- this.state = state;
- }
-
- public BlogView getBlogView() {
- return blogView;
- }
-
- public void setBlogView(BlogView blogView) {
- this.blogView = blogView;
- }
-
- public List getBlogs() {
- if (blogs == null) {
- List blogNames = BasicTools.getBlogService().getStoreService().retrieveAllCategories(
- blogView.getBlogName());
- blogs = new ArrayList();
-
- // Constructing a set of category names to which the post currently belongs.
- Set currentCategories;
- if (blogView.getSelectedPostTitleAsId() == null) {
- currentCategories = new HashSet();
- currentCategories.add(blogView.getBlogName().getCategory());
- } else {
- currentCategories = blogView.getSelectedPost().getCategories();
- }
-
- for (Iterator iter=blogNames.iterator(); iter.hasNext();) {
- blogs.add(new SelectableBlogName((BlogName) iter.next(), currentCategories));
- }
- }
-
- return blogs;
- }
-
- //
-
- private void init() {
- if (blogView.getSelectedPostTitleAsId() != null) {
- BlogPost post = blogView.getSelectedPost();
-
- title = post.getTitle();
- description = post.getDescription();
- }
-
- initDone = true;
- }
-
- // Actions
-
- private Set getCurrentCategories() {
- Set currentCategories = new HashSet();
- if (blogView.getSelectedPostTitleAsId() == null) {
- currentCategories.add(blogView.getBlogName());
- } else {
- String id = blogView.getBlogName().getId();
- for (Iterator iter = blogView.getSelectedPost().getCategories().iterator();
- iter.hasNext();) {
- currentCategories.add(new BlogName(id, (String) iter.next()));
- }
- }
-
- return currentCategories;
- }
-
- private Set getSelectedCategories() {
- List blogs = getBlogs();
- Set selected = new HashSet();
- for (Iterator iter = blogs.iterator(); iter.hasNext();) {
- SelectableBlogName sbn = (SelectableBlogName) iter.next();
- if (sbn.isSelected()) {
- selected.add(sbn.getBlogName());
- }
- }
-
- return selected;
- }
-
- public String saveNew() {
- Set selectedCategories = getSelectedCategories();
- if (selectedCategories.size() == 0) {
- UITools.addErrorMessage("You must select at least one category.");
- return null;
- }
-
- try {
- ModifiableBlogPost post;
-
- post = BasicTools.getBlogService().getStoreService().newBlogPost();
-
- post.setAuthor(BasicTools.getBlogService().getStoreService().
- newBlogAuthor(getBlogView().getRequest()));
-
- post.setTitle(title);
- // TODO: sensible value go here
- post.setLink("");
- post.setDescription(description);
- post.setGuid("");
- post.setCreated(new Date());
- post.setCommentLink("");
-
- // Adding the post to all selected categories.
- // TODO permissions for category-level? Both here, save() and post_mod.xhtml
- for (Iterator iter = selectedCategories.iterator(); iter.hasNext();) {
- ModifiableBlogModel blog = BasicTools.getBlogService().getStoreService().retrieveBlogModel(
- (BlogName) iter.next());
- blog.addPost(post);
- }
-
- UITools.addInfoMessage("New post saved.");
- } catch (BlogModelDoesNotExistException e) {
- UITools.addMessageBlogDoesntExist(blogView.getBlogName());
- }
-
- return UITools.BLOG_VIEW;
- }
-
- public String save() {
- // Calculating the added & removed categories sets.
- Set selectedCategories = getSelectedCategories();
- if (selectedCategories.size() == 0) {
- return UITools.POST_DEL;
- }
-
- Set currentCategories = getCurrentCategories();
-
- Set addedCategories = new HashSet(selectedCategories);
- addedCategories.removeAll(currentCategories);
-
- Set removedCategories = new HashSet(currentCategories);
- removedCategories.removeAll(selectedCategories);
-
- try {
- ModifiableBlogModel model;
- ModifiableBlogPost post = blogView.getModifiableSelectedPost();
-
- boolean changed = false;
-
- // Changing post properties.
- if (!BasicTools.objectsEqual(title, post.getTitle())) {
- changed = true; post.setTitle(title); }
-
- if (!BasicTools.objectsEqual(description, post.getDescription())) {
- changed = true; post.setDescription(description); }
-
- // Adding & removing posts from categories.
- for (Iterator iter = addedCategories.iterator(); iter.hasNext();) {
- changed = true;
- model = BasicTools.getBlogService().getStoreService().retrieveBlogModel(
- (BlogName) iter.next());
- model.addPost(post);
- }
-
- for (Iterator iter = removedCategories.iterator(); iter.hasNext();) {
- changed = true;
- model = BasicTools.getBlogService().getStoreService().retrieveBlogModel(
- (BlogName) iter.next());
- model.removePost(post);
- }
-
- if (changed) {
- UITools.addInfoMessage("Post data saved.");
- } else {
- UITools.addInfoMessage("No post data was modified.");
- }
- } catch (BlogModelDoesNotExistException e) {
- UITools.addMessageBlogDoesntExist(blogView.getBlogName());
- } catch (BlogPostDoesNotExistException e) {
- UITools.addMessagePostDoesntExist(blogView.getSelectedPostTitleAsId());
- }
-
- return blogView.getReturnTo();
- }
-
- public String delete() {
- try {
- ModifiableBlogModel model = BasicTools.getBlogService().getStoreService().retrieveBlogModel(
- blogView.getBlogName());
- ModifiableBlogPost post = model.getModifiableBlogPostByTitleAsId(
- blogView.getSelectedPostTitleAsId());
-
- BasicTools.getBlogService().getStoreService().deletePost(post);
-
- UITools.addInfoMessage("Post deleted.");
- } catch (BlogModelDoesNotExistException e) {
- UITools.addMessageBlogDoesntExist(blogView.getBlogName());
- } catch (BlogPostDoesNotExistException e) {
- UITools.addMessagePostDoesntExist(blogView.getSelectedPostTitleAsId());
- }
-
- return UITools.BLOG_VIEW;
-
- }
-
- public String back() {
- return blogView.getReturnTo();
- }
-}
\ No newline at end of file
Deleted: trunk/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/SelectableBlogName.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,35 +0,0 @@
-package org.jboss.blog.ui;
-
-import org.jboss.blog.BlogName;
-
-import java.util.Set;
-
-/**
- *
- * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
- */
-public class SelectableBlogName {
- private BlogName blogName;
- private boolean selected;
-
- public SelectableBlogName(BlogName blogName, Set currentCategories) {
- this.blogName = blogName;
- this.selected = currentCategories.contains(blogName.getCategory());
- }
-
- public String getCategory() {
- return blogName.getCategory();
- }
-
- public boolean isSelected() {
- return selected;
- }
-
- public void setSelected(boolean selected) {
- this.selected = selected;
- }
-
- public BlogName getBlogName() {
- return blogName;
- }
-}
Modified: trunk/blog-core/src/java/org/jboss/blog/ui/State.java
===================================================================
--- trunk/blog-core/src/java/org/jboss/blog/ui/State.java 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/java/org/jboss/blog/ui/State.java 2007-06-18 19:02:23 UTC (rev 118)
@@ -12,7 +12,7 @@
*/
public class State {
// Map BlogName --> BlogViewState.
- private Map blogViewStates;
+ private Map<BlogName, BlogViewState> blogViewStates;
private String selectedBlogId;
private BlogName selectedBlogName;
@@ -20,11 +20,11 @@
private String returnTo;
public State() {
- blogViewStates = new HashMap();
+ blogViewStates = new HashMap<BlogName, BlogViewState>();
}
public BlogViewState getBlogViewState(BlogName blogName) {
- BlogViewState ret = (BlogViewState) blogViewStates.get(blogName);
+ BlogViewState ret = blogViewStates.get(blogName);
if (ret == null) {
ret = new BlogViewState();
blogViewStates.put(blogName, ret);
Modified: trunk/blog-core/src/web/WEB-INF/blog-object.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/blog-object.xml 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/web/WEB-INF/blog-object.xml 2007-06-18 19:02:23 UTC (rev 118)
@@ -6,63 +6,11 @@
<page>
<page-name>blog0</page-name>
<window>
- <window-name>SimpleBlogPortletJBossWindow</window-name>
- <instance-ref>SimpleBlogPortletJBossInstance</instance-ref>
+ <window-name>BlogViewPortletJBossWindow</window-name>
+ <instance-ref>BlogViewPortletJBossInstance</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>
- <instance-ref>BlogPortletRedHatInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <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>blog2</page-name>
- <window>
- <window-name>BlogPortletDefaultWindow</window-name>
- <instance-ref>BlogPortletDefaultInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>BlogPortletPrivateWindow</window-name>
- <instance-ref>BlogPortletPrivateInstance</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>blog3</page-name>
- <window>
- <window-name>BlogPortletDefaultWindow</window-name>
- <instance-ref>BlogPortletDefaultInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
- </deployment>-->
</deployments>
\ No newline at end of file
Deleted: trunk/blog-core/src/web/WEB-INF/blog.taglib.off.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/blog.taglib.off.xml 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/web/WEB-INF/blog.taglib.off.xml 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC
- "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
- "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
- <namespace>http://www.jboss.org/portal/jbossblog</namespace>
- <tag>
- <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>
-
- <tag>
- <tag-name>fromLink</tag-name>
- <source>tags/from_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>
-
- <function>
- <function-name>fromLink</function-name>
- <function-class>org.jboss.blog.tools.UITools</function-class>
- <function-signature>java.lang.String createFromLink(java.lang.Integer)</function-signature>
- </function>
-</facelet-taglib>
\ No newline at end of file
Deleted: trunk/blog-core/src/web/WEB-INF/faces-config.off.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/faces-config.off.xml 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/web/WEB-INF/faces-config.off.xml 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,225 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
- <application>
- <!-- JBoss Portal-facelets integration -->
- <property-resolver>org.jboss.portal.faces.el.DelegatingPropertyResolver</property-resolver>
-
- <!--<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>-->
- <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
- <locale-config>
- <default-locale>en</default-locale>
- </locale-config>
- <action-listener>org.jboss.blog.service.permissions.acl.AuthorizationListener</action-listener>
- </application>
-
- <managed-bean>
- <managed-bean-name>blogView</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.BlogView</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>state</property-name>
- <value>#{state}</value>
- </managed-property>
- <managed-property>
- <property-name>postParam</property-name>
- <value>#{param.post}</value>
- </managed-property>
- <managed-property>
- <property-name>fromParam</property-name>
- <value>#{param.from}</value>
- </managed-property>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>blogEdit</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.BlogEdit</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>state</property-name>
- <value>#{state}</value>
- </managed-property>
- <managed-property>
- <property-name>blogView</property-name>
- <value>#{blogView}</value>
- </managed-property>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>postEdit</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.PostEdit</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>state</property-name>
- <value>#{state}</value>
- </managed-property>
- <managed-property>
- <property-name>blogView</property-name>
- <value>#{blogView}</value>
- </managed-property>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>idEdit</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.IdEdit</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>state</property-name>
- <value>#{state}</value>
- </managed-property>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>commentEdit</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.CommentEdit</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>blogView</property-name>
- <value>#{blogView}</value>
- </managed-property>
- </managed-bean>
-
- <managed-bean>
- <managed-bean-name>state</managed-bean-name>
- <managed-bean-class>org.jboss.blog.ui.State</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
-
- <!-- Post/ blog view -->
- <navigation-rule>
- <from-view-id>*</from-view-id>
- <navigation-case>
- <from-outcome>blog_view</from-outcome>
- <to-view-id>/views/blog_view.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>*</from-view-id>
- <navigation-case>
- <from-outcome>post_view</from-outcome>
- <to-view-id>/views/post_view.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- Post edit/new/del -->
- <navigation-rule>
- <from-view-id>/views/blog_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>post_edit</from-outcome>
- <to-view-id>/views/post_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/post_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>post_edit</from-outcome>
- <to-view-id>/views/post_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/blog_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>post_new</from-outcome>
- <to-view-id>/views/post_new.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/post_edit.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>post_del</from-outcome>
- <to-view-id>/views/post_del.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- Comment del -->
-
- <navigation-rule>
- <from-view-id>/views/post_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>comment_del</from-outcome>
- <to-view-id>/views/comment_del.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- Admin -->
- <navigation-rule>
- <from-view-id>/views/blog_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>admin_panel</from-outcome>
- <to-view-id>/views/admin_panel.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/admin_panel.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>id_edit</from-outcome>
- <to-view-id>/views/id_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/id_edit.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>admin_panel</from-outcome>
- <to-view-id>/views/admin_panel.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- Blog edit/new/del -->
- <navigation-rule>
- <from-view-id>/views/blog_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>blog_edit</from-outcome>
- <to-view-id>/views/blog_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/post_view.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>blog_edit</from-outcome>
- <to-view-id>/views/blog_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/id_edit.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>blog_new</from-outcome>
- <to-view-id>/views/blog_new.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/id_edit.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>blog_del</from-outcome>
- <to-view-id>/views/blog_del.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/blog_del.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>id_edit</from-outcome>
- <to-view-id>/views/id_edit.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <navigation-rule>
- <from-view-id>/views/blog_del.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>admin_panel</from-outcome>
- <to-view-id>/views/admin_panel.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-</faces-config>
Modified: trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/web/WEB-INF/jboss-portlet.xml 2007-06-18 19:02:23 UTC (rev 118)
@@ -1,14 +1,8 @@
<portlet-app>
<portlet>
- <portlet-name>BlogPortlet</portlet-name>
+ <portlet-name>BlogViewPortlet</portlet-name>
<transaction>
<trans-attribute>Required</trans-attribute>
</transaction>
</portlet>
- <portlet>
- <portlet-name>SimpleBlogPortlet</portlet-name>
- <transaction>
- <trans-attribute>Required</trans-attribute>
- </transaction>
- </portlet>
</portlet-app>
\ No newline at end of file
Modified: trunk/blog-core/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/portlet-instances.xml 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/web/WEB-INF/portlet-instances.xml 2007-06-18 19:02:23 UTC (rev 118)
@@ -3,18 +3,14 @@
<deployment>
<if-exists>overwrite</if-exists>
<instance>
- <instance-id>SimpleBlogPortletJBossInstance</instance-id>
- <portlet-ref>SimpleBlogPortlet</portlet-ref>
+ <instance-id>BlogViewPortletJBossInstance</instance-id>
+ <portlet-ref>BlogViewPortlet</portlet-ref>
<preferences>
<preference>
<name>blogId</name>
- <value>http://blogs.jboss.com/blog/?flavor=rss2le </value>
+ <value>http://blogs.jboss.com/blog/?flavor=rss2</value>
</preference>
<preference>
- <name>blogCategory</name>
- <value></value>
- </preference>
- <preference>
<name>numberOfPostsPerPage</name>
<value>4</value>
</preference>
@@ -45,178 +41,4 @@
</preferences>
</instance>
</deployment>
-
- <!--<deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>BlogPortletRedHatInstance</instance-id>
- <portlet-ref>BlogPortlet</portlet-ref>
- <preferences>
- <preference>
- <name>blogId</name>
- <value>http://finance.yahoo.com/rss/headline?s=rhat</value>
- </preference>
- <preference>
- <name>blogCategory</name>
- <value></value>
- </preference>
- <preference>
- <name>numberOfPostsPerPage</name>
- <value>5</value>
- </preference>
- <preference>
- <name>viewPostsOnSeparatePage</name>
- <value>false</value>
- </preference>
- <preference>
- <name>commentsEnabled</name>
- <value>false</value>
- </preference>
- <preference>
- <name>showLinkToOriginalBlog</name>
- <value>true</value>
- </preference>
- <preference>
- <name>showLinkToOriginalPost</name>
- <value>false</value>
- </preference>
- <preference>
- <name>linkPostsToOriginal</name>
- <value>true</value>
- </preference>
- <preference>
- <name>feedLinks</name>
- <value>rss2,rdf:http://somesite.com/${type}/feed</value>
- <value>atom:http://anothersite.com/${type}/anotherfeed</value>
- </preference>
- </preferences>
- </instance>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>BlogPortletJBossInstance</instance-id>
- <portlet-ref>BlogPortlet</portlet-ref>
- <preferences>
- <preference>
- <name>blogId</name>
- <value>http://jboss.org/jbossBlog/blog/?flavor=rss2</value>
- </preference>
- <preference>
- <name>blogCategory</name>
- <value></value>
- </preference>
- <preference>
- <name>numberOfPostsPerPage</name>
- <value>4</value>
- </preference>
- <preference>
- <name>viewPostsOnSeparatePage</name>
- <value>true</value>
- </preference>
- <preference>
- <name>commentsEnabled</name>
- <value>false</value>
- </preference>
- <preference>
- <name>showLinkToOriginalBlog</name>
- <value>true</value>
- </preference>
- <preference>
- <name>showLinkToOriginalPost</name>
- <value>true</value>
- </preference>
- <preference>
- <name>linkPostsToOriginal</name>
- <value>false</value>
- </preference>
- <preference>
- <name>feedLinks</name>
- <value>rss2:http://xsite.com/${type}/feed</value>
- </preference>
- </preferences>
- </instance>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>BlogPortletDefaultInstance</instance-id>
- <portlet-ref>BlogPortlet</portlet-ref>
- <preferences>
- <preference>
- <name>blogId</name>
- <value>default</value>
- </preference>
- <preference>
- <name>blogCategory</name>
- <value></value>
- </preference>
- <preference>
- <name>numberOfPostsPerPage</name>
- <value>1</value>
- </preference>
- <preference>
- <name>viewPostsOnSeparatePage</name>
- <value>true</value>
- </preference>
- <preference>
- <name>commentsEnabled</name>
- <value>true</value>
- </preference>
- <preference>
- <name>showLinkToOriginalBlog</name>
- <value>false</value>
- </preference>
- <preference>
- <name>showLinkToOriginalPost</name>
- <value>false</value>
- </preference>
- <preference>
- <name>linkPostsToOriginal</name>
- <value>false</value>
- </preference>
- </preferences>
- </instance>
- </deployment>
- <deployment>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-id>BlogPortletPrivateInstance</instance-id>
- <portlet-ref>BlogPortlet</portlet-ref>
- <preferences>
- <preference>
- <name>blogId</name>
- <value>default</value>
- </preference>
- <preference>
- <name>blogCategory</name>
- <value>private</value>
- </preference>
- <preference>
- <name>numberOfPostsPerPage</name>
- <value>5</value>
- </preference>
- <preference>
- <name>viewPostsOnSeparatePage</name>
- <value>true</value>
- </preference>
- <preference>
- <name>commentsEnabled</name>
- <value>true</value>
- </preference>
- <preference>
- <name>showLinkToOriginalBlog</name>
- <value>false</value>
- </preference>
- <preference>
- <name>showLinkToOriginalPost</name>
- <value>false</value>
- </preference>
- <preference>
- <name>linkPostsToOriginal</name>
- <value>false</value>
- </preference>
- </preferences>
- </instance>
- </deployment>-->
</deployments>
\ No newline at end of file
Modified: trunk/blog-core/src/web/WEB-INF/portlet.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/portlet.xml 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/web/WEB-INF/portlet.xml 2007-06-18 19:02:23 UTC (rev 118)
@@ -2,68 +2,9 @@
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
- <!--<portlet>
- <portlet-name>BlogPortlet</portlet-name>
- <portlet-class>org.jboss.blog.portlet.BlogFacesPortlet</portlet-class>
- <init-param>
- <name>default-view</name>
- <value>/views/blog_view.xhtml</value>
- </init-param>
- <expiration-cache>0</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <supported-locale>en</supported-locale>
- <portlet-info>
- <title>Blog portlet</title>
- </portlet-info>
- <portlet-preferences>
- <preference>
- <name>blogId</name>
- <value>http://finance.yahoo.com/rss/headline?s=rhat</value>
- </preference>
- <preference>
- <name>blogCategory</name>
- <value></value>
- </preference>
- <preference>
- <name>numberOfPostsPerPage</name>
- <value>10</value>
- </preference>
- <preference>
- <name>viewPostsOnSeparatePage</name>
- <value>true</value>
- </preference>
- <preference>
- <name>commentsEnabled</name>
- <value>false</value>
- </preference>
- <preference>
- <name>showLinkToOriginalBlog</name>
- <value>false</value>
- </preference>
- <preference>
- <name>showLinkToOriginalPost</name>
- <value>false</value>
- </preference>
- <preference>
- <name>linkPostsToOriginal</name>
- <value>false</value>
- </preference>
- <preference>
- <name>viewAllPosts</name>
- <value>false</value>
- </preference>
- <preference>
- <name>feedLinks</name>
- </preference>
- </portlet-preferences>
- </portlet>-->
-
<portlet>
- <portlet-name>SimpleBlogPortlet</portlet-name>
- <portlet-class>org.jboss.blog.portlet.simple.BlogPortlet</portlet-class>
+ <portlet-name>BlogViewPortlet</portlet-name>
+ <portlet-class>org.jboss.blog.portlet.BlogViewPortlet</portlet-class>
<init-param>
<name>jspPrefix</name>
<value>/</value>
@@ -75,7 +16,7 @@
</supports>
<supported-locale>en</supported-locale>
<portlet-info>
- <title>Simple blog portlet</title>
+ <title>Blog view portlet</title>
</portlet-info>
<portlet-preferences>
<preference>
@@ -83,10 +24,6 @@
<value>http://finance.yahoo.com/rss/headline?s=rhat</value>
</preference>
<preference>
- <name>blogCategory</name>
- <value></value>
- </preference>
- <preference>
<name>numberOfPostsPerPage</name>
<value>10</value>
</preference>
Modified: trunk/blog-core/src/web/WEB-INF/web.xml
===================================================================
--- trunk/blog-core/src/web/WEB-INF/web.xml 2007-05-17 21:36:51 UTC (rev 117)
+++ trunk/blog-core/src/web/WEB-INF/web.xml 2007-06-18 19:02:23 UTC (rev 118)
@@ -3,71 +3,5 @@
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <!-- Use Documents Saved as *.xhtml
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param> -->
-
- <!-- Special Debug Output for Development
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/blog.taglib.xml</param-value>
- </context-param> -->
-
- <!-- Servlet environment -->
- <!--<context-param>
- <param-name>blogId</param-name>
- <param-value>id0</param-value>
- </context-param>
- <context-param>
- <param-name>blogCategory</param-name>
- <param-value>cat0</param-value>
- </context-param>
- <context-param>
- <param-name>numberOfPostsPerPage</param-name>
- <param-value>5</param-value>
- </context-param>
- <context-param>
- <param-name>viewPostsOnSeparatePage</param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <param-name>viewAllPosts</param-name>
- <param-value>false</param-value>
- </context-param>
- <context-param>
- <param-name>commentsEnabled</param-name>
- <param-value>true</param-value>
- </context-param>-->
-
- <!--<filter>
- <filter-name>Hibernate Session Filter</filter-name>
- <filter-class>org.jboss.blog.service.store.hibernate.HibernateSessionFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>Hibernate Session Filter</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
-
- <listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping> -->
+
</web-app>
More information about the jboss-cvs-commits
mailing list