[jboss-svn-commits] JBL Code SVN: r35580 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files.

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

Author: jervisliu
Date: 2010-10-20 03:36:59 -0400 (Wed, 20 Oct 2010)
New Revision: 35580

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java
Log:
GUVNOR-677: Discussion Atom feed is not a valid XML


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	2010-10-20 07:19:59 UTC (rev 35579)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java	2010-10-20 07:36:59 UTC (rev 35580)
@@ -228,10 +228,10 @@
             public AtomEntry(HttpServletRequest req, AssetItem asset) {
                 this.name = asset.getName();
                 this.format = asset.getFormat();
-                //Escape & with %26 to make generated XML safe. 
+                //Escape & with %26 to make generated XML safe.
                 this.webURL = req.getParameter(VIEW_URL) + "#asset=" + asset.getUUID() + "%26nochrome";
                 //Each history version of asset has its unique UUID. &version is not needed here. Plus &version
-                //is not being parsed on the server side 
+                //is not being parsed on the server side
                 //this.id = asset.getUUID() + "&version=" + asset.getVersionNumber();
                 this.id = asset.getUUID();
                 this.updated = ISO8601.format(asset.getLastModified());
@@ -247,7 +247,7 @@
                 this.name = asset.getName();
                 this.format = asset.getFormat();
                 this.webURL = req.getParameter(VIEW_URL) + "#asset=" + asset.getUUID() + "%26nochrome";
-                this.id = asset.getUUID() + "&discussion=" + discussionRec.timestamp + "&author=" + discussionRec.author;
+                this.id = asset.getUUID();
                 Calendar c = Calendar.getInstance();
                 c.setTime(new Date(discussionRec.timestamp));
                 this.updated = ISO8601.format(c);