[jboss-svn-commits] JBL Code SVN: r10176 - in labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper: url and 1 other directory.

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

Author: adamw
Date: 2007-03-14 10:43:29 -0400 (Wed, 14 Mar 2007)
New Revision: 10176

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/LabsDelegatingCommandFactory.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsMainUrlFactory.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java
Log:
Updating potal

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/LabsDelegatingCommandFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/LabsDelegatingCommandFactory.java	2007-03-14 14:42:51 UTC (rev 10175)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/LabsDelegatingCommandFactory.java	2007-03-14 14:43:29 UTC (rev 10176)
@@ -2,9 +2,7 @@
 
 import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.labs.mapper.command.LabsBaseCommandFactory;
 import org.jboss.labs.mapper.PathParser;
-import org.jboss.labs.mapper.command.LabsDelegateCommandFactory;
 
 /**
  * A delegating command factory, which delegates mapping to registered

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsMainUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsMainUrlFactory.java	2007-03-14 14:42:51 UTC (rev 10175)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsMainUrlFactory.java	2007-03-14 14:43:29 UTC (rev 10176)
@@ -132,13 +132,14 @@
                 }
 
                 ServerURL url = convertToURL(sb);
+                PortletRequestEncoder encoder = new PortletRequestEncoder(url.getParameterMap());
 
                 if (actionCmd != null) {
-                    PortletRequestEncoder.encodeAction(url, actionCmd.getNavigationalState(),
+                    encoder.encodeAction(actionCmd.getNavigationalState(),
                             actionCmd.getInteractionState(), actionCmd.getMode(),
                             actionCmd.getWindowState());
                 } else if (renderCmd != null) {
-                    PortletRequestEncoder.encodeRender(url, navigationalState,
+                    encoder.encodeRender(navigationalState,
                             renderCmd.getMode(), renderCmd.getWindowState());
                 }
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java	2007-03-14 14:42:51 UTC (rev 10175)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java	2007-03-14 14:43:29 UTC (rev 10176)
@@ -70,13 +70,14 @@
                     }
 
                     ServerURL url = convertToURL(sb);
+                    PortletRequestEncoder encoder = new PortletRequestEncoder(url.getParameterMap());
 
                     if (actionCmd != null) {
-                        PortletRequestEncoder.encodeAction(url, actionCmd.getNavigationalState(),
+                        encoder.encodeAction(actionCmd.getNavigationalState(),
                                 actionCmd.getInteractionState(), actionCmd.getMode(),
                                 actionCmd.getWindowState());
                     } else if (renderCmd != null) {
-                        PortletRequestEncoder.encodeRender(url, navigationalState,
+                        encoder.encodeRender(navigationalState,
                                 renderCmd.getMode(), renderCmd.getWindowState());
 
                         // If the request isn't only a render request, but also, for