Menu
▾
▴
[jboss-cvs] nukes/news/src/main/org/jboss/nukes/addons/modules/news AddStory.java ModConstants.java News.java NewsModule.java
|
From: Julien V. <coo...@us...> - 2003-06-25 20:03:23
|
User: cooperfbi
Date: 03/06/25 13:03:23
Modified: news/src/main/org/jboss/nukes/addons/modules/news
AddStory.java ModConstants.java News.java
NewsModule.java
Log:
unified story and queuednews EJBs
Revision Changes Path
1.7 +29 -33 nukes/news/src/main/org/jboss/nukes/addons/modules/news/AddStory.java
Index: AddStory.java
===================================================================
RCS file: /cvsroot/jboss/nukes/news/src/main/org/jboss/nukes/addons/modules/news/AddStory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AddStory.java 25 Jun 2003 15:35:21 -0000 1.6
+++ AddStory.java 25 Jun 2003 20:03:23 -0000 1.7
@@ -14,7 +14,6 @@
import org.jboss.nukes.addons.modules.news.NewsModule;
import org.jboss.nukes.addons.modules.news.ModConstants;
import org.jboss.nukes.addons.modules.news.Utils;
-import org.jboss.nukes.addons.modules.news.ejb.QueuedNewsEJBLocal;
import org.jboss.nukes.html.Page;
import org.jboss.nukes.Constants;
import org.jboss.nukes.Api;
@@ -30,7 +29,7 @@
import java.util.Date;
/**
- * @version $Revision: 1.6 $ $Date: 2003/06/25 15:35:21 $
+ * @version $Revision: 1.7 $ $Date: 2003/06/25 20:03:23 $
* @author <a href="mailto:vi...@ya...">Viet Kévin</a>
*/
public class AddStory
@@ -53,9 +52,9 @@
Collection qnews = null;
try
{
- qnews = module.qNewsHome.findNonArchived();
+ qnews = module.storyEJBHome.findByState(new Integer(ModConstants.STORY_QUEUED));
}
- catch (javax.ejb.FinderException e)
+ catch (FinderException e)
{
log.error(module, e);
module.displayError(page);
@@ -80,7 +79,7 @@
//iterate over news
for (Iterator iterator = qnews.iterator(); iterator.hasNext();)
{
- QueuedNewsEJBLocal news = (QueuedNewsEJBLocal) iterator.next();
+ StoryEJBLocal news = (StoryEJBLocal) iterator.next();
page.print("<tr>\n");
page.print("<td align=\"center\">");
page.print("<table><tr><td>\n");
@@ -111,7 +110,7 @@
page.print("<td width=\"100%\"><font class=\"pn-normal\">\n");
- String subject = news.getSubject();
+ String subject = news.getTitle();
if ("".equals(subject))
{
page.print(" ${core._NOSUBJECT}</font>\n");
@@ -124,7 +123,7 @@
//TODO:
// if ($alanguage=='') $lang[$alanguage]=""._ALL."";
// echo "</td><td align=\"center\"><font class=\"pn-normal\">$lang[$alanguage]</font>\n"; /* ML added column to display the language */
- page.print("</td><td align=\"right\" nowrap><font class=\"pn-normal\"> " + news.getTimeStamp() + " </font></td></tr>\n");
+ page.print("</td><td align=\"right\" nowrap><font class=\"pn-normal\"> " + news.getTime() + " </font></td></tr>\n");
dummy++;
}
@@ -269,16 +268,17 @@
}
try
{
- QueuedNewsEJBLocal qNews = module.qNewsHome.findByPrimaryKey(qid);
- UserEJBLocal user = api.findUserById(qNews.getUserId());
+ StoryEJBLocal qNews = module.storyEJBHome.findByPrimaryKey(qid);
+ // COOPER
+ UserEJBLocal user = api.findUserById(qNews.getAid());
displayStory(
module,
api,
page,
- qNews.getUserName(),
- qNews.getSubject(),
+ user.getUserName(),
+ qNews.getTitle(),
qNews.getBodyText(),
- qNews.getStory(),
+ qNews.getHomeText(),
user.getEmail(),
user.getId(),
qNews.getId(),
@@ -399,7 +399,7 @@
Collection archive = null;
try
{
- archive = module.qNewsHome.findArchivedByDate();
+ archive = module.storyEJBHome.findByStateOrderByDate(new Integer(ModConstants.STORY_ARCHIVED));
}
catch (javax.ejb.FinderException e)
{
@@ -412,19 +412,14 @@
for (Iterator iterator = archive.iterator(); iterator.hasNext();)
{
- QueuedNewsEJBLocal news = (QueuedNewsEJBLocal) iterator.next();
-
- String formatedDate =
- Utils.countryTimeFormat(ModConstants.LONG_DATE_FORMAT,
- news.getTimeStamp());
-
+ StoryEJBLocal news = (StoryEJBLocal) iterator.next();
+ String formatedDate = Utils.countryTimeFormat(ModConstants.LONG_DATE_FORMAT, news.getTime());
Integer id = news.getId();
-
page.print("<table><tr><td valign=\"top\">\n");
page.print("<p><font class=\"pn-normal\">[ <a class=\"pn-normal\" href=\"index.html?module=" + ModConstants.MODULE_NAME);
page.print("&op=addstorydisplaystory&" + ModConstants.QNEWS_ID + "=" + id +
- "&authid=" + authid + "\">" + news.getSubject() + "</a> ][ " + news.getLanguage() +
+ "&authid=" + authid + "\">" + news.getTitle() + "</a> ][ " + news.getLanguage() +
" ][ " + formatedDate + " ] -- </p></font>");
page.print("</td><td>\n");
myTextForm(page, "index.html?module=" + ModConstants.MODULE_NAME + "" +
@@ -448,11 +443,11 @@
page.closeTable();
// get the news
- QueuedNewsEJBLocal news = null;
+ StoryEJBLocal news = null;
try
{
- news = module.qNewsHome.findByPrimaryKey(qid);
- news.setArchived(false);
+ news = module.storyEJBHome.findByPrimaryKey(qid);
+ news.setState(new Integer(ModConstants.STORY_POSTED));
page.print("<p><font class=\"pn-normal\">${news._UNARCHIVESUCCESS}</p></font>");
page.print("<a class=\"pn-normal\" href=\"index.html?module=" +
ModConstants.MODULE_NAME + "&op=addstorysubmissions\">${news._SUBMISSIONS}</a>");
@@ -480,7 +475,7 @@
// get the story in the queue and delete it
try
{
- QueuedNewsEJBLocal qNews = module.qNewsHome.findByPrimaryKey(qid);
+ StoryEJBLocal qNews = module.storyEJBHome.findByPrimaryKey(qid);
qNews.remove();
}
catch (javax.ejb.FinderException e)
@@ -557,6 +552,7 @@
// create a story and pop a queued one
module.storyEJBHome.create(
topic,
+ ModConstants.STORY_POSTED,
subject,
new Date(),
uid,
@@ -568,9 +564,9 @@
"",
comments,
0);
- if ( ! instantPost )
+ if (!instantPost)
{
- module.qNewsHome.findByPrimaryKey(qid).remove();
+ module.storyEJBHome.findByPrimaryKey(qid).remove();
}
}
catch (javax.ejb.FinderException e)
@@ -601,10 +597,10 @@
{
Integer qid = page.getParameterAsInteger(ModConstants.QNEWS_ID);
- QueuedNewsEJBLocal qNews = null;
+ StoryEJBLocal qNews = null;
try
{
- qNews = module.qNewsHome.findByPrimaryKey(qid);
+ qNews = module.storyEJBHome.findByPrimaryKey(qid);
}
catch (javax.ejb.FinderException e)
{
@@ -618,7 +614,7 @@
page.closeTable();
page.print("<p><font class=\"pn-normal\">${news._ARCHIVECHOSE}</p>" +
- "<center>" + qNews.getSubject() + "</center></font>");
+ "<center>" + qNews.getTitle() + "</center></font>");
page.print("<form action=\"index.html\" method=\"post\">");
@@ -640,7 +636,7 @@
Integer qid = page.getParameterAsInteger(ModConstants.QNEWS_ID);
// get the news
- QueuedNewsEJBLocal news = null;
+ StoryEJBLocal news = null;
page.openTable();
page.print("<center><font class=\"pn-title\">${news._ARCHIVING}</center></font>");
@@ -648,8 +644,8 @@
try
{
- news = module.qNewsHome.findByPrimaryKey(qid);
- news.setArchived(true);
+ news = module.storyEJBHome.findByPrimaryKey(qid);
+ news.setState(new Integer(ModConstants.STORY_ARCHIVED));
page.print("<p><font class=\"pn-normal\">${news._ARCHIVESUCCESS}</p></font>");
page.print("[ <a class=\"pn-normal\" href=\"index.html?module=" +
1.5 +6 -1 nukes/news/src/main/org/jboss/nukes/addons/modules/news/ModConstants.java
Index: ModConstants.java
===================================================================
RCS file: /cvsroot/jboss/nukes/news/src/main/org/jboss/nukes/addons/modules/news/ModConstants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ModConstants.java 25 Jun 2003 13:24:09 -0000 1.4
+++ ModConstants.java 25 Jun 2003 20:03:23 -0000 1.5
@@ -10,7 +10,7 @@
package org.jboss.nukes.addons.modules.news;
/**
- * @version $Revision: 1.4 $ $Date: 2003/06/25 13:24:09 $
+ * @version $Revision: 1.5 $ $Date: 2003/06/25 20:03:23 $
* @author Viet Kévin (vi...@ya...)
*/
public class ModConstants
@@ -72,6 +72,11 @@
// comments navigation id
public static final String NAV_MODE = "mode";
+
+ public static final int STORY_QUEUED = 0;
+ public static final int STORY_POSTED = 1;
+ public static final int STORY_ARCHIVED = 2;
+
}
1.5 +18 -12 nukes/news/src/main/org/jboss/nukes/addons/modules/news/News.java
Index: News.java
===================================================================
RCS file: /cvsroot/jboss/nukes/news/src/main/org/jboss/nukes/addons/modules/news/News.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- News.java 25 Jun 2003 15:35:21 -0000 1.4
+++ News.java 25 Jun 2003 20:03:23 -0000 1.5
@@ -32,7 +32,7 @@
import java.util.Date;
/**
- * @version $Revision: 1.4 $ $Date: 2003/06/25 15:35:21 $
+ * @version $Revision: 1.5 $ $Date: 2003/06/25 20:03:23 $
* @author <a href="mailto:vi...@ya...">Viet Kévin</a>
*/
public class News
@@ -49,7 +49,7 @@
Collection queue = null;
try
{
- queue = module.qNewsHome.findAll();
+ queue = module.storyEJBHome.findByState(new Integer(ModConstants.STORY_QUEUED));
}
catch (javax.ejb.FinderException e)
{
@@ -393,14 +393,20 @@
try
{
- module.qNewsHome.create(topic,
- userId,
- userName,
- subject,
- storyText,
- new Date(),
- "eng",
- bodyText);
+ module.storyEJBHome.create(
+ topic,
+ ModConstants.STORY_QUEUED,
+ subject,
+ new Date(),
+ userId,
+ storyText,
+ bodyText,
+ "",
+ "toto",
+ false,
+ "",
+ false,
+ 0);
}
catch (CreateException e)
{
@@ -420,7 +426,7 @@
int waiting = 0;
try
{
- waiting = module.qNewsHome.findNonArchived().size();
+ waiting = module.storyEJBHome.findByState(new Integer(ModConstants.STORY_QUEUED)).size();
}
catch (javax.ejb.FinderException e)
{
@@ -444,7 +450,7 @@
try
{
// TODO : use a find with a limited nuumbers of stories
- stories = module.storyEJBHome.findAll();
+ stories = module.storyEJBHome.findByState(new Integer(ModConstants.STORY_POSTED));
}
catch (javax.ejb.FinderException e)
{
1.9 +1 -5 nukes/news/src/main/org/jboss/nukes/addons/modules/news/NewsModule.java
Index: NewsModule.java
===================================================================
RCS file: /cvsroot/jboss/nukes/news/src/main/org/jboss/nukes/addons/modules/news/NewsModule.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NewsModule.java 25 Jun 2003 13:57:15 -0000 1.8
+++ NewsModule.java 25 Jun 2003 20:03:23 -0000 1.9
@@ -12,7 +12,6 @@
import org.jboss.nukes.html.Page;
import org.jboss.nukes.addons.modules.news.ejb.TopicEJBLocalHome;
import org.jboss.nukes.addons.modules.news.ejb.RelatedEJBLocalHome;
-import org.jboss.nukes.addons.modules.news.ejb.QueuedNewsEJBLocalHome;
import org.jboss.nukes.addons.modules.news.ejb.StoryEJBLocalHome;
import org.jboss.nukes.addons.modules.news.ejb.CommentEJBLocalHome;
import org.jboss.nukes.module.ModuleSupport;
@@ -25,7 +24,7 @@
*
* This class defines the the core module of this package
*
- * @version $Revision: 1.8 $ $Date: 2003/06/25 13:57:15 $
+ * @version $Revision: 1.9 $ $Date: 2003/06/25 20:03:23 $
* @author <a href="mailto:vi...@ya...">Viet Kévin</a>
*/
public class NewsModule
@@ -38,7 +37,6 @@
TopicEJBLocalHome topicHome;
RelatedEJBLocalHome relatedHome;
- QueuedNewsEJBLocalHome qNewsHome;
StoryEJBLocalHome storyEJBHome;
CommentEJBLocalHome commentEJBHome;
@@ -66,8 +64,6 @@
context.lookup(TopicEJBLocalHome.JNDI_NAME);
relatedHome = (RelatedEJBLocalHome)
context.lookup(RelatedEJBLocalHome.JNDI_NAME);
- qNewsHome = (QueuedNewsEJBLocalHome)
- context.lookup(QueuedNewsEJBLocalHome.JNDI_NAME);
storyEJBHome = (StoryEJBLocalHome)
context.lookup(StoryEJBLocalHome.JNDI_NAME);
commentEJBHome = (CommentEJBLocalHome)
|