portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdore...@apache.org
Subject svn commit: r589128 - in /portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto: ./ spi/ spi/optional/ wrappers/
Date Sat, 27 Oct 2007 14:59:08 GMT
Author: cdoremus
Date: Sat Oct 27 07:59:06 2007
New Revision: 589128

URL: http://svn.apache.org/viewvc?rev=589128&view=rev
Log:
Forgot this one in SVN revision 589127 from updateToRev26_container_fixes102307.patch in PLUTO-404

Modified:
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/Constants.java
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/wrappers/ActionResponseWrapper.java
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletResponseWrapper.java

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/Constants.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/Constants.java?rev=589128&r1=589127&r2=589128&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/Constants.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/Constants.java
Sat Oct 27 07:59:06 2007
@@ -102,6 +102,13 @@
      */
     public final static Integer METHOD_EVENT = new Integer(9);
     
+    /**
+     * The unique method identifier for admin requests.  Admin requests
+     * are requested through a call to the {@link PortletContainer#doAdmin(PortletWindow,
javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
+     * method.
+     */
+    public final static Integer  METHOD_ADMIN = new Integer(11);
+    
 	/**
 	 * the public key, to store the EventProvider in the Request
 	 */

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java?rev=589128&r1=589127&r2=589128&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
Sat Oct 27 07:59:06 2007
@@ -18,7 +18,6 @@
 
 import java.util.Map;
 
-import javax.portlet.BaseURL;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.pluto.PortletWindow;
@@ -80,11 +79,7 @@
     
     public EventProvider getEventProvider();
     
-    /**
-     * Returns a Public Render Parameter Provider, this is used to register get and set all
public-render-parameter-parameter.
-     * @return the PublicRenderParameterProvider.
-     */
-    public PublicRenderParameterProvider getPublicRenderParameterProvider();
+    
     
     /**
      * Returns the FilterManager, this is used to process the filter.

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java?rev=589128&r1=589127&r2=589128&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
Sat Oct 27 07:59:06 2007
@@ -19,6 +19,7 @@
 import java.util.Map;
 
 import javax.portlet.PortletMode;
+import javax.portlet.PortletSecurityException;
 import javax.portlet.WindowState;
 import javax.servlet.http.HttpServletRequest;
 
@@ -72,7 +73,7 @@
     /**
      * By calling this method the URL is defined as a secure URL.
      */
-    public void setSecure();
+    public void setSecure() throws PortletSecurityException ;
 
     /**
      * Removes all pre-existing parameters in this URL

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java?rev=589128&r1=589127&r2=589128&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
Sat Oct 27 07:59:06 2007
@@ -15,6 +15,7 @@
  */
 package org.apache.pluto.spi.optional;
 
+import org.apache.pluto.PortletContainer;
 import org.apache.pluto.internal.InternalPortletWindow;
 import org.apache.pluto.internal.InternalPortletRequest;
 import org.apache.pluto.internal.InternalPortletResponse;
