[jboss-svn-commits] JBL Code SVN: r30862 - in labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums: feeds and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Dec 29 17:39:46 EST 2009
Author: sviluppatorefico
Date: 2009-12-29 17:39:45 -0500 (Tue, 29 Dec 2009)
New Revision: 30862
Modified:
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ForumsModule.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/feeds/FeedsServlet.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/BaseController.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/DownloadFilter.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/SplitTopic.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/TopicWatchController.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/event/FloodControlListener.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/view/ViewTopic.java
Log:
JPA bug fixing
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ForumsModule.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ForumsModule.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ForumsModule.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -550,7 +550,7 @@
* @return DOCUMENT_ME
* @throws ModuleException DOCUMENT_ME
*/
- List findPostsByTopicId(Integer topicID)
+ List findPostsByTopicId(Topic topic)
throws ModuleException;
/**
@@ -586,7 +586,7 @@
* @return DOCUMENT_ME
* @throws ModuleException DOCUMENT_ME
*/
- List findPostIdsAsc(Integer topicID,
+ List findPostIdsAsc(Topic topic,
int start,
int limit)
throws ModuleException;
@@ -600,7 +600,7 @@
* @return DOCUMENT_ME
* @throws ModuleException DOCUMENT_ME
*/
- List findPostIdsDesc(Integer topicID,
+ List findPostIdsDesc(Topic topic,
int start,
int limit)
throws ModuleException;
@@ -615,7 +615,7 @@
* @return DOCUMENT_ME
* @throws ModuleException DOCUMENT_ME
*/
- List findPostsByTopicIdAsc(Integer topicID,
+ List findPostsByTopicIdAsc(Topic topic,
int start,
int limit)
throws ModuleException;
@@ -629,7 +629,7 @@
* @return DOCUMENT_ME
* @throws ModuleException DOCUMENT_ME
*/
- List findPostsByTopicIdDesc(Integer topicID,
+ List findPostsByTopicIdDesc(Topic topic,
int start,
int limit)
throws ModuleException;
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/feeds/FeedsServlet.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/feeds/FeedsServlet.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/feeds/FeedsServlet.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -69,7 +69,7 @@
*/
private static final long serialVersionUID = 1L;
- @EJB(name = "ForumsModuleImpl/local")
+ @EJB(name = "jboss-forums/ForumsModuleImpl/local")
private ForumsModule forumsModule;
private static final Logger log = Logger.getLogger(FeedsServlet.class);
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -404,8 +404,8 @@
Query query = session.createNamedQuery("findTopicsType" + order);
query.setFirstResult(start);
query.setMaxResults(perPage);
- query.setParameter("forumid", "" + forum.getId());
- query.setParameter("type", "" + type);
+ query.setParameter("forumid", forum);
+ query.setParameter("type", type);
List list = query.getResultList();
return list;
} catch (Exception e) {
@@ -430,7 +430,7 @@
Query query = session.createNamedQuery("findTopicsForum" + order);
query.setFirstResult(start);
query.setMaxResults(perPage);
- query.setParameter("forumid", "" + forum.getId());
+ query.setParameter("forumid", forum);
List list = query.getResultList();
return list;
} catch (Exception e) {
@@ -990,13 +990,13 @@
}
}
- private List findPostsByTopicId(Integer topicId, int start, int limit,
+ private List findPostsByTopicId(Topic topic, int start, int limit,
String order) throws ModuleException {
try {
EntityManager session = getSession();
Query query = session
.createNamedQuery("findPostsByTopicId" + order);
- query.setParameter("topicId", topicId.toString());
+ query.setParameter("topicId", topic);
query.setFirstResult(start);
if (limit != 0) {
query.setMaxResults(limit);
@@ -1048,12 +1048,12 @@
return findPostsByIdsFetchAttachmentsAndPosters(postIds, "desc");
}
- private List findPostIds(Integer topicId, int start, int limit, String order)
+ private List findPostIds(Topic topic, int start, int limit, String order)
throws ModuleException {
try {
EntityManager session = getSession();
Query query = session.createNamedQuery("findPostIds" + order);
- query.setParameter("topicId", topicId.toString());
+ query.setParameter("topicId", topic);
query.setFirstResult(start);
if (limit != 0) {
query.setMaxResults(limit);
@@ -1066,21 +1066,21 @@
}
}
- public List findPostIdsAsc(Integer topicId, int start, int limit)
+ public List findPostIdsAsc(Topic topic, int start, int limit)
throws ModuleException {
- return findPostIds(topicId, start, limit, "asc");
+ return findPostIds(topic, start, limit, "asc");
}
- public List findPostIdsDesc(Integer topicId, int start, int limit)
+ public List findPostIdsDesc(Topic topic, int start, int limit)
throws ModuleException {
- return findPostIds(topicId, start, limit, "desc");
+ return findPostIds(topic, start, limit, "desc");
}
- public List findPostsByTopicId(Integer topicId) throws ModuleException {
+ public List findPostsByTopicId(Topic topic) throws ModuleException {
try {
EntityManager session = getSession();
Query query = session.createNamedQuery("findPostsByTopicIdNoOrder");
- query.setParameter("topicId", topicId.toString());
+ query.setParameter("topicId", topic);
return query.getResultList();
} catch (Exception e) {
String message = "Cannot find posts";
@@ -1102,14 +1102,14 @@
source.setForums(new ArrayList());
}
- public List findPostsByTopicIdAsc(Integer topicId, int start, int limit)
+ public List findPostsByTopicIdAsc(Topic topic, int start, int limit)
throws ModuleException {
- return findPostsByTopicId(topicId, start, limit, "asc");
+ return findPostsByTopicId(topic, start, limit, "asc");
}
- public List findPostsByTopicIdDesc(Integer topicId, int start, int limit)
+ public List findPostsByTopicIdDesc(Topic topic, int start, int limit)
throws ModuleException {
- return findPostsByTopicId(topicId, start, limit, "desc");
+ return findPostsByTopicId(topic, start, limit, "desc");
}
public Date findLastPostDateForUser(User user) throws ModuleException {
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/BaseController.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/BaseController.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/BaseController.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -25,12 +25,17 @@
import java.io.Serializable;
import java.util.Map;
+import javax.naming.InitialContext;
+
+import org.jboss.portlet.forums.ForumsModule;
+
/**
* @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
*
*/
public abstract class BaseController implements Serializable,Constants
{
+ private static ForumsModule singleton = null;
private String mainPageName = ""; //bean=level configuration supplied by the forums-config.xml
private Map links = null;
@@ -89,5 +94,15 @@
public boolean isAnonymous()
{
return JSFUtil.isAnonymous();
- }
+ }
+
+ //------utility method to grab the forums module------------------------------------------------------------------------------------------
+ public static ForumsModule getForumsModule() throws Exception
+ {
+ if(BaseController.singleton==null)
+ {
+ BaseController.singleton = (ForumsModule)new InitialContext().lookup("jboss-forums/ForumsModuleImpl/local");
+ }
+ return BaseController.singleton;
+ }
}
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/DownloadFilter.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/DownloadFilter.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/DownloadFilter.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -47,7 +47,7 @@
public class DownloadFilter implements Filter
{
- @EJB(name="ForumsModuleImpl/local")
+ @EJB(name="jboss-forums/ForumsModuleImpl/local")
private ForumsModule forumsModule;
/**
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -34,7 +34,6 @@
import java.util.SortedMap;
import java.util.TreeMap;
-import javax.ejb.EJB;
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
@@ -54,7 +53,6 @@
import org.jboss.portal.identity.UserModule;
import org.jboss.portal.identity.UserProfileModule;
import org.jboss.portlet.forums.ForumsConstants;
-import org.jboss.portlet.forums.ForumsModule;
import org.jboss.portlet.forums.feeds.FeedConstants;
import org.jboss.portlet.forums.format.render.bbcodehtml.ToHTMLConfig;
import org.jboss.portlet.forums.format.render.bbcodehtml.ToHTMLRenderer;
@@ -95,9 +93,6 @@
private static Logger log = Logger.getLogger(PortalUtil.class);
private static SimpleDateFormat sdfForLastLoginDate;
-
- @EJB(name="jboss-forums/ForumsModuleImpl/local")
- private static ForumsModule forumsModule;
static {
@@ -574,7 +569,7 @@
try
{
- forumsModule.processNotifications(
+ BaseController.getForumsModule().processNotifications(
postId, type, postUrl, replyUrl);
} catch (Exception e)
{
@@ -776,7 +771,7 @@
User user = PortalUtil.getUser();
Object userId = user.getId();
- poster = forumsModule.findPosterByUserId(
+ poster = BaseController.getForumsModule().findPosterByUserId(
userId.toString());
if (poster == null)
@@ -797,7 +792,7 @@
UserModule userModule = null;
User user = null;
- String guestUserName = forumsModule.getGuestUserName();
+ String guestUserName = BaseController.getForumsModule().getGuestUserName();
try
{
@@ -810,7 +805,7 @@
}
Long userId = (Long) user.getId();
- poster = forumsModule.findPosterByUserId(
+ poster = BaseController.getForumsModule().findPosterByUserId(
String.valueOf(userId));
if (poster == null) {
@@ -990,7 +985,7 @@
return null;
}
- Watch watch = forumsModule.findForumWatchByUserAndForum( user , forum.getId().intValue() );
+ Watch watch = BaseController.getForumsModule().findForumWatchByUserAndForum( user , forum.getId().intValue() );
if (watch!=null)
{
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -25,10 +25,8 @@
import java.util.ArrayList;
import java.util.Iterator;
+import javax.annotation.PostConstruct;
import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
import org.jboss.portal.core.modules.ModuleException;
import org.jboss.portlet.forums.ForumsModule;
@@ -49,14 +47,10 @@
* @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
* @author <a href="mailto:ryszard.kozmik at jboss.com">Ryszard Kozmik</a>
*/
- at Stateless
public class AdminController extends ActionController
{
- @PersistenceContext(unitName = "default")
- private EntityManager em;
-
- @EJB(name="ForumsModuleImpl/local")
+ @EJB(name="jboss-forums/ForumsModuleImpl/local")
private ForumsModule forumsModule;
private static final int up = -15;
@@ -217,7 +211,8 @@
*
*
*/
- public AdminController()
+ @PostConstruct
+ public void startService()
{
try
{
@@ -425,7 +420,6 @@
JSFUtil.setMessage(Constants.FEEDBACK,start+" \""+this.categoryName+"\" "+end);
navState = Constants.DELETE_CATEGORY;
- em.flush();
success = true;
}
catch(Exception e)
@@ -500,8 +494,7 @@
Category selectedCategory = forumsModule.findCategoryById(this.selectedCategory);
forum.setCategory((CategoryImpl)selectedCategory);
forum.setName(this.forumName);
- forum.setDescription(this.forumDescription);
- em.flush();
+ forum.setDescription(this.forumDescription);
String start = JSFUtil.getBundleMessage("ResourceJSF","Forum_updated_0");
String end = JSFUtil.getBundleMessage("ResourceJSF","Forum_updated_1");
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -31,11 +31,8 @@
import java.util.Map;
import javax.ejb.EJB;
-import javax.ejb.Stateless;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
import org.jboss.portal.core.modules.ModuleException;
import org.jboss.portlet.forums.ForumsModule;
@@ -56,14 +53,10 @@
*
* @author <a href="mailto:ryszard.kozmik at jboss.com">Ryszard Kozmik</a>
*/
- at Stateless
public class ModeratorAction extends BaseController
{
- @PersistenceContext(unitName = "default")
- private EntityManager em;
-
- @EJB(name="ForumsModuleImpl/local")
+ @EJB(name="jboss-forums/ForumsModuleImpl/local")
private ForumsModule forumsModule;
//preference related data
@@ -233,8 +226,6 @@
this.forum.setPostCount(this.forum.getPostCount()-topic.getReplies()-1);
this.forum.setTopicCount(this.forum.getTopicCount()-1);
-
- em.flush();
}
}
setInfoBundleMessage("SUCC_TOPIC_MOVED");
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/SplitTopic.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/SplitTopic.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/SplitTopic.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -27,11 +27,8 @@
import java.util.Map;
import javax.ejb.EJB;
-import javax.ejb.Stateless;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
import org.jboss.portlet.forums.ForumsModule;
import org.jboss.portlet.forums.impl.ForumImpl;
@@ -52,13 +49,9 @@
*
* @author <a href="mailto:ryszard.kozmik at jboss.com">Ryszard Kozmik</a>
*/
- at Stateless
public class SplitTopic extends BaseController {
-
- @PersistenceContext(unitName = "default")
- private EntityManager em;
- @EJB(name="ForumsModuleImpl/local")
+ @EJB(name="jboss-forums/ForumsModuleImpl/local")
private ForumsModule forumsModule;
// Title for newly created topic
@@ -158,8 +151,6 @@
try {
- em.refresh(this.topic);
-
Forum destForum = forumsModule.findForumById(new Integer(toForumId));
// Creating new topic in destination forum.
@@ -204,7 +195,6 @@
destForum.addTopicSize();
destForum.setPostCount(destForum.getPostCount()+newTopic.getReplies()+1);
- em.flush();
} catch (Exception e) {
e.printStackTrace();
setWarnBundleMessage("ERR_INTERNAL");
@@ -287,8 +277,6 @@
newTopic.addPost((PostImpl)movedPost);
}
- em.refresh(this.topic);
-
ForumImpl fromForum = topic.getForum();
topic.setReplies(topic.getReplies()-checkboxes.size());
fromForum.setPostCount(fromForum.getPostCount()-checkboxes.size());
@@ -299,8 +287,6 @@
destForum.addTopicSize();
destForum.setPostCount(destForum.getPostCount()+newTopic.getReplies()+1);
-
- em.flush();
} catch (Exception e) {
e.printStackTrace();
setWarnBundleMessage("ERR_INTERNAL");
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/TopicWatchController.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/TopicWatchController.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/action/TopicWatchController.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -22,6 +22,7 @@
******************************************************************************/
package org.jboss.portlet.forums.ui.action;
+import javax.annotation.PostConstruct;
import javax.ejb.EJB;
import org.jboss.portlet.forums.ForumsModule;
@@ -127,8 +128,8 @@
*
*
*/
- public TopicWatchController()
- {
+ @PostConstruct
+ public void startService() {
try
{
String t = JSFUtil.getRequestParameter(Constants.p_topicId);
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/event/FloodControlListener.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/event/FloodControlListener.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/event/FloodControlListener.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -24,19 +24,15 @@
import java.util.Date;
-import javax.ejb.EJB;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
import org.jboss.portal.identity.User;
-import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.ui.BaseController;
import org.jboss.portlet.forums.ui.PortalUtil;
public class FloodControlListener implements ActionListener {
-
- @EJB(name="jboss-forums/ForumsModuleImpl/local")
- private ForumsModule forumsModule;
private long floodInterval;
@@ -45,7 +41,7 @@
try
{
- floodInterval = forumsModule.getFloodInterval();
+ floodInterval = BaseController.getForumsModule().getFloodInterval();
} catch (Exception e) {
e.printStackTrace();
}
@@ -60,7 +56,7 @@
User user = PortalUtil.getUser();
if (user != null) {
- Date lastPost = forumsModule.findLastPostDateForUser(user);
+ Date lastPost = BaseController.getForumsModule().findLastPostDateForUser(user);
if (lastPost != null)
{
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/view/ViewTopic.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/view/ViewTopic.java 2009-12-29 17:05:10 UTC (rev 30861)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/view/ViewTopic.java 2009-12-29 22:39:45 UTC (rev 30862)
@@ -231,9 +231,9 @@
this.topic = post.getTopic();
List postIds = null;
if (postOrder.compareToIgnoreCase("ascending")==0) {
- postIds = forumsModule.findPostIdsAsc(this.topic.getId(),0,Integer.MAX_VALUE);
+ postIds = forumsModule.findPostIdsAsc(this.topic,0,Integer.MAX_VALUE);
} else {
- postIds = forumsModule.findPostIdsDesc(this.topic.getId(),0,Integer.MAX_VALUE);
+ postIds = forumsModule.findPostIdsDesc(this.topic,0,Integer.MAX_VALUE);
}
int counter = 0;
Iterator it = postIds.iterator();
@@ -284,7 +284,7 @@
}
try {
- return fm.findPostIdsAsc(topic.getId(),
+ return fm.findPostIdsAsc(topic,
beginIndex,
pageSize);
} catch (ModuleException e) {
@@ -318,7 +318,7 @@
}
try {
- return fm.findPostIdsDesc(topic.getId(),
+ return fm.findPostIdsDesc(topic,
beginIndex,
pageSize);
} catch (ModuleException e) {
More information about the jboss-svn-commits
mailing list