[jboss-svn-commits] JBL Code SVN: r24555 - labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/ui.

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

Author: sviluppatorefico
Date: 2009-01-06 10:13:20 -0500 (Tue, 06 Jan 2009)
New Revision: 24555

Modified:
   labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java
Log:


Modified: labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java
===================================================================
--- labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java	2009-01-06 13:01:49 UTC (rev 24554)
+++ labs/jbossforums/branches/forums120P27/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java	2009-01-06 15:13:20 UTC (rev 24555)
@@ -22,47 +22,40 @@
  ******************************************************************************/
 package org.jboss.portlet.forums.ui;
 
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.portlet.PortletFileUpload;
-import org.apache.log4j.Logger;
-
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.TreeMap;
 import java.util.SortedMap;
+import java.util.TreeMap;
 
-// JSF
 import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
 import javax.faces.context.ExternalContext;
-
-//myfaces
-import org.apache.myfaces.portlet.MyFacesGenericPortlet;
-import org.apache.myfaces.config.FacesConfigurator;
-import org.apache.myfaces.context.ReleaseableExternalContext;
-import org.apache.myfaces.webapp.webxml.WebXml;
-
-//portlet api
+import javax.faces.context.FacesContext;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletMode;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
+import javax.portlet.PortletSession;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletSession;
-import javax.portlet.PortletMode;
 
-//jboss portal
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.portlet.PortletFileUpload;
+import org.apache.log4j.Logger;
+import org.apache.myfaces.config.FacesConfigurator;
+import org.apache.myfaces.context.ReleaseableExternalContext;
+import org.apache.myfaces.portlet.MyFacesGenericPortlet;
+import org.apache.myfaces.webapp.webxml.WebXml;
+import org.jboss.portal.portlet.impl.jsr168.PortletRequestParameterMap;
 import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.forums.helper.TempFileBinding;
-import org.jboss.portlet.forums.ui.PortalUtil;
 
 
 /**
@@ -335,7 +328,7 @@
             Class requestClass = PortletRequestImpl.class;
             Field field = requestClass.getDeclaredField("requestParameterMap");
             field.setAccessible(true);
-            field.set(request, new PortletParameters(newParams));
+            field.set(request, new PortletRequestParameterMap(newParams,null,null){});
             field.setAccessible(false);
             
             
@@ -419,7 +412,7 @@
             Class requestClass = PortletRequestImpl.class;
             Field field = requestClass.getDeclaredField("requestParameterMap");
             field.setAccessible(true);
-            field.set(request, new PortletParameters(newParams));
+            field.set(request, new PortletRequestParameterMap(newParams,null,null){});
             field.setAccessible(false);
             
             if (fc.getViewRoot()==null) {
@@ -673,18 +666,12 @@
         //protected fields
         try
         {
-           Class requestClass = PortletRequestImpl.class;
-           Field field = requestClass.getDeclaredField("requestParameterMap");
-           field.setAccessible(true);
-           field.set(req, new PortletParameters(newParams));
+            Class requestClass = PortletRequestImpl.class;
+            Field field = requestClass.getDeclaredField("requestParameterMap");
+            field.setAccessible(true);
+            field.set(req, new PortletRequestParameterMap(newParams,null,null){});
 
 
-           // TODO: This workaround is not best possible because we are using here JBossActionRequest.
-           //the second dummy field need to be set to null to force lazy initialization
-           requestClass = JBossActionRequest.class;
-           field = requestClass.getDeclaredField("blah");
-           field.setAccessible(true);
-           field.set(req, null);
         }
         catch (NoSuchFieldException e)
         {