[jboss-svn-commits] JBL Code SVN: r29285 - in labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main: java/org/drools/guvnor/server/files and 1 other directories.

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

Author: jervisliu
Date: 2009-09-10 03:13:54 -0400 (Thu, 10 Sep 2009)
New Revision: 29285

Removed:
   labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/webapp/org.drools.guvnor.Guvnor-aux/
Modified:
   labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java
   labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java
Log:
https://jira.jboss.org/jira/browse/BRMS-103: RSS feeds on BRMS elements (e.g, packages) not working

Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java	2009-09-10 06:33:56 UTC (rev 29284)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java	2009-09-10 07:13:54 UTC (rev 29285)
@@ -1,5 +1,7 @@
 package org.drools.guvnor.client.explorer;
 
+import java.io.UnsupportedEncodingException;
+
 import org.drools.guvnor.client.LoggedInUserInfo;
 import org.drools.guvnor.client.messages.Constants;
 import org.drools.guvnor.client.security.Capabilities;
@@ -208,10 +210,17 @@
      * to work out what we will display.
      */
     static BookmarkInfo handleHistoryToken(String tok) {
+
         if (tok == null) return new BookmarkInfo();
        BookmarkInfo bi = new BookmarkInfo();
         if (tok.startsWith("asset=")) { //NON-NLS
-            String uuid = tok.substring(6).split("&nochrome")[0]; //NON-NLS
+        	String uuid = null;
+        	//URLDecoder is not supported in GWT. We decode  ampersand (&) here by ourself. 
+        	if(tok.indexOf("%26nochrome") >= 0) {
+        		uuid = tok.substring(6).split("%26nochrome")[0]; //NON-NLS
+        	} else {
+                uuid = tok.substring(6).split("&nochrome")[0]; //NON-NLS
+        	}
             bi.loadAsset = true;
             bi.assetId = uuid;
         }
@@ -229,5 +238,4 @@
         boolean loadAsset = false;
     }
 
-
 }

Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java	2009-09-10 06:33:56 UTC (rev 29284)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java	2009-09-10 07:13:54 UTC (rev 29285)
@@ -181,8 +181,12 @@
             public AtomEntry(HttpServletRequest req, AssetItem asset) {
                 this.name = asset.getName();
                 this.format = asset.getFormat();
-                this.webURL = req.getParameter(VIEW_URL) + "#asset=" + asset.getUUID() + "&nochrome";
-                this.id = asset.getUUID() + "&version=" + asset.getVersionNumber();
+                //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 
+                //this.id = asset.getUUID() + "&version=" + asset.getVersionNumber();
+                this.id = asset.getUUID();
                 this.updated = ISO8601.format(asset.getLastModified());
                 this.published = ISO8601.format(asset.getCreatedDate());
                 this.author = asset.getCreator();