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 cd...@apache.org on 2006/10/26 13:54:23 UTC
svn commit: r467967 - in
/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto:
internal/impl/ spi/ wrappers/
Author: cdoremus
Date: Thu Oct 26 04:54:21 2006
New Revision: 467967
URL: http://svn.apache.org/viewvc?view=rev&rev=467967
Log:
Implementations for JSR-286 support. Some methods are stubbed out and throw an UnsupportedOperationException to make sure we don't forget about them.
Modified:
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/ActionResponseWrapper.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletRequestWrapper.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletResponseWrapper.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/RenderRequestWrapper.java
portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/RenderResponseWrapper.java
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionResponseImpl.java Thu Oct 26 04:54:21 2006
@@ -39,7 +39,7 @@
import org.apache.pluto.spi.PortalCallbackService;
import org.apache.pluto.util.StringUtils;
-public class ActionResponseImpl extends PortletResponseImpl
+public class ActionResponseImpl extends StateAwareResponseImpl
implements ActionResponse, InternalActionResponse {
/**
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java Thu Oct 26 04:54:21 2006
@@ -24,6 +24,7 @@
import javax.portlet.PortletRequestDispatcher;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -120,4 +121,8 @@
}
}
+ public void include(ResourceRequest request, RenderResponse response) throws PortletException, IOException {
+ // TODO Auto-generated method stub
+ throw new UnsupportedOperationException("This method needs to be implemented.");
+ }
}
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Thu Oct 26 04:54:21 2006
@@ -129,6 +129,13 @@
// PortletRequest Impl -----------------------------------------------------
+ /* (non-Javadoc)
+ * @see javax.portlet.PortletRequest#getWindowId()
+ */
+ public String getWindowId() {
+ return internalPortletWindow.getId().getStringId();
+ }
+
/**
* Determine whether or not the specified WindowState is allowed for this
* portlet.
@@ -561,6 +568,7 @@
*/
public void release() {
// TODO:
+ throw new UnsupportedOperationException("This method needs to be implemented.");
}
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletResponseImpl.java Thu Oct 26 04:54:21 2006
@@ -19,6 +19,8 @@
import java.io.PrintWriter;
import javax.portlet.PortletResponse;
+import javax.portlet.PortletURL;
+import javax.portlet.ResourceURL;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -29,7 +31,9 @@
import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.spi.ResourceURLProvider;
import org.apache.pluto.util.ArgumentUtility;
+import org.apache.pluto.util.NamespaceMapper;
import org.apache.pluto.util.PrintWriterServletOutputStream;
+import org.apache.pluto.util.impl.NamespaceMapperImpl;
/**
* Abstract <code>javax.portlet.PortletResponse</code> implementation.
@@ -57,6 +61,8 @@
private ServletOutputStream wrappedWriter;
+ private NamespaceMapper mapper = new NamespaceMapperImpl();
+
// Constructor -------------------------------------------------------------
@@ -82,6 +88,17 @@
internalPortletWindow,
name, value);
}
+
+ public void addProperty(String name, String value, int scope) {
+ // FIXME: What should this do? (scope seems to be new)
+ ArgumentUtility.validateNotNull("propertyName", name);
+ container.getRequiredContainerServices()
+ .getPortalCallbackService()
+ .addResponseProperty(
+ getHttpServletRequest(),
+ internalPortletWindow,
+ name, value);
+ }
public void setProperty(String name, String value) {
ArgumentUtility.validateNotNull("propertyName", name);
@@ -92,6 +109,17 @@
internalPortletWindow,
name, value);
}
+
+ public void setProperty(String name, String value, int scope) {
+ // FIXME: What should this do? (scope seems to be new)
+ ArgumentUtility.validateNotNull("propertyName", name);
+ container.getRequiredContainerServices()
+ .getPortalCallbackService()
+ .setResponseProperty(
+ getHttpServletRequest(),
+ internalPortletWindow,
+ name, value);
+ }
public String encodeURL(String path) {
if (path.indexOf("://") == -1 && !path.startsWith("/")) {
@@ -183,5 +211,53 @@
usingWriter = true;
return getHttpServletResponse().getWriter();
}
+
+ public PortletURL createRenderURL() {
+ return createURL(false,false);
+ }
+
+
+ public PortletURL createActionURL() {
+ return createURL(true,false);
+ }
+
+ public ResourceURL createResourceURL(){
+ //FIXME: Add right parameters
+
+ return new ResourceURLImpl(getContainer(),
+ getInternalPortletWindow(),
+ getHttpServletRequest(),
+ getHttpServletResponse());
+ }
+
+
+ /**
+ * Creates a portlet URL.
+ * TODO: make dynamic? as service?
+ * @param isAction true for an action URL, false for a render URL.
+ * @return the created portlet (action/render) URL.
+ */
+ private PortletURL createURL(boolean isAction, boolean isResourceServing) {
+ return new PortletURLImpl(getContainer(),
+ getInternalPortletWindow(),
+ getHttpServletRequest(),
+ getHttpServletResponse(),
+ isAction);
+ }
+
+
+ public String getNamespace() {
+ String namespace = mapper.encode(getInternalPortletWindow().getId(), "");
+ StringBuffer validNamespace = new StringBuffer();
+ for (int i = 0; i < namespace.length(); i++) {
+ char ch = namespace.charAt(i);
+ if (Character.isJavaIdentifierPart(ch)) {
+ validNamespace.append(ch);
+ } else {
+ validNamespace.append('_');
+ }
+ }
+ return validNamespace.toString();
+ }
}
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletURLImpl.java Thu Oct 26 04:54:21 2006
@@ -15,60 +15,29 @@
*/
package org.apache.pluto.internal.impl;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.portlet.PortalContext;
import javax.portlet.PortletMode;
import javax.portlet.PortletModeException;
-import javax.portlet.PortletSecurityException;
import javax.portlet.PortletURL;
import javax.portlet.WindowState;
import javax.portlet.WindowStateException;
import org.apache.pluto.PortletContainer;
-import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.portlet.SupportsDD;
import org.apache.pluto.internal.InternalPortletWindow;
-import org.apache.pluto.spi.PortletURLProvider;
-import org.apache.pluto.util.StringManager;
-import org.apache.pluto.util.StringUtils;
-
-public class PortletURLImpl implements PortletURL {
-
- private static final StringManager EXCEPTIONS =
- StringManager.getManager(PortletURLImpl.class.getPackage().getName());
-
-
- private PortletContainer container;
- protected PortletMode mode = null;
-
- protected Map parameters = new HashMap();
-
- protected InternalPortletWindow internalPortletWindow;
-
- protected boolean secure;
- protected javax.servlet.http.HttpServletRequest servletRequest;
- protected javax.servlet.http.HttpServletResponse servletResponse;
- protected WindowState state;
- protected boolean isAction;
- private PortalContext context;
+/**
+ * Refactoring where functionality was pushed into JSR-286 <code>BaseURL</code>.
+ *
+ * @since 2.0
+ */
+public class PortletURLImpl extends BaseURLImpl implements PortletURL {
public PortletURLImpl(PortletContainer container,
InternalPortletWindow internalPortletWindow,
javax.servlet.http.HttpServletRequest servletRequest,
javax.servlet.http.HttpServletResponse servletResponse,
boolean isAction) {
- this.container = container;
- this.internalPortletWindow = internalPortletWindow;
- this.servletRequest = servletRequest;
- this.servletResponse = servletResponse;
- secure = servletRequest.isSecure();
- this.isAction = isAction;
- this.context = container.getRequiredContainerServices().getPortalContext();
+ super(container,internalPortletWindow,servletRequest,
+ servletResponse,isAction,false);
}
// javax.portlet.PortletURL -------------------------------------------------------------------
@@ -90,162 +59,4 @@
mode = portletMode;
}
- public void setParameter(String name, String value) {
- if (name == null || value == null) {
- throw new IllegalArgumentException(
- "name and value must not be null");
- }
-
- parameters.put(name, new String[]{value});
- }
-
- public void setParameter(String name, String[] values) {
- if (name == null || values == null || values.length == 0) {
- throw new IllegalArgumentException(
- "name and values must not be null or values be an empty array");
- }
-
- parameters.put(name, StringUtils.copy(values));
- }
-
- /* (non-Javadoc)
- * @see javax.portlet.PortletURL#setParameters(Map)
- */
- public void setParameters(Map parameters) {
- if (parameters == null) {
- throw new IllegalArgumentException("Parameters must not be null.");
- }
- for (Iterator it = parameters.entrySet().iterator(); it.hasNext();) {
- Map.Entry entry = (Map.Entry) it.next();
- if (!(entry.getKey() instanceof String)) {
- throw new IllegalArgumentException(
- "Key must not be null and of type java.lang.String.");
- }
- if (!(entry.getValue() instanceof String[])) {
- throw new IllegalArgumentException(
- "Value must not be null and of type java.lang.String[].");
- }
- }
-
- this.parameters = StringUtils.copyParameters(parameters);
- }
-
- public void setSecure(boolean secure) throws PortletSecurityException {
- this.secure = secure;
- }
-
- public String toString() {
- StringBuffer url = new StringBuffer(200);
-
- PortletURLProvider urlProvider = container
- .getRequiredContainerServices()
- .getPortalCallbackService()
- .getPortletURLProvider(servletRequest, internalPortletWindow);
-
- if (mode != null) {
- urlProvider.setPortletMode(mode);
- }
- if (state != null) {
- urlProvider.setWindowState(state);
- }
- if (isAction) {
- urlProvider.setAction(true);
- }
- if (secure) {
- urlProvider.setSecure();
- }
- urlProvider.clearParameters();
- urlProvider.setParameters(parameters);
-
- url.append(urlProvider.toString());
-
- return url.toString();
- }
- // --------------------------------------------------------------------------------------------
-
-
- // additional methods -------------------------------------------------------------------------
- public String getParameter(String name) {
- return (String) parameters.get(name);
- }
-
- public String[] getParameters(String name) {
- return (String[]) parameters.get(name);
- }
-
- public PortletMode getPortletMode() {
- return mode;
- }
-
- public WindowState getWindowState() {
- return state;
- }
- // --------------------------------------------------------------------------------------------
-
-
- private boolean isPortletModeAllowed(PortletMode mode)
- throws PortletModeException {
- if (mode == null) {
- throw new PortletModeException(
- EXCEPTIONS.getString("javax.portlet.PortletModeException.null"),
- null);
- }
-
- return isPortletModeAllowedByPortlet(mode)
- && isPortletModeAllowedByPortal(mode);
- }
-
- private boolean isPortletModeAllowedByPortlet(PortletMode mode)
- throws PortletModeException {
- // PLT 8.1: View Portlet Mode should always be
- // supported by a portlet, even if not defined in the descriptor
- if (mode.equals(PortletMode.VIEW)) {
- return true;
- }
-
- PortletDD dd = internalPortletWindow.getPortletEntity()
- .getPortletDefinition();
- Iterator supports = dd.getSupports().iterator();
- while(supports.hasNext()) {
- SupportsDD support = (SupportsDD)supports.next();
- Iterator modes = support.getPortletModes().iterator();
- while(modes.hasNext()) {
- String md = (String)modes.next();
- if (md.toUpperCase().equals(
- mode.toString().toUpperCase())) {
- return true;
- }
- }
- }
- String message = EXCEPTIONS.getString(
- "javax.portlet.PortletModeException.portlet", mode.toString());
-
- throw new PortletModeException(message, mode);
- }
-
- private boolean isPortletModeAllowedByPortal(PortletMode mode)
- throws PortletModeException {
- Enumeration supportedModes = context.getSupportedPortletModes();
- while (supportedModes.hasMoreElements()) {
- if (supportedModes.nextElement().toString().toUpperCase().equals(
- (mode.toString().toUpperCase()))) {
- return true;
- }
- }
- String message = EXCEPTIONS.getString(
- "javax.portlet.PortletModeException.portal", mode.toString());
-
- throw new PortletModeException(message, mode);
- }
-
- private boolean isWindowStateAllowed(WindowState state) {
- Enumeration supportedStates = context.getSupportedWindowStates();
- while (supportedStates.hasMoreElements()) {
- if (supportedStates.nextElement().toString().toUpperCase().equals(
- (state.toString().toUpperCase()))) {
- return true;
- }
- }
- return false;
- }
}
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java Thu Oct 26 04:54:21 2006
@@ -213,7 +213,8 @@
*/
public String getPathTranslated() {
// TODO:
- return null;
+// return null;
+ throw new UnsupportedOperationException("This method needs to be implemented.");
}
public String getRequestURI() {
@@ -363,5 +364,11 @@
parameters.put(key, (String[]) values.toArray(new String[values.size()]));
}
}
+
+ public String getETag() {
+ // TODO Auto-generated method stub
+// return null;
+ throw new UnsupportedOperationException("This method needs to be implemented.");
+ }
}
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderResponseImpl.java Thu Oct 26 04:54:21 2006
@@ -29,6 +29,7 @@
import org.apache.pluto.util.StringUtils;
import org.apache.pluto.util.impl.NamespaceMapperImpl;
+import javax.portlet.CacheControl;
import javax.portlet.PortletURL;
import javax.portlet.RenderResponse;
import javax.servlet.http.HttpServletRequest;
@@ -62,10 +63,7 @@
private boolean included = false;
/** The current content type. */
- private String currentContentType = null;
-
- private NamespaceMapper mapper = new NamespaceMapperImpl();
-
+ private String currentContentType = null;
// Constructor -------------------------------------------------------------
@@ -85,28 +83,6 @@
return currentContentType;
}
- public PortletURL createRenderURL() {
- return createURL(false);
- }
-
- public PortletURL createActionURL() {
- return createURL(true);
- }
-
- public String getNamespace() {
- String namespace = mapper.encode(getInternalPortletWindow().getId(), "");
- StringBuffer validNamespace = new StringBuffer();
- for (int i = 0; i < namespace.length(); i++) {
- char ch = namespace.charAt(i);
- if (Character.isJavaIdentifierPart(ch)) {
- validNamespace.append(ch);
- } else {
- validNamespace.append('_');
- }
- }
- return validNamespace.toString();
- }
-
public void setTitle(String title) {
PortalCallbackService callback = getContainer()
.getRequiredContainerServices()
@@ -175,7 +151,8 @@
public int getBufferSize() {
// TODO: return this.getHttpServletResponse().getBufferSize();
- return 0;
+// return 0;
+ throw new UnsupportedOperationException("portlet container does not support buffering");
}
public void flushBuffer() throws IOException {
@@ -234,20 +211,6 @@
// Private Methods ---------------------------------------------------------
/**
- * Creates a portlet URL.
- * TODO: make dynamic? as service?
- * @param isAction true for an action URL, false for a render URL.
- * @return the created portlet (action/render) URL.
- */
- private PortletURL createURL(boolean isAction) {
- return new PortletURLImpl(getContainer(),
- getInternalPortletWindow(),
- getHttpServletRequest(),
- getHttpServletResponse(),
- isAction);
- }
-
- /**
* Checks if the specified content type is valid (supported by the portlet).
* The specified content type should be a tripped mime type without any
* character encoding suffix.
@@ -291,5 +254,15 @@
// Return the check result.
return valid;
}
+
+ /**
+ * Gets implementation of JSR-286 <code>CacheControl</code>.
+ *
+ * @since 2.0
+ */
+ public CacheControl getCacheControl() {
+ // TODO Auto-generated method stub
+ return new CacheControlImpl();
+ }
}
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java Thu Oct 26 04:54:21 2006
@@ -54,6 +54,13 @@
public void setAction(boolean action);
/**
+ * Specifies whether or not this request should be considered an resource Serving
+ * request.
+ * @since 2.0
+ */
+ public void setResourceServing(boolean action);
+
+ /**
* By calling this method the URL is defined as a secure URL.
*/
public void setSecure();
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/ActionResponseWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/ActionResponseWrapper.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/ActionResponseWrapper.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/ActionResponseWrapper.java Thu Oct 26 04:54:21 2006
@@ -20,6 +20,7 @@
import javax.portlet.ActionResponse;
import javax.portlet.PortletMode;
import javax.portlet.PortletModeException;
+import javax.portlet.StateAwareResponse;
import javax.portlet.WindowState;
import javax.portlet.WindowStateException;
@@ -76,6 +77,17 @@
return (ActionResponse) getPortletResponse();
}
+ public StateAwareResponse getStateAwareResponse(){
+ return (StateAwareResponse) getPortletResponse();
+ }
+
+ public void setEvent(String name, Object value) {
+ this.getStateAwareResponse().setEvent(name, value);
+ }
+
+ public void setEvents(Map events) {
+ this.getStateAwareResponse().setEvents(events);
+ }
// --------------------------------------------------------------------------------------------
}
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletRequestWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletRequestWrapper.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletRequestWrapper.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletRequestWrapper.java Thu Oct 26 04:54:21 2006
@@ -177,6 +177,10 @@
public int getServerPort() {
return this.getPortletRequest().getServerPort();
}
+
+ public String getWindowId() {
+ return this.getPortletRequest().getWindowId();
+ }
// --------------------------------------------------------------------------------------------
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletResponseWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletResponseWrapper.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletResponseWrapper.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/PortletResponseWrapper.java Thu Oct 26 04:54:21 2006
@@ -16,6 +16,8 @@
package org.apache.pluto.wrappers;
import javax.portlet.PortletResponse;
+import javax.portlet.PortletURL;
+import javax.portlet.ResourceURL;
public class PortletResponseWrapper
extends javax.servlet.http.HttpServletResponseWrapper
@@ -46,6 +48,31 @@
public String encodeURL(String path) {
return this.getPortletResponse().encodeURL(path);
}
+
+ public void addProperty(String arg0, String arg1, int arg2) {
+ this.getPortletResponse().addProperty(arg0, arg1, arg2);
+ }
+
+ public PortletURL createActionURL() {
+ return this.getPortletResponse().createActionURL();
+ }
+
+ public PortletURL createRenderURL() {
+ return this.getPortletResponse().createRenderURL();
+ }
+
+ public ResourceURL createResourceURL() {
+ return this.getPortletResponse().createResourceURL();
+ }
+
+ public String getNamespace() {
+ return this.getPortletResponse().getNamespace();
+ }
+
+ public void setProperty(String arg0, String arg1, int arg2) {
+ this.getPortletResponse().setProperty(arg0, arg1, arg2);
+ }
+
// --------------------------------------------------------------------------------------------
// additional methods -------------------------------------------------------------------------
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/RenderRequestWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/RenderRequestWrapper.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/RenderRequestWrapper.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/RenderRequestWrapper.java Thu Oct 26 04:54:21 2006
@@ -35,6 +35,15 @@
// javax.portlet.RenderRequest implementation -------------------------------------------------
+ /**
+ * Returns an implementation of JSR-286 <code>ETag</code>.
+ *
+ * @since 2.0
+ */
+ public String getETag() {
+ return getRenderRequest().getETag();
+ }
+
// --------------------------------------------------------------------------------------------
// additional methods -------------------------------------------------------------------------
Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/RenderResponseWrapper.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/RenderResponseWrapper.java?view=diff&rev=467967&r1=467966&r2=467967
==============================================================================
--- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/RenderResponseWrapper.java (original)
+++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/wrappers/RenderResponseWrapper.java Thu Oct 26 04:54:21 2006
@@ -15,6 +15,7 @@
*/
package org.apache.pluto.wrappers;
+import javax.portlet.CacheControl;
import javax.portlet.PortletURL;
import javax.portlet.RenderResponse;
import java.io.IOException;
@@ -101,6 +102,15 @@
}
// --------------------------------------------------------------------------------------------
+ /**
+ * Returns an implementation of JSR-286 <code>CacheContol</code>.
+ *
+ * @since 2.0
+ */
+ public CacheControl getCacheControl() {
+ return this.getRenderResponse().getCacheControl();
+ }
+
// additional methods -------------------------------------------------------------------------
/**
* Return the wrapped ServletResponse object.