You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by de...@apache.org on 2008/01/29 16:54:26 UTC

svn commit: r616412 - in /portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl: BaseURLImpl.java ClientDataRequestImpl.java PortletRequestImpl.java StateAwareResponseImpl.java

Author: dettborn
Date: Tue Jan 29 07:54:21 2008
New Revision: 616412

URL: http://svn.apache.org/viewvc?rev=616412&view=rev
Log:
Fix bug for ActionParameter.
Now actionparameter and PublicRenderParameter are merged and for an ActionURL PublicParameter can't be set.
See clarification from the new spec.
In StateAwareResponseImpl you can't sendredirect after removePRP and setEvent.

Modified:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java?rev=616412&r1=616411&r2=616412&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java Tue Jan 29 07:54:21 2008
@@ -110,7 +110,7 @@
 	    	parameters.put(name, new String[]{value});
 	    }
 	    else{
-	    	if (publicRenderParameterNames.contains(name)){
+	    	if (publicRenderParameterNames.contains(name) && !this.isAction && !this.isResourceServing){
 		    	publicRenderParameters.put(name,new String[] {value});
 		    }
 		    else{
@@ -130,7 +130,7 @@
 			parameters.put(name, StringUtils.copy(values));
 	    }
 		else{
-			if (publicRenderParameterNames.contains(name)){
+			if (publicRenderParameterNames.contains(name)&& !this.isAction && !this.isResourceServing){
 		    	publicRenderParameters.put(name,StringUtils.copy(values));
 		    }
 		    else{
@@ -167,7 +167,7 @@
         			this.setParameter((String)key, (String[])parameters.get(key));
         		else{
         			//test if this is a public parameter
-        			if (publicPortletRenderParameterNames.contains(key))
+        			if (publicPortletRenderParameterNames.contains(key)&& !this.isAction && !this.isResourceServing)
         				publicRenderParameters.put((String)key, (String[])parameters.get(key));
         			else
         				this.setParameter((String)key, (String[])parameters.get(key));

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java?rev=616412&r1=616411&r2=616412&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ClientDataRequestImpl.java Tue Jan 29 07:54:21 2008
@@ -19,6 +19,11 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 import javax.portlet.ClientDataRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -81,4 +86,65 @@
 	public String getMethod(){
 		return super.getMethod();
 	}
+
+	@Override
+	public String getParameter(String name) {
+		if (super.getPrivateParameterMap().get(name) != null){
+			if (super.getPrivateParameterMap().get(name).length > 0){
+				return super.getPrivateParameterMap().get(name)[0];
+			}
+		}
+		return super.getParameter(name);
+	}
+
+	@Override
+	public Map getParameterMap() {
+		return Collections.unmodifiableMap(mergeParameter());
+	}
+
+	@Override
+	public String[] getParameterValues(String name) {
+		return mergeParameter().get(name);
+	}
+	
+	/**
+	 * Iterate over the private and the public parameter list and merge it.
+	 * @return merged list
+	 */
+	private Map<String, String[]> mergeParameter(){
+		Map<String,String[]> mergedParameterMap = new HashMap<String, String[]>();
+		//Put the private list first into the map, because it is required, this parameters are the first in the value array.
+		if (super.getPrivateParameterMap() != null)
+			mergedParameterMap.putAll(super.getPrivateParameterMap());
+		Map<String, String[]> publicParameterMap = super.getPublicParameterMap();
+		//Iterate over the public parameter list
+		if (publicParameterMap != null){
+			Set keySet = publicParameterMap.keySet();
+			if (keySet != null){
+				Iterator<String> iterator = keySet.iterator();
+				while (iterator.hasNext()){
+					String name = iterator.next();
+					//tests if the name already exist
+					if (mergedParameterMap.containsKey(name)){
+						String[] tmp = mergedParameterMap.get(name);
+						String[] tmp2 = publicParameterMap.get(name);
+						String[] values = new String[tmp.length + tmp2.length];
+						int length = tmp.length;
+						for (int i = 0; i < length; i++){
+							values[i] = tmp[i];
+						}
+						for (int i = 0; i < tmp2.length;i++){
+							values[i+length] = tmp2[i];
+						}
+						mergedParameterMap.put(name, values);
+					}
+					else{
+						mergedParameterMap.put(name,publicParameterMap.get(name));
+					}
+				}
+			}
+		}
+		return mergedParameterMap;
+	}
+	
 }

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?rev=616412&r1=616411&r2=616412&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Tue Jan 29 07:54:21 2008
@@ -941,10 +941,12 @@
 			.getPortletURLProvider(getHttpServletRequest(), internalPortletWindow);
 		List<String> publicRenderParameterNames = internalPortletWindow.getPortletEntity().getPortletDefinition().getPublicRenderParameter();
 		String[] values = null;
-		for (String string : publicRenderParameterNames) {
-			values = urlProvider.getPublicRenderParameters(string);
-			if (values != null){
-				map.put(string, values);
+		if (publicRenderParameterNames != null){
+			for (String string : publicRenderParameterNames) {
+				values = urlProvider.getPublicRenderParameters(string);
+				if (values != null){
+					map.put(string, values);
+				}
 			}
 		}
 		return Collections.unmodifiableMap(map);

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java?rev=616412&r1=616411&r2=616412&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java Tue Jan 29 07:54:21 2008
@@ -101,6 +101,7 @@
 				getHttpServletRequest(),getInternalPortletWindow());
  	
 		provider.registerToFireEvent(qname, value);
+		redirectAllowed = false;
 	}
 
 	/* (non-Javadoc)
@@ -117,6 +118,7 @@
         }
         QName qname = new QName(defaultNamespace, name);
         setEvent(qname, value);
+        redirectAllowed = false;
 	}
 
 	/* (non-Javadoc)
@@ -587,6 +589,7 @@
 	    			"name and values must not be null or values be an empty array");
 	    	}
 		}
+		redirectAllowed = false;
 	}
 
 	public void setEventRequest(EventRequest eventRequest) {