[jboss-svn-commits] JBL Code SVN: r5325 - in labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds: . data/special service tag tools
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 27 17:08:35 EDT 2006
Author: adamw
Date: 2006-07-27 17:08:28 -0400 (Thu, 27 Jul 2006)
New Revision: 5325
Modified:
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/special/CommentFeed.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/special/TagFeed.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/CommentsServiceImpl.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/AggregatedFeedTagHandler.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/AttributesTagHandler.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/CommentFeedTagHandler.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/FeedTagHandler.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/RemoteFeedTagHandler.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/ShotokuFeedTagHandler.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/TagFeedTagHandler.java
labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/VelocityContextAttributes.java
Log:
http://jira.jboss.org/jira/browse/JBSHOTOKU-38
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsServlet.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -35,7 +35,7 @@
private void invalidRequest(HttpServletResponse response, String msg)
throws IOException {
response.setContentType("text/html");
- response.getWriter().println("The feed you requested is not " +
+ response.getOutputStream().println("The feed you requested is not " +
"available: " + msg + ".");
}
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/special/CommentFeed.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/special/CommentFeed.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/special/CommentFeed.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -123,8 +123,9 @@
}
vc.put("commented", commentedNode);
- vc.put("youngest", youngest);
- vc.put("author", feed.getAttributes().get(FeedDefAttributes.AUTHOR));
+ vc.put(VelocityContextAttributes.YOUNGEST_ENTRY, youngest);
+ vc.put(VelocityContextAttributes.FEED_AUTHOR,
+ feed.getAttributes().get(FeedDefAttributes.AUTHOR));
vc.put(VelocityContextAttributes.NODES_LIST, comments);
try {
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/special/TagFeed.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/special/TagFeed.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/data/special/TagFeed.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -3,6 +3,8 @@
import org.apache.velocity.VelocityContext;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.feeds.data.Feed;
+import org.jboss.shotoku.feeds.tools.FeedDefAttributes;
+import org.jboss.shotoku.feeds.tools.VelocityContextAttributes;
import org.jboss.shotoku.tools.Tools;
import org.jboss.shotoku.tags.Tag;
import org.jboss.shotoku.tags.TagService;
@@ -41,8 +43,8 @@
nameLength = name.length();
cm = ContentManager.getContentManager(
- Tools.toString(attributes.get("id")),
- Tools.toString(attributes.get("prefix")));
+ Tools.toString(attributes.get(FeedDefAttributes.CM_ID)),
+ Tools.toString(attributes.get(FeedDefAttributes.CM_PREFIX)));
try {
limit = Integer.parseInt(Tools.toString(attributes.get("limit")));
@@ -107,7 +109,8 @@
String infoDataDecoded = infoTokens[1];
infoDataDecoded = URLDecoder.decode(infoDataDecoded, "UTF-8");
- String template = Tools.toString(attributes.get("template"));
+ String template = Tools.toString(attributes.get(
+ FeedDefAttributes.VELOCITY_TEMPLATE));
List<Tag> tags;
TagService service = TagTools.getService();
@@ -141,7 +144,7 @@
}
vc.put("tagName", tagData[0]);
- vc.put("author", tagData[1]);
+ vc.put(VelocityContextAttributes.FEED_AUTHOR, tagData[1]);
tags = TagTools.getService().getTags(tagData[0], tagData[1]);
break;
@@ -177,7 +180,7 @@
ft.toString());
// Computing the date of the youngest tag.
- vc.put("youngest", getYoungestTagDate(tags));
+ vc.put(VelocityContextAttributes.YOUNGEST_ENTRY, getYoungestTagDate(tags));
vc.put("tags",
limit > 0
? (tags.size() > limit ? tags.subList(0, limit) : tags)
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/CommentsServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/CommentsServiceImpl.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/CommentsServiceImpl.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -228,8 +228,10 @@
// Creating the comment node.
Node commentNode = createCommentNode(commentDir);
commentNode.setContent(ce.getContent());
- commentNode.setProperty("title", ce.getTitle());
- commentNode.setProperty("author", ce.getUsername());
+ commentNode.setProperty(NodesFeedsProperties.TITLE,
+ ce.getTitle());
+ commentNode.setProperty(NodesFeedsProperties.AUTHOR,
+ ce.getUsername());
if (feed.getCommentsModerated()) {
commentNode.setProperty(
NodesFeedsProperties.ACCEPTED_COMMENT_NAME,
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/AggregatedFeedTagHandler.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/AggregatedFeedTagHandler.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/AggregatedFeedTagHandler.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -23,11 +23,7 @@
super(feedName, group, definition, s);
}
- public boolean generate(FeedsDescriptor fd) {
- if (!generateAttributes(fd)) {
- return false;
- }
-
+ public boolean innerGenerate(FeedsDescriptor fd) {
String feedName = getFeedName();
String feedType = getFeedType();
Node definition = getDefinition();
@@ -87,7 +83,7 @@
feed.generate(toAggregate.toArray(new NormalFeed[0]),
Tools.toString(attributes.get("title")),
Tools.toString(attributes.get("description")),
- Tools.toString(attributes.get("author")),
+ Tools.toString(attributes.get(FeedDefAttributes.AUTHOR)),
generateFeedLink(fd, true, feedName, feedType));
} catch (IOException e) {
log.error("Can't add aggregated feed " + feedName + " : " + feedType + ".", e);
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/AttributesTagHandler.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/AttributesTagHandler.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/AttributesTagHandler.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -15,11 +15,7 @@
super(feedName, group, definition, s);
}
- public boolean generate(FeedsDescriptor fd) {
- if (!generateAttributes(fd)) {
- return false;
- }
-
+ public boolean innerGenerate(FeedsDescriptor fd) {
fd.addAttributes(getFeedName(), getAttributes());
return true;
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/CommentFeedTagHandler.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/CommentFeedTagHandler.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/CommentFeedTagHandler.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -20,11 +20,7 @@
super(feedName, group, definition, s);
}
- public boolean generate(FeedsDescriptor fd) {
- if (!generateAttributes(fd)) {
- return false;
- }
-
+ public boolean innerGenerate(FeedsDescriptor fd) {
// Reading all attributes and making the substitution on them.
Map<String, Object> attributes = getAttributes();
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/FeedTagHandler.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/FeedTagHandler.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/FeedTagHandler.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -104,9 +104,23 @@
* @param fd
* @return True iff the generation was successfull and the feed was added.
*/
- public abstract boolean generate(FeedsDescriptor fd);
+ public boolean generate(FeedsDescriptor fd) {
+ if (!generateAttributes(fd)) {
+ return false;
+ }
+ return innerGenerate(fd);
+ }
+
/**
+ * Tag-specific feed generation method. Called from within
+ * {@see #generate(FeedDescriptor)}.
+ * @param fd
+ * @return True iff the generation was successfull and the feed was added.
+ */
+ protected abstract boolean innerGenerate(FeedsDescriptor fd);
+
+ /**
* Generates a link to a specified feed. If the link is to be full, an
* absolute address is returned. Otherwise, a relative one.
* @param fd
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/RemoteFeedTagHandler.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/RemoteFeedTagHandler.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/RemoteFeedTagHandler.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -21,11 +21,7 @@
super(feedName, group, definition, s);
}
- public boolean generate(FeedsDescriptor fd) {
- if (!generateAttributes(fd)) {
- return false;
- }
-
+ public boolean innerGenerate(FeedsDescriptor fd) {
String feedName = getFeedName();
String feedType = getFeedType();
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/ShotokuFeedTagHandler.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/ShotokuFeedTagHandler.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/ShotokuFeedTagHandler.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -110,11 +110,7 @@
return param;
}
- public boolean generate(FeedsDescriptor fd) {
- if (!generateAttributes(fd)) {
- return false;
- }
-
+ public boolean innerGenerate(FeedsDescriptor fd) {
// Reading all attributes and making the substitution on them.
Map<String, Object> attributes = getAttributes();
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/TagFeedTagHandler.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/TagFeedTagHandler.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tag/TagFeedTagHandler.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -21,11 +21,7 @@
super(feedName, group, definition, s);
}
- public boolean generate(FeedsDescriptor fd) {
- if (!generateAttributes(fd)) {
- return false;
- }
-
+ public boolean innerGenerate(FeedsDescriptor fd) {
// Reading all attributes and making the substitution on them.
Map<String, Object> attributes = getAttributes();
Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/VelocityContextAttributes.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/VelocityContextAttributes.java 2006-07-27 20:41:56 UTC (rev 5324)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/tools/VelocityContextAttributes.java 2006-07-27 21:08:28 UTC (rev 5325)
@@ -30,4 +30,14 @@
* Generated feed type.
*/
public static final String FEED_TYPE = "feedType";
+
+ /**
+ * Author of a feed.
+ */
+ public static final String FEED_AUTHOR = "author";
+
+ /**
+ * Younges entry date of a feed.
+ */
+ public static final String YOUNGEST_ENTRY = "youngest";
}
More information about the jboss-svn-commits
mailing list