[jboss-svn-commits] JBL Code SVN: r25548 - in labs/jbossrules/trunk/drools-guvnor/src: main/resources and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 9 04:42:24 EDT 2009
Author: michael.neale at jboss.com
Date: 2009-03-09 04:42:24 -0400 (Mon, 09 Mar 2009)
New Revision: 25548
Removed:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AtomFeed.java
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/resources/atom-feed-template.xml
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/FeedServletTest.java
Log:
GUVNOR-118 atom feed.
Deleted: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AtomFeed.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AtomFeed.java 2009-03-09 08:29:35 UTC (rev 25547)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/AtomFeed.java 2009-03-09 08:42:24 UTC (rev 25548)
@@ -1,137 +0,0 @@
-package org.drools.guvnor.server.files;
-
-import org.apache.jackrabbit.util.ISO8601;
-import org.drools.repository.AssetItem;
-import org.drools.guvnor.client.common.HTMLFileManagerFields;
-import org.drools.util.StringUtils;
-import org.mvel2.MVEL;
-import org.mvel2.templates.TemplateRuntime;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.*;
-import java.io.InputStreamReader;
-
-/**
- * @author Michael Neale
- */
-public class AtomFeed {
-
- private static String TEMPLATE = StringUtils.readFileAsString(new InputStreamReader(AtomFeed.class.getResourceAsStream("/atom-feed-template.xml")));
-
-
- private String feedTitle;
- private String feedUpdated;
- private String feedId;
- private String feedAlternate;
- private String feedSelf;
- private String subtitle;
- private Collection<AtomEntry> entries;
-
- public AtomFeed(String title, Calendar whenUpdate, String feedId, String feedAlternate, String feedSelf, Collection<AtomEntry> entries, String subtitle) {
- this.feedTitle = title;
- this.feedUpdated = ISO8601.format(whenUpdate);
- this.feedId = feedId;
- this.feedAlternate = feedAlternate;
- this.feedSelf = feedSelf;
- this.entries = entries;
- this.subtitle = subtitle;
- }
-
- public String getAtom() {
- Map m = new HashMap();
- m.put("feed", this);
- return (String) TemplateRuntime.eval(TEMPLATE, m);
- }
-
- public String getSubtitle() {
- return subtitle;
- }
-
-
- public Collection getEntries() { return entries; }
-
- public String getFeedTitle() { return feedTitle; }
-
- public String getFeedUpdated() {
- return feedUpdated;
- }
-
- public String getFeedId() {
- return feedId;
- }
-
- public String getFeedAlternate() {
- return feedAlternate;
- }
-
- public String getFeedSelf() {
- return feedSelf;
- }
-
-
- public static class AtomEntry {
- private String name;
- private String webURL;
- private String id;
- private String updated;
- private String published;
- private String author;
- private String contributor;
- private String description;
- private String checkinComment;
-
- public AtomEntry(HttpServletRequest req, AssetItem asset) {
- this.name = asset.getName() + "." + asset.getFormat();
- this.webURL = req.getParameter("viewUrl") + "#asset=" + asset.getUUID() + "&nochrome";
- this.id = asset.getUUID() + "&version=" + asset.getVersionNumber();
- this.updated = ISO8601.format(asset.getLastModified());
- this.published = ISO8601.format(asset.getCreatedDate());
- this.author = asset.getCreator();
- this.contributor = asset.getLastContributor();
- this.description = asset.getDescription();
- this.checkinComment = asset.getCheckinComment();
- }
-
- public String getName() {
- return name;
- }
-
- public String getWebURL() {
- return webURL;
- }
-
-
- public String getId() {
- return id;
- }
-
- public String getUpdated() {
- return updated;
- }
-
- public String getPublished() {
- return published;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public String getContributor() {
- return contributor;
- }
-
- public String getDescription() {
- return description;
- }
-
- public String getCheckinComment() {
- return checkinComment;
- }
- }
-
-
-
-}
-
-
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java 2009-03-09 08:29:35 UTC (rev 25547)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java 2009-03-09 08:42:24 UTC (rev 25548)
@@ -1,25 +1,23 @@
package org.drools.guvnor.server.files;
-import org.drools.guvnor.server.ServiceImplementation;
import org.drools.guvnor.server.security.PackageNameType;
import org.drools.guvnor.server.security.RoleTypes;
import org.drools.guvnor.server.security.CategoryPathType;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.AssetPageList;
-import org.drools.repository.RulesRepository;
+import org.drools.util.StringUtils;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.security.Identity;
+import org.apache.jackrabbit.util.ISO8601;
+import org.mvel2.templates.TemplateRuntime;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Calendar;
+import java.io.InputStreamReader;
+import java.util.*;
/**
* @author Michael Neale
@@ -99,4 +97,134 @@
RoleTypes.PACKAGE_READONLY);
}
}
+
+ /**
+ * @author Michael Neale
+ */
+ public static class AtomFeed {
+
+ private static String TEMPLATE = StringUtils.readFileAsString(new InputStreamReader(AtomFeed.class.getResourceAsStream("/atom-feed-template.xml")));
+
+
+ private String feedTitle;
+ private String feedUpdated;
+ private String feedId;
+ private String feedAlternate;
+ private String feedSelf;
+ private String subtitle;
+ private Collection<AtomEntry> entries;
+
+ public AtomFeed(String title, Calendar whenUpdate, String feedId, String feedAlternate, String feedSelf, Collection<AtomEntry> entries, String subtitle) {
+ this.feedTitle = title;
+ this.feedUpdated = ISO8601.format(whenUpdate);
+ this.feedId = feedId;
+ this.feedAlternate = feedAlternate;
+ this.feedSelf = feedSelf;
+ this.entries = entries;
+ this.subtitle = subtitle;
+ }
+
+ public String getAtom() {
+ Map m = new HashMap();
+ m.put("feed", this);
+ return (String) TemplateRuntime.eval(TEMPLATE, m);
+ }
+
+ public String getSubtitle() {
+ return subtitle;
+ }
+
+
+ public Collection getEntries() { return entries; }
+
+ public String getFeedTitle() { return feedTitle; }
+
+ public String getFeedUpdated() {
+ return feedUpdated;
+ }
+
+ public String getFeedId() {
+ return feedId;
+ }
+
+ public String getFeedAlternate() {
+ return feedAlternate;
+ }
+
+ public String getFeedSelf() {
+ return feedSelf;
+ }
+
+
+ public static class AtomEntry {
+ private String name;
+ private String webURL;
+ private String id;
+ private String updated;
+ private String published;
+ private String author;
+ private String contributor;
+ private String description;
+ private String checkinComment;
+ private String format;
+
+ public AtomEntry(HttpServletRequest req, AssetItem asset) {
+ this.name = asset.getName();
+ this.format = asset.getFormat();
+ this.webURL = req.getParameter("viewUrl") + "#asset=" + asset.getUUID() + "&nochrome";
+ this.id = asset.getUUID() + "&version=" + asset.getVersionNumber();
+ this.updated = ISO8601.format(asset.getLastModified());
+ this.published = ISO8601.format(asset.getCreatedDate());
+ this.author = asset.getCreator();
+ this.contributor = asset.getLastContributor();
+ this.description = asset.getDescription();
+ this.checkinComment = asset.getCheckinComment();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getFormat() {
+ return format;
+ }
+
+ public String getWebURL() {
+ return webURL;
+ }
+
+
+ public String getId() {
+ return id;
+ }
+
+ public String getUpdated() {
+ return updated;
+ }
+
+ public String getPublished() {
+ return published;
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public String getContributor() {
+ return contributor;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public String getCheckinComment() {
+ return checkinComment;
+ }
+
+ }
+
+
+
+ }
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/resources/atom-feed-template.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/resources/atom-feed-template.xml 2009-03-09 08:29:35 UTC (rev 25547)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/resources/atom-feed-template.xml 2009-03-09 08:42:24 UTC (rev 25548)
@@ -23,6 +23,7 @@
<contributor>
<name>@{entry.contributor}</name>
</contributor>
+ <category term="@{entry.format}" />
<content type="xhtml" xml:lang="en"
xml:base="http://diveintomark.org/">
<div xmlns="http://www.w3.org/1999/xhtml">
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/FeedServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/FeedServletTest.java 2009-03-09 08:29:35 UTC (rev 25547)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/FeedServletTest.java 2009-03-09 08:42:24 UTC (rev 25548)
@@ -59,7 +59,7 @@
String r = new String(out.toByteArray());
assertNotNull(r);
- assertTrue(r.indexOf("asset1.drl") > -1);
+ assertTrue(r.indexOf("asset1") > -1);
req = new MockHTTPRequest("/org.foo/feed/package", headers, new HashMap<String, String>() {
@@ -93,7 +93,7 @@
r = new String(out.toByteArray());
assertNotNull(r);
- assertTrue(r.indexOf("asset1.drl") > -1);
+ assertTrue(r.indexOf("asset1") > -1);
}
@@ -127,7 +127,7 @@
String r = new String(out.toByteArray());
assertNotNull(r);
- assertTrue(r.indexOf("asset1.drl") > -1);
+ assertTrue(r.indexOf("asset1") > -1);
assertTrue(r.indexOf("http://foo.bar") > -1);
@@ -146,7 +146,7 @@
r = new String(out.toByteArray());
assertNotNull(r);
- assertTrue(r.indexOf("asset1.drl") > -1);
+ assertTrue(r.indexOf("asset1") > -1);
assertTrue(r.indexOf("http://foo.bar") > -1);
More information about the jboss-svn-commits
mailing list