[jboss-svn-commits] JBL Code SVN: r26801 - in labs/jbossrules/trunk/drools-guvnor/src: main/resources and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2009-06-01 21:18:26 -0400 (Mon, 01 Jun 2009)
New Revision: 26801

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/MockHTTPRequest.java
Log:
GUVNOR-344 feed servlet fixes

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-06-01 18:09:14 UTC (rev 26800)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java	2009-06-02 01:18:26 UTC (rev 26801)
@@ -25,6 +25,8 @@
  */
 public class FeedServlet extends RepositoryServlet {
 
+    private static final String VIEW_URL = "viewUrl";
+
     @Override
     protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
         try {
@@ -59,7 +61,7 @@
         Iterator<AssetItem> it = pg.assets.iterator();
         List<AtomFeed.AtomEntry> entries = new ArrayList<AtomFeed.AtomEntry>();
         buildEntries(request, entries, it, status);
-        AtomFeed feed = new AtomFeed("Category: " + cat, Calendar.getInstance(), request.getServerName() + cat, request.getServletPath(), request.getRequestURI(), entries, "Guvnor category of items: " + cat);
+        AtomFeed feed = new AtomFeed("Category: " + cat, Calendar.getInstance(), request.getServerName() + cat, request.getParameter(VIEW_URL), request.getRequestURL().toString(), entries, "Guvnor category of items: " + cat);
         response.setContentType("application/atom+xml");
         response.getOutputStream().print(feed.getAtom());
     }
@@ -81,7 +83,7 @@
         Iterator<AssetItem> it = pkg.getAssets();
         buildEntries(request, entries, it, request.getParameter("status"));
 
-        AtomFeed feed = new AtomFeed("Knowledge package: " + pkg.getName(), pkg.getLastModified(), pkg.getUUID(), request.getServletPath(), request.getRequestURI(), entries, pkg.getDescription());
+        AtomFeed feed = new AtomFeed("Knowledge package: " + pkg.getName(), pkg.getLastModified(), pkg.getUUID(), request.getParameter(VIEW_URL), request.getRequestURL().toString(), entries, pkg.getDescription());
         response.setContentType("application/atom+xml");
         response.getOutputStream().print(feed.getAtom());
     }
@@ -175,10 +177,11 @@
             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.webURL = req.getParameter(VIEW_URL) + "#asset=" + asset.getUUID() + "&nochrome";
                 this.id = asset.getUUID() + "&version=" + asset.getVersionNumber();
                 this.updated = ISO8601.format(asset.getLastModified());
                 this.published = ISO8601.format(asset.getCreatedDate());

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-06-01 18:09:14 UTC (rev 26800)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/resources/atom-feed-template.xml	2009-06-02 01:18:26 UTC (rev 26801)
@@ -24,8 +24,7 @@
            <name>@{entry.contributor}</name>
          </contributor>
          <category term="@{entry.format}" />
-         <content type="xhtml" xml:lang="en"
-          xml:base="http://diveintomark.org/">
+         <content type="xhtml" xml:lang="en">
            <div xmlns="http://www.w3.org/1999/xhtml">
                  <p>[Description: @{entry.description}]</p>
                  <p><i>[Note: @{entry.checkinComment}]</i></p>

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java	2009-06-01 18:09:14 UTC (rev 26800)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java	2009-06-02 01:18:26 UTC (rev 26801)
@@ -110,8 +110,8 @@
 	}
 
 	public StringBuffer getRequestURL() {
-		// TODO Auto-generated method stub
-		return null;
+
+		return new StringBuffer("http://foo.com");
 	}
 
 	public String getRequestedSessionId() {