@@ -30,21 +31,25 @@
 public interface PortletEnvironmentService {
 	
 	public InternalPortletRequest createActionRequest(
+	        PortletContainer container,
 			HttpServletRequest servletRequest,
 			HttpServletResponse servletResponse,
 			InternalPortletWindow internalPortletWindow);
 	
-	public InternalActionResponse createActionRespose(
+	public InternalActionResponse createActionResponse(
+	        PortletContainer container,
 			HttpServletRequest servletRequest,
 			HttpServletResponse servletResponse,
 			InternalPortletWindow internalPortletWindow);
 	
 	public InternalPortletRequest createRenderRequest(
+	        PortletContainer container,
 			HttpServletRequest servletRequest,
 			HttpServletResponse servletResponse,
 			InternalPortletWindow internalPortletWindow);
 	
-	public InternalPortletResponse createRenderRespose(
+	public InternalPortletResponse createRenderResponse(
+	        PortletContainer container,
 			HttpServletRequest servletRequest,
 			HttpServletResponse servletResponse,
 			InternalPortletWindow internalPortletWindow);

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java?rev=589128&r1=589127&r2=589128&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java
Sat Oct 27 07:59:06 2007
@@ -23,6 +23,8 @@
 import javax.portlet.RenderResponse;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
+import javax.portlet.PortletException;
+import java.io.IOException;
 
 /**
  * Service used to invoke portlets.
@@ -30,10 +32,12 @@
  */
 public interface PortletInvokerService {
 	
-    public void action(ActionRequest req, ActionResponse res, InternalPortletWindow window);
+    public void action(ActionRequest req, ActionResponse res, InternalPortletWindow window)
+    	throws IOException, PortletException;
 
-    public void render(RenderRequest req, RenderResponse res, InternalPortletWindow window);
+    public void render(RenderRequest req, RenderResponse res, InternalPortletWindow window)
+    	throws IOException, PortletException;
 
-    public void load(PortletRequest req, PortletResponse res, InternalPortletWindow window);
-	
+    public void load(PortletRequest req, PortletResponse res, InternalPortletWindow window)
+    	throws IOException, PortletException;
 }

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/wrappers/ActionResponseWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/wrappers/ActionResponseWrapper.java?rev=589128&r1=589127&r2=589128&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/wrappers/ActionResponseWrapper.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/wrappers/ActionResponseWrapper.java
Sat Oct 27 07:59:06 2007
@@ -16,6 +16,7 @@
  */
 package org.apache.pluto.wrappers;
 
+import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Map;
 
@@ -108,6 +109,16 @@
 
 	public void setEvent(String name, java.io.Serializable value) {
 		this.getStateAwareResponse().setEvent(name, value);
+	}
+
+	public void sendRedirect(String location, String renderUrlParamName) throws IOException
{
+		// TODO Auto-generated method stub
+		
+	}
+
+	public void removePublicRenderParameter(String name) {
+		// TODO Auto-generated method stub
+		
 	}
 }
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletResponseWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletResponseWrapper.java?rev=589128&r1=589127&r2=589128&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletResponseWrapper.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletResponseWrapper.java
Sat Oct 27 07:59:06 2007
@@ -17,9 +17,12 @@
 
 import javax.portlet.PortletResponse;
 import javax.portlet.PortletURL;
+import javax.portlet.RenderResponse;
 import javax.portlet.ResourceURL;
 import javax.servlet.http.Cookie;
 
+import org.apache.pluto.internal.impl.RenderResponseImpl;
+import org.w3c.dom.DOMException;
 import org.w3c.dom.Element;
 
 public class PortletResponseWrapper
@@ -43,10 +46,6 @@
     public void addProperty(String key, String value) {
         this.getPortletResponse().addProperty(key, value);
     }
-    
-    public void addProperty(Cookie cookie){
-    	this.getPortletResponse().addProperty(cookie);
-    }
 
     public void setProperty(String key, String value) {
         this.getPortletResponse().setProperty(key, value);
@@ -62,15 +61,15 @@
 //	}
 
 	public PortletURL createActionURL() {
-		return this.getPortletResponse().createActionURL();
+		return ((RenderResponse) this.getPortletResponse()).createActionURL();
 	}
 
 	public PortletURL createRenderURL() {
-		return this.getPortletResponse().createRenderURL();
+		return ((RenderResponse) this.getPortletResponse()).createRenderURL();
 	}
 
 	public ResourceURL createResourceURL() {
-		return this.getPortletResponse().createResourceURL(); 
+		return ((RenderResponse) this.getPortletResponse()).createResourceURL(); 
 	}
 
 	public String getNamespace() {
@@ -101,6 +100,11 @@
 
 	public void addProperty(String key, Element element) {
 		this.getPortletResponse().addProperty(key, element);
+	}
+
+	public Element createElement(String tagName) throws DOMException {
+		// TODO Auto-generated method stub
+		return null;
 	}
 }
 



Mime
View raw message