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 ms...@apache.org on 2016/04/14 14:28:55 UTC
[15/50] [abbrv] portals-pluto git commit: Renamed PortletState to
RenderState and made all corresponding code and documentation updates.
Renamed PortletState to RenderState and made all corresponding code and
documentation updates.
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/5a59b412
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/5a59b412
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/5a59b412
Branch: refs/heads/master
Commit: 5a59b412ee7fff35902be68a1ecfa83b4ff93b14
Parents: 724f7ac
Author: Scott Nicklous <ms...@apache.org>
Authored: Fri Feb 26 14:02:18 2016 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Fri Feb 26 14:02:18 2016 +0100
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/jsp/view-csp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-isp.jsp | 6 +-
.../src/main/webapp/WEB-INF/jsp/view-ivp.jsp | 4 +-
.../src/main/webapp/WEB-INF/jsp/view-ptp.jsp | 2 +-
.../portals/samples/HelloWorldRender.java | 2 +-
.../org/apache/portals/samples/NameBean.java | 6 +-
.../src/main/webapp/WEB-INF/jsp/view-csp.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/view-isp.jsp | 6 +-
.../src/main/webapp/WEB-INF/jsp/view-ivp.jsp | 4 +-
.../container/bean/processor/ConfigServlet.java | 2 +-
.../container/bean/processor/ConfigSummary.java | 6 +-
.../processor/PortletAnnotationRecognizer.java | 12 +-
.../bean/processor/PortletInvoker.java | 4 +-
.../processor/PortletSessionScopedConfig.java | 8 +-
.../processor/PortletStateScopedBeanHolder.java | 10 +-
.../processor/PortletStateScopedConfig.java | 18 +-
.../processor/PortletStateScopedContext.java | 10 +-
.../pluto/container/impl/BaseURLImpl.java | 6 +-
.../pluto/container/impl/PortletURLImpl.java | 2 +-
.../fixtures/PortletStateScopedBadClass.java | 6 +-
.../fixtures/PortletStateScopedClass.java | 6 +-
.../PortletStateScopedNoParamNameClass.java | 6 +-
.../fixtures/mocks/MockPortletRequest.java | 6 +-
.../fixtures/mocks/MockStateAwareResponse.java | 10 +-
.../bean/processor/tests/EventFixupTest.java | 2 +-
.../tests/PortletSessionAppScopeTest.java | 2 +-
.../tests/PortletSessionScopedTest.java | 2 +-
.../processor/tests/PortletStateScopedTest.java | 2 +-
.../bean/processor/tests/RenderTest.java | 2 +-
.../bean/processor/tests/ResourceTest.java | 2 +-
pluto-portal/src/main/webapp/portlet.js | 102 +-
pluto-portal/src/main/webapp/portletHubImpl.js | 20 +-
.../main/java/javax/portlet/ActionResponse.java | 372 ++--
.../src/main/java/javax/portlet/BaseURL.java | 866 ++++----
.../main/java/javax/portlet/MimeResponse.java | 1300 ++++++------
.../src/main/java/javax/portlet/Mutable.java | 2 +-
.../javax/portlet/MutableActionParameters.java | 4 +-
.../javax/portlet/MutablePortletParameters.java | 8 +-
.../java/javax/portlet/MutablePortletState.java | 162 --
.../javax/portlet/MutableRenderParameters.java | 6 +-
.../java/javax/portlet/MutableRenderState.java | 161 ++
.../portlet/MutableResourceParameters.java | 4 +-
.../main/java/javax/portlet/PortletRequest.java | 1976 +++++++++---------
.../main/java/javax/portlet/PortletState.java | 94 -
.../src/main/java/javax/portlet/PortletURL.java | 10 +-
.../java/javax/portlet/RenderParameters.java | 2 +-
.../main/java/javax/portlet/RenderState.java | 94 +
.../java/javax/portlet/StateAwareResponse.java | 571 ++---
.../javax/portlet/WindowStateException.java | 212 +-
.../javax/portlet/annotations/ActionParam.java | 2 +-
.../javax/portlet/annotations/ContextPath.java | 2 +-
.../javax/portlet/annotations/Namespace.java | 2 +-
.../annotations/PortletSerializable.java | 10 +-
.../portlet/annotations/PortletStateScoped.java | 96 -
.../javax/portlet/annotations/RenderParam.java | 2 +-
.../portlet/annotations/RenderStateScoped.java | 96 +
.../portlet/annotations/ResourceParam.java | 2 +-
.../javax/portlet/annotations/URLFactory.java | 2 +-
.../javax/portlet/annotations/WindowId.java | 2 +-
.../javax/portlet/annotations/package-info.java | 34 +-
.../javax/portlet/filter/BaseURLWrapper.java | 2 +-
.../filter/MutablePortletStateWrapper.java | 97 -
.../filter/MutableRenderStateWrapper.java | 97 +
.../portlet/filter/PortletRequestWrapper.java | 2 +-
.../portlet/filter/PortletStateWrapper.java | 102 -
.../javax/portlet/filter/PortletURLWrapper.java | 6 +-
.../portlet/filter/RenderStateWrapper.java | 102 +
.../filter/StateAwareResponseWrapper.java | 10 +-
portlet-api/src/main/javadoc/overview.html | 16 +-
portlet-api/src/main/javadoc/portlet-api.css | 10 +-
portlet-api/src/main/javascript/MockData.js | 24 +-
portlet-api/src/main/javascript/portlet.js | 133 +-
portlet-api/src/test/javascript/ActionTest.js | 16 +-
.../src/test/javascript/AddEventListenerTest.js | 90 +-
.../test/javascript/CreateResourceUrlTest.js | 6 +-
.../src/test/javascript/IsInProgressTest.js | 12 +-
.../src/test/javascript/JasminePortletUtils.js | 14 +-
.../src/test/javascript/PartialActionTest.js | 22 +-
.../src/test/javascript/SetPortletStateTest.js | 172 +-
.../src/test/javascript/SimulatedErrorTests.js | 10 +-
portlet-api/src/test/javascript/StateTests.js | 2 +-
81 files changed, 3663 insertions(+), 3656 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-csp.jsp b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
index 3e3bb5e..2a89b9e 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
@@ -161,7 +161,7 @@ limitations under the License.
} else {
newState = currState.clone();
newState.p.setValue('color', newColor);
- hub.setPortletState(newState);
+ hub.setRenderState(newState);
}
};
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-isp.jsp b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
index fde3c26..4c0fcf3 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
@@ -61,7 +61,7 @@ limitations under the License.
if (currState.parameters.imgName !== this.value) {
var newState = currState.clone();
newState.p.setValue('imgName', this.value);
- hub.setPortletState(newState);
+ hub.setRenderState(newState);
}
},
@@ -72,7 +72,7 @@ limitations under the License.
if (currState.parameters.imgName !== this.value) {
var newState = currState.clone();
newState.p.setValue('imgName', this.value);
- hub.setPortletState(newState);
+ hub.setRenderState(newState);
}
},
@@ -157,7 +157,7 @@ limitations under the License.
if (currState.parameters.selType !== this.value) {
var newState = currState.clone();
newState.p.setValue('selType', this.value);
- hub.setPortletState(newState);
+ hub.setRenderState(newState);
}
};
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
index d64b323..0a27ef9 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
@@ -118,7 +118,7 @@ limitations under the License.
cacheability = c;
nstate = currState.clone();
nstate.p.setValue('ca', c);
- hub.setPortletState(nstate);
+ hub.setRenderState(nstate);
}
};
@@ -137,7 +137,7 @@ limitations under the License.
} else {
nstate.p.remove('bo');
}
- hub.setPortletState(nstate);
+ hub.setRenderState(nstate);
};
// Register this portlet with the Portlet Hub and add event listener for
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
----------------------------------------------------------------------
diff --git a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
index cbb8d63..7a5715f 100644
--- a/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
+++ b/PortletHubDemo/src/main/webapp/WEB-INF/jsp/view-ptp.jsp
@@ -115,7 +115,7 @@ Leaving the value field empty will set the parameter to an array containing a si
}
}
- hub.setPortletState(nstate);
+ hub.setRenderState(nstate);
event.preventDefault();
});
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/PortletV3AnnotatedDemo/src/main/java/org/apache/portals/samples/HelloWorldRender.java
----------------------------------------------------------------------
diff --git a/PortletV3AnnotatedDemo/src/main/java/org/apache/portals/samples/HelloWorldRender.java b/PortletV3AnnotatedDemo/src/main/java/org/apache/portals/samples/HelloWorldRender.java
index 71e27da..4c08a1b 100644
--- a/PortletV3AnnotatedDemo/src/main/java/org/apache/portals/samples/HelloWorldRender.java
+++ b/PortletV3AnnotatedDemo/src/main/java/org/apache/portals/samples/HelloWorldRender.java
@@ -28,7 +28,7 @@ import javax.portlet.annotations.RenderMethod;
*/
public class HelloWorldRender {
- // This is an @PortletStateScoped bean containing the name
+ // This is an @RenderStateScoped bean containing the name
// entered through the form.
@Inject
private NameBean nameBean;
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/PortletV3AnnotatedDemo/src/main/java/org/apache/portals/samples/NameBean.java
----------------------------------------------------------------------
diff --git a/PortletV3AnnotatedDemo/src/main/java/org/apache/portals/samples/NameBean.java b/PortletV3AnnotatedDemo/src/main/java/org/apache/portals/samples/NameBean.java
index 25dd88e..832f0f5 100644
--- a/PortletV3AnnotatedDemo/src/main/java/org/apache/portals/samples/NameBean.java
+++ b/PortletV3AnnotatedDemo/src/main/java/org/apache/portals/samples/NameBean.java
@@ -31,16 +31,16 @@ import javax.portlet.annotations.ActionMethod;
import javax.portlet.annotations.ActionParam;
import javax.portlet.annotations.Namespace;
import javax.portlet.annotations.PortletSerializable;
-import javax.portlet.annotations.PortletStateScoped;
+import javax.portlet.annotations.RenderStateScoped;
import javax.portlet.annotations.RenderMethod;
import javax.portlet.annotations.URLFactory;
import javax.portlet.MimeResponse.Copy;
/**
- * Portlet state scoped bean. The bean is stored as a render parameter,
+ * Render state scoped bean. The bean is stored as a render parameter,
* so it needs to be portlet serializable.
*/
-@PortletStateScoped
+@RenderStateScoped
public class NameBean implements PortletSerializable {
// Inject the portlet namespace
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-csp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
index 1dacb93..875141e 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-csp.jsp
@@ -161,7 +161,7 @@ limitations under the License.
} else {
newState = currState.clone();
newState.p.setValue('color', newColor);
- hub.setPortletState(newState);
+ hub.setRenderState(newState);
}
};
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-isp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
index 29393ee..90ce353 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-isp.jsp
@@ -61,7 +61,7 @@ limitations under the License.
if (currState.parameters.photo !== this.value) {
var newState = currState.clone();
newState.p.setValue('photo', this.value);
- hub.setPortletState(newState);
+ hub.setRenderState(newState);
}
},
@@ -72,7 +72,7 @@ limitations under the License.
if (currState.parameters.photo !== this.value) {
var newState = currState.clone();
newState.p.setValue('photo', this.value);
- hub.setPortletState(newState);
+ hub.setRenderState(newState);
}
},
@@ -157,7 +157,7 @@ limitations under the License.
if (currState.parameters.selType !== this.value) {
var newState = currState.clone();
newState.p.setValue('selType', this.value);
- hub.setPortletState(newState);
+ hub.setRenderState(newState);
}
};
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
----------------------------------------------------------------------
diff --git a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
index d64b323..0a27ef9 100644
--- a/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
+++ b/PortletV3Demo/src/main/webapp/WEB-INF/jsp/view-ivp.jsp
@@ -118,7 +118,7 @@ limitations under the License.
cacheability = c;
nstate = currState.clone();
nstate.p.setValue('ca', c);
- hub.setPortletState(nstate);
+ hub.setRenderState(nstate);
}
};
@@ -137,7 +137,7 @@ limitations under the License.
} else {
nstate.p.remove('bo');
}
- hub.setPortletState(nstate);
+ hub.setRenderState(nstate);
};
// Register this portlet with the Portlet Hub and add event listener for
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/ConfigServlet.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/ConfigServlet.java b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/ConfigServlet.java
index 8757441..bd78013 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/ConfigServlet.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/ConfigServlet.java
@@ -89,7 +89,7 @@ public class ConfigServlet extends HttpServlet {
errorString.append("<h4>Available annotated portlet artifacts:</h4>");
// formatToErrorString(ams.getConfigAsString().split("\n"));
formatToErrorString(ams.getMethodsAsString().split("\n"));
- errorString.append("<h4>PortletStateScoped Bean Configuration:</h4>");
+ errorString.append("<h4>RenderStateScoped Bean Configuration:</h4>");
formatToErrorString(config.getConfigAsString().split("\n"));
} else {
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/ConfigSummary.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/ConfigSummary.java b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/ConfigSummary.java
index 2978262..564845c 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/ConfigSummary.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/ConfigSummary.java
@@ -43,7 +43,7 @@ public class ConfigSummary {
// Per-class error messages for portlet session scoped bean deployment problems
private final Map<Class<?>, String> badSessionBeans = new HashMap<Class<?>, String>();
- // Per-class error messages for portlet state scoped bean deployment problems
+ // Per-class error messages for render state scoped bean deployment problems
private final Map<Class<?>, String> badStateBeans = new HashMap<Class<?>, String>();
// Per-portlet error messages for deployment problems. Key is the portlet name.
@@ -89,7 +89,7 @@ public class ConfigSummary {
}
/**
- * Stores an error string to document portlet state scoped bean deployment problems.
+ * Stores an error string to document render state scoped bean deployment problems.
*
* @param portletName
* @param msg
@@ -109,7 +109,7 @@ public class ConfigSummary {
}
/**
- * Returns a list of all portlet state scoped bean classes with deployment problems.
+ * Returns a list of all render state scoped bean classes with deployment problems.
*
* @return
*/
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletAnnotationRecognizer.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletAnnotationRecognizer.java b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletAnnotationRecognizer.java
index 7026200..451acf0 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletAnnotationRecognizer.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletAnnotationRecognizer.java
@@ -50,7 +50,7 @@ import javax.portlet.annotations.HeaderMethod;
import javax.portlet.annotations.InitMethod;
import javax.portlet.annotations.PortletSerializable;
import javax.portlet.annotations.PortletSessionScoped;
-import javax.portlet.annotations.PortletStateScoped;
+import javax.portlet.annotations.RenderStateScoped;
import javax.portlet.annotations.RenderMethod;
import javax.portlet.annotations.ServeResourceMethod;
@@ -69,7 +69,7 @@ public class PortletAnnotationRecognizer extends AnnotationRecognizer {
new HashSet<Class<? extends Annotation>>();
static {
- classAnnotations.add(PortletStateScoped.class);
+ classAnnotations.add(RenderStateScoped.class);
classAnnotations.add(PortletSessionScoped.class);
classAnnotations.add(SessionScoped.class);
classAnnotations.add(RequestScoped.class);
@@ -210,20 +210,20 @@ public class PortletAnnotationRecognizer extends AnnotationRecognizer {
String typeName = aType.getJavaClass().getCanonicalName();
Class<?> theClass = aType.getJavaClass();
- if (anno instanceof PortletStateScoped) {
+ if (anno instanceof RenderStateScoped) {
- // Verify the portlet state scoped class, store the annotation &
+ // Verify the render state scoped class, store the annotation &
// bean type with the corresponding bean holder.
if (!PortletSerializable.class.isAssignableFrom(theClass)) {
StringBuilder txt = new StringBuilder(128);
- txt.append("Annotation problem: An @PortletStateScoped bean must implement PortletSerializable. ");
+ txt.append("Annotation problem: An @RenderStateScoped bean must implement PortletSerializable. ");
txt.append("Annotation: ").append(anno.annotationType().getSimpleName());
txt.append(", Class: ").append(typeName);
LOG.debug(txt.toString());
summary.addStateBeanErrorString(theClass, txt.toString());
} else {
- stateScopedConfig.addAnnotation(theClass, (PortletStateScoped) anno);
+ stateScopedConfig.addAnnotation(theClass, (RenderStateScoped) anno);
}
} else if (anno instanceof PortletSessionScoped) {
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletInvoker.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletInvoker.java b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletInvoker.java
index 33853a9..c4d1adc 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletInvoker.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletInvoker.java
@@ -119,7 +119,7 @@ public class PortletInvoker implements Portlet, ResourceServingPortlet, EventPor
// Set the portlet session bean holder for the thread & session
PortletSessionBeanHolder.setBeanHolder(req, acb.getSessionScopedConfig());
- // Set the portlet state scoped bean holder
+ // Set the render state scoped bean holder
PortletStateScopedBeanHolder.setBeanHolder(req, acb.getStateScopedConfig());
// Set up the artifact producer with request, response, and portlet config
@@ -138,7 +138,7 @@ public class PortletInvoker implements Portlet, ResourceServingPortlet, EventPor
// Remove the portlet session bean holder for the thread
PortletSessionBeanHolder.removeBeanHolder();
- // Remove the portlet state bean holder. pass response if we're
+ // Remove the render state bean holder. pass response if we're
// dealing with a StateAwareResponse. The response is used for state
// storage.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletSessionScopedConfig.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletSessionScopedConfig.java b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletSessionScopedConfig.java
index ce8d445..58462f5 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletSessionScopedConfig.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletSessionScopedConfig.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Configuration for PortletStateScoped CDI beans.
+ * Configuration for RenderStateScoped CDI beans.
*
* @author Scott Nicklous
*
@@ -61,7 +61,7 @@ public class PortletSessionScopedConfig implements Serializable {
/**
* Called by the CDI extension during the scanning phase to add information about
- * a <code>{@literal @}PortletStateScoped</code> bean.
+ * a <code>{@literal @}RenderStateScoped</code> bean.
*
* @param beanClass The bean class
* @param anno The annotation
@@ -100,7 +100,7 @@ public class PortletSessionScopedConfig implements Serializable {
}
/**
- * Returns the portlet state scoped annotated classes.
+ * Returns the render state scoped annotated classes.
* <p>
* Used for test / validation purposes.
*
@@ -111,7 +111,7 @@ public class PortletSessionScopedConfig implements Serializable {
}
/**
- * Returns a portlet state scoped bean summary for display
+ * Returns a render state scoped bean summary for display
*
* @return The configuration summary string
*
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedBeanHolder.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedBeanHolder.java b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedBeanHolder.java
index 04477a1..d0ec561 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedBeanHolder.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedBeanHolder.java
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This is a container for PortletStateScoped CDI beans.
+ * This is a container for RenderStateScoped CDI beans.
*
* @author Scott Nicklous
*
@@ -80,13 +80,13 @@ public class PortletStateScopedBeanHolder implements Serializable {
* portlet session. If no bean holder exists in the session, a new one is created.
*
* @param req The portlet request
- * @return The portlet state bean holder
+ * @return The render state bean holder
*/
public static void setBeanHolder(PortletRequest req, PortletStateScopedConfig config) {
if (isTrace) {
StringBuilder txt = new StringBuilder(80);
- txt.append("Setting portlet state bean holder.");
+ txt.append("Setting render state bean holder.");
txt.append(" ThreadId=").append(Thread.currentThread().getId());
LOG.trace(txt.toString());
}
@@ -109,7 +109,7 @@ public class PortletStateScopedBeanHolder implements Serializable {
if (isTrace) {
StringBuilder txt = new StringBuilder(80);
- txt.append("Removed portlet state bean holder.");
+ txt.append("Removed render state bean holder.");
txt.append(" ThreadId=").append(Thread.currentThread().getId());
LOG.trace(txt.toString());
}
@@ -195,7 +195,7 @@ public class PortletStateScopedBeanHolder implements Serializable {
if (isTrace) {
StringBuilder txt = new StringBuilder(80);
- txt.append("Removing portlet state scoped bean: ");
+ txt.append("Removing render state scoped bean: ");
if (bean instanceof Bean<?>) {
Bean<?> b = (Bean<?>) bean;
txt.append(b.getBeanClass().getSimpleName());
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedConfig.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedConfig.java b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedConfig.java
index 735f1a3..c454f23 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedConfig.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedConfig.java
@@ -30,13 +30,13 @@ import java.util.Set;
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
-import javax.portlet.annotations.PortletStateScoped;
+import javax.portlet.annotations.RenderStateScoped;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Configuration for PortletStateScoped CDI beans.
+ * Configuration for RenderStateScoped CDI beans.
*
* @author Scott Nicklous
*
@@ -47,17 +47,17 @@ public class PortletStateScopedConfig implements Serializable {
private final boolean isTrace = LOG.isTraceEnabled();
- // Contains a sorted list of PortletStateScoped annotated class names. The sorted list
+ // Contains a sorted list of RenderStateScoped annotated class names. The sorted list
// is used to generate indexes for the assigned render parameter names.
private final List<String> sortedAnnotatedClassNames = new ArrayList<String>();
// Prefix used when generating render parameter names
private static final String RP_PREFIX = "\uFE34";
- // Description for the PortletStateScoped bean
+ // Description for the RenderStateScoped bean
private class PSSDescription implements Serializable {
private static final long serialVersionUID = 4089751663717085089L;
- PortletStateScoped pssAnno;
+ RenderStateScoped pssAnno;
String paramName;
}
@@ -77,12 +77,12 @@ public class PortletStateScopedConfig implements Serializable {
/**
* Called by the CDI extension during the scanning phase to add information about
- * a <code>{@literal @}PortletStateScoped</code> bean.
+ * a <code>{@literal @}RenderStateScoped</code> bean.
*
* @param beanClass The bean class
* @param anno The annotation
*/
- public void addAnnotation(Class<?> beanClass, PortletStateScoped anno) {
+ public void addAnnotation(Class<?> beanClass, RenderStateScoped anno) {
PSSDescription desc = new PSSDescription();
desc.pssAnno = anno;
class2Anno.put(beanClass, desc);
@@ -141,7 +141,7 @@ public class PortletStateScopedConfig implements Serializable {
}
/**
- * Returns the portlet state scoped annotated classes.
+ * Returns the render state scoped annotated classes.
* <p>
* Used for test / validation purposes.
*
@@ -152,7 +152,7 @@ public class PortletStateScopedConfig implements Serializable {
}
/**
- * Returns a portlet state scoped bean summary for display
+ * Returns a render state scoped bean summary for display
*
* @return The configuration summary string
*
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedContext.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedContext.java b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedContext.java
index 251ebb9..e013c8e 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedContext.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/bean/processor/PortletStateScopedContext.java
@@ -25,10 +25,10 @@ import javax.enterprise.context.ContextNotActiveException;
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
-import javax.portlet.annotations.PortletStateScoped;
+import javax.portlet.annotations.RenderStateScoped;
/**
- * This is the Context implementation for the PortletStateScoped custom CDI scope.
+ * This is the Context implementation for the RenderStateScoped custom CDI scope.
*
* @author nick
*
@@ -45,7 +45,7 @@ public class PortletStateScopedContext implements Context {
public <T> T get(Contextual<T> bean) {
PortletStateScopedBeanHolder holder = PortletStateScopedBeanHolder.getBeanHolder();
if (holder == null) {
- throw new ContextNotActiveException("The portlet state context is not active.");
+ throw new ContextNotActiveException("The render state context is not active.");
}
return holder.getBean(bean);
}
@@ -58,7 +58,7 @@ public class PortletStateScopedContext implements Context {
PortletStateScopedBeanHolder holder = PortletStateScopedBeanHolder.getBeanHolder();
if (holder == null) {
- throw new ContextNotActiveException("The portlet state context is not active.");
+ throw new ContextNotActiveException("The render state context is not active.");
}
// The bean hoder will return an existing bean instance or create a new one
@@ -72,7 +72,7 @@ public class PortletStateScopedContext implements Context {
*/
@Override
public Class<? extends Annotation> getScope() {
- return PortletStateScoped.class;
+ return RenderStateScoped.class;
}
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/main/java/org/apache/pluto/container/impl/BaseURLImpl.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/impl/BaseURLImpl.java b/pluto-container/src/main/java/org/apache/pluto/container/impl/BaseURLImpl.java
index 52d46b5..4527622 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/impl/BaseURLImpl.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/impl/BaseURLImpl.java
@@ -174,21 +174,21 @@ public abstract class BaseURLImpl implements BaseURL {
}
/* (non-Javadoc)
- * @see javax.portlet.PortletState#getRenderParameters()
+ * @see javax.portlet.RenderState#getRenderParameters()
*/
public RenderParameters getRenderParameters() {
return new RenderParametersImpl(urlProvider, windowId);
}
/* (non-Javadoc)
- * @see javax.portlet.PortletState#getPortletMode()
+ * @see javax.portlet.RenderState#getPortletMode()
*/
public PortletMode getPortletMode() {
return urlProvider.getPortletMode();
}
/* (non-Javadoc)
- * @see javax.portlet.PortletState#getWindowState()
+ * @see javax.portlet.RenderState#getWindowState()
*/
public WindowState getWindowState() {
return urlProvider.getWindowState();
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java b/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java
index 8beff45..a6f93ed 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java
@@ -164,7 +164,7 @@ public abstract class PortletURLImpl extends BaseURLImpl implements PortletURL {
if (name == null) {
StringBuilder txt = new StringBuilder(128);
- txt.append("Given bean is not @PortletStateScoped.");
+ txt.append("Given bean is not @RenderStateScoped.");
txt.append(", bean: ").append(bean);
LOGGER.info(txt.toString());
throw new IllegalArgumentException(txt.toString());
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedBadClass.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedBadClass.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedBadClass.java
index 09111ca..4c5396e 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedBadClass.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedBadClass.java
@@ -19,15 +19,15 @@
package org.apache.pluto.container.bean.processor.fixtures;
-import javax.portlet.annotations.PortletStateScoped;
+import javax.portlet.annotations.RenderStateScoped;
/**
- * Verifies that an {@literal @}PortletStateScoped bean not implementing
+ * Verifies that an {@literal @}RenderStateScoped bean not implementing
* <code>PortletSerializable</code> is recognized.
*
* @author Scott Nicklous
*/
-@PortletStateScoped
+@RenderStateScoped
public class PortletStateScopedBadClass {
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedClass.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedClass.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedClass.java
index 3aa7dc1..01ff7aa 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedClass.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedClass.java
@@ -20,15 +20,15 @@
package org.apache.pluto.container.bean.processor.fixtures;
import javax.portlet.annotations.PortletSerializable;
-import javax.portlet.annotations.PortletStateScoped;
+import javax.portlet.annotations.RenderStateScoped;
/**
- * Verifies that an {@literal @}PortletStateScoped bean is recognized when a parameter name
+ * Verifies that an {@literal @}RenderStateScoped bean is recognized when a parameter name
* is provided.
*
* @author Scott Nicklous
*/
-@PortletStateScoped(paramName="param1")
+@RenderStateScoped(paramName="param1")
public class PortletStateScopedClass implements PortletSerializable {
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedNoParamNameClass.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedNoParamNameClass.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedNoParamNameClass.java
index 2e49abf..6c41b98 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedNoParamNameClass.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/PortletStateScopedNoParamNameClass.java
@@ -20,14 +20,14 @@
package org.apache.pluto.container.bean.processor.fixtures;
import javax.portlet.annotations.PortletSerializable;
-import javax.portlet.annotations.PortletStateScoped;
+import javax.portlet.annotations.RenderStateScoped;
/**
- * Verifies that an {@literal @}PortletStateScoped bean is recognized.
+ * Verifies that an {@literal @}RenderStateScoped bean is recognized.
*
* @author Scott Nicklous
*/
-@PortletStateScoped
+@RenderStateScoped
public class PortletStateScopedNoParamNameClass implements PortletSerializable {
@Override
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/mocks/MockPortletRequest.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/mocks/MockPortletRequest.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/mocks/MockPortletRequest.java
index d8e2d6d..6826522 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/mocks/MockPortletRequest.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/mocks/MockPortletRequest.java
@@ -57,7 +57,7 @@ public class MockPortletRequest implements PortletRequest {
}
/* (non-Javadoc)
- * @see javax.portlet.PortletState#getPortletMode()
+ * @see javax.portlet.RenderState#getPortletMode()
*/
@Override
public PortletMode getPortletMode() {
@@ -65,7 +65,7 @@ public class MockPortletRequest implements PortletRequest {
}
/* (non-Javadoc)
- * @see javax.portlet.PortletState#getRenderParameters()
+ * @see javax.portlet.RenderState#getRenderParameters()
*/
@Override
public RenderParameters getRenderParameters() {
@@ -73,7 +73,7 @@ public class MockPortletRequest implements PortletRequest {
}
/* (non-Javadoc)
- * @see javax.portlet.PortletState#getWindowState()
+ * @see javax.portlet.RenderState#getWindowState()
*/
@Override
public WindowState getWindowState() {
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/mocks/MockStateAwareResponse.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/mocks/MockStateAwareResponse.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/mocks/MockStateAwareResponse.java
index cbfc72d..6d24a84 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/mocks/MockStateAwareResponse.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/fixtures/mocks/MockStateAwareResponse.java
@@ -37,7 +37,7 @@ import javax.xml.namespace.QName;
public class MockStateAwareResponse extends MockPortletResponse implements StateAwareResponse {
/* (non-Javadoc)
- * @see javax.portlet.MutablePortletState#getRenderParameters()
+ * @see javax.portlet.MutableRenderState#getRenderParameters()
*/
@Override
public MutableRenderParameters getRenderParameters() {
@@ -45,21 +45,21 @@ public class MockStateAwareResponse extends MockPortletResponse implements State
}
/* (non-Javadoc)
- * @see javax.portlet.MutablePortletState#setPortletMode(javax.portlet.PortletMode)
+ * @see javax.portlet.MutableRenderState#setPortletMode(javax.portlet.PortletMode)
*/
@Override
public void setPortletMode(PortletMode arg0) throws PortletModeException {
}
/* (non-Javadoc)
- * @see javax.portlet.MutablePortletState#setWindowState(javax.portlet.WindowState)
+ * @see javax.portlet.MutableRenderState#setWindowState(javax.portlet.WindowState)
*/
@Override
public void setWindowState(WindowState arg0) throws WindowStateException {
}
/* (non-Javadoc)
- * @see javax.portlet.PortletState#getPortletMode()
+ * @see javax.portlet.RenderState#getPortletMode()
*/
@Override
public PortletMode getPortletMode() {
@@ -67,7 +67,7 @@ public class MockStateAwareResponse extends MockPortletResponse implements State
}
/* (non-Javadoc)
- * @see javax.portlet.PortletState#getWindowState()
+ * @see javax.portlet.RenderState#getWindowState()
*/
@Override
public WindowState getWindowState() {
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/EventFixupTest.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/EventFixupTest.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/EventFixupTest.java
index bf8f224..55b1831 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/EventFixupTest.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/EventFixupTest.java
@@ -48,7 +48,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
/**
- * Test class for PortletStateScoped beans
+ * Test class for RenderStateScoped beans
*
* @author Scott Nicklous
*
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletSessionAppScopeTest.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletSessionAppScopeTest.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletSessionAppScopeTest.java
index 8f054ec..3f7c4c9 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletSessionAppScopeTest.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletSessionAppScopeTest.java
@@ -52,7 +52,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
/**
- * Test class for PortletStateScoped beans
+ * Test class for RenderStateScoped beans
*
* @author Scott Nicklous
*
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletSessionScopedTest.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletSessionScopedTest.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletSessionScopedTest.java
index ab51e65..15b95ea 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletSessionScopedTest.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletSessionScopedTest.java
@@ -52,7 +52,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
/**
- * Test class for PortletStateScoped beans
+ * Test class for RenderStateScoped beans
*
* @author Scott Nicklous
*
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletStateScopedTest.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletStateScopedTest.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletStateScopedTest.java
index 36ed9a6..105ac11 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletStateScopedTest.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/PortletStateScopedTest.java
@@ -45,7 +45,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
/**
- * Test class for PortletStateScoped beans
+ * Test class for RenderStateScoped beans
*
* @author Scott Nicklous
*
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/RenderTest.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/RenderTest.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/RenderTest.java
index 0d58bbf..f085a1e 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/RenderTest.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/RenderTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
/**
- * Test class for PortletStateScoped beans
+ * Test class for RenderStateScoped beans
*
* @author Scott Nicklous
*
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/ResourceTest.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/ResourceTest.java b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/ResourceTest.java
index c409481..e5724e1 100644
--- a/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/ResourceTest.java
+++ b/pluto-container/src/test/java/org/apache/pluto/container/bean/processor/tests/ResourceTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
/**
- * Test class for PortletStateScoped beans
+ * Test class for RenderStateScoped beans
*
* @author Scott Nicklous
*
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-portal/src/main/webapp/portlet.js
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/portlet.js b/pluto-portal/src/main/webapp/portlet.js
index 7173472..e34232b 100644
--- a/pluto-portal/src/main/webapp/portlet.js
+++ b/pluto-portal/src/main/webapp/portlet.js
@@ -67,12 +67,12 @@
*/
/**
- * Represents the portlet state.
+ * Represents the render state.
* <p>
- * PortletState objects obtained from the Portlet Hub define some helper
+ * RenderState objects obtained from the Portlet Hub define some helper
* functions for accessing the parameter values.
* <p>
- * @typedef PortletState
+ * @typedef RenderState
* @property {PortletParameters} parameters The portlet parameters
* @property {PortletParameters} p an alias for the 'parameters' property
* @property {string} portletMode The portlet mode
@@ -103,7 +103,7 @@
/**
* Optional render data that may be provided by the portlet hub when
- * a portlet state change occurs.
+ * a render state change occurs.
*
* @typedef RenderData
* @property {string} renderData The render data
@@ -119,29 +119,29 @@
* event type through the {@link addEventListener} function.
* <p>
* When the portlet hub calls the onStateChange callback, it will pass
- * a copy of the current portlet state as a parameter.
- * The portlet client can make changes to the PortletState object
- * without affecting the actual portlet state, which is maintained by the
+ * a copy of the current render state as a parameter.
+ * The portlet client can make changes to the RenderState object
+ * without affecting the actual render state, which is maintained by the
* portlet hub.
- * The portlet client uses the {@link setPortletState} method to
- * make changes to the local copy of the PortletState object active.
+ * The portlet client uses the {@link setRenderState} method to
+ * make changes to the local copy of the RenderState object active.
* <p>
* Optionally, the portlet hub will make a RenderData object available
* to the portlet client.
* When the RenderData object is available, it contains the same data
* as would be available through a portlet resource request using the
- * current portlet state with no additional resource parameters and with
+ * current render state with no additional resource parameters and with
* the resource URL cacheability option set to "PAGE".
* <p>
* The portlet client may not call portlet hub functions that can
- * cause state to be updated ({@link action}, {@link updatePortletState},
+ * cause state to be updated ({@link action}, {@link updateRenderState},
* {@link startPartialAction})
* during onStateChange execution.
*
* @name onStateChange
* @callback onStateChange
* @param {string} type The event type "portlet.onStateChange".
- * @param {PortletState} portletState The portlet state
+ * @param {RenderState} portletState The render state
* @param {RenderData} renderData The render data.
* Optionally provided by the portlet hub.
*/
@@ -234,7 +234,7 @@
* </dd>
* </dl>
* <h5>
- * Changing the Portlet State
+ * Changing the render state
* </h5>
* <p>
* The portlet client can use portlet hub functions to initiate state changes.
@@ -261,7 +261,7 @@
* portlets will not be updated with new page state information before the
* page refresh is carried out.
* <h5>
- * Receiving Portlet State Updates
+ * Receiving render state Updates
* </h5>
* <p>
* When a state change occurs that affects a portlet, the portlet hub informs the
@@ -301,14 +301,14 @@
* The portlet hub calls the portlet client callback functions in several situations as described
* above.
* When the portlet hub calls the portlet client, the portlet client may navigate
- * to a different page or may initiate another change to the portlet state
+ * to a different page or may initiate another change to the render state
* that could potentially cause a page refresh.
* <p>
- * Due to this behavior, the delivery of neither portlet state updates nor
+ * Due to this behavior, the delivery of neither render state updates nor
* portlet client events can be guaranteed.
* <p>
* The portlet hub provides for orderly state transitions by allowing only a
- * single blocking operation ({@link action}, {@link setPortletState},
+ * single blocking operation ({@link action}, {@link setRenderState},
* {@link startPartialAction}) to be active at any one time.
* <p>
* The state transition is considered to be active from the initial portlet
@@ -322,7 +322,7 @@
* <li>
* It is not possible to initiate a sequence of blocking operations.
* <p>
- * For example, once a portlet client calls the {@link setPortletState} method,
+ * For example, once a portlet client calls the {@link setRenderState} method,
* it cannot call any additional blocking method until after its
* onStateChange listener function has been called.
* </li>
@@ -447,7 +447,7 @@ var portlet = portlet || {};
* for each portlet
*
* @typedef PortletData
- * @property {PortletState} state The current PortletState object
+ * @property {RenderState} state The current RenderState object
* @property {string[]} pubParms String array declaring the public
* parameters for the portlet
* @property {RenderData} renderData Render data for the portlet
@@ -813,7 +813,7 @@ var portlet = portlet || {};
},
/**
- * Accepts an object containing changed portlet states. Updates
+ * Accepts an object containing changed render states. Updates
* the state for each portlet present.
*
* @param {string} upids array of portlet IDs to be updated
@@ -858,14 +858,14 @@ var portlet = portlet || {};
},
/**
- * Updates the portlet state, taking the public render
+ * Updates the render state, taking the public render
* parameters into account.
* The portlet client requesting the change, represented
* by the supplied portelt ID, is updated, along with each portlet
* that has a public render parameter update.
*
* @param {string} pid The portlet ID
- * @param {PortletState} state The new portlet state
+ * @param {RenderState} state The new render state
* @throws {AccessDeniedException}
* Thrown if a blocking operation is
* already in progress.
@@ -1017,7 +1017,7 @@ var portlet = portlet || {};
* for the portlet.
*
* @param {string} pid The portlet ID
- * @param {PortletState} state The portlet state object to check
+ * @param {RenderState} state The render state object to check
* @private
* @throws {IllegalArgumentException}
* Thrown if any component of the state is incorrect
@@ -1237,7 +1237,7 @@ var portlet = portlet || {};
* <dl>
* <dt>portlet.onStateChange</dt>
* <dd>
- * Fired when the portlet state changes.
+ * Fired when the render state changes.
* In order to participate in the portlet Ajax support, a portlet client must register
* an {@link onStateChange} event listener for this event type.
* <p>
@@ -1360,31 +1360,31 @@ var portlet = portlet || {};
},
/**
- * Sets the portlet state, which consists of the public and private
+ * Sets the render state, which consists of the public and private
* render parameters, the portlet mode, and the window state.
* <p>
- * When the portlet state has been successfully set, a copy of the portlet state
+ * When the render state has been successfully set, a copy of the render state
* will be provided to the portlet client
* through the {@link onStateChange} listener function.
* A portlet client can modify this state object and pass it to the
- * setPortletState function to update the portlet state.
+ * setRenderState function to update the render state.
* <p>
* However, it is also possible for the portal to completely refresh the
- * page as a response to setting the portlet state.
+ * page as a response to setting the render state.
* This may occur in order to support portlets on the page that do not participate
* in the Portlet 3.0 Ajax support or due to configuration settings, for example.
* <p>
* If the page is completely refreshed, it will be rendered according to
* render parameters set on the server.
* <p>
- * Setting the portlet state is a blocking operation.
+ * Setting the render state is a blocking operation.
* To allow for orderly state transitions, the portlet hub does not allow
* this function to be used while a blocking operation is in progress.
* A blocking operation is considered to be in progress
* from the initial call until the final onStateChange event for that
* operation has been fired. See {@link portlet} for further information.
*
- * @param {PortletState} state The new state to be set
+ * @param {RenderState} state The new state to be set
*
* @throws {IllegalArgumentException}
* Thrown if the input parameters are invalid
@@ -1397,15 +1397,15 @@ var portlet = portlet || {};
*
* @memberOf PortletInit
*/
- setPortletState : function (state) {
+ setRenderState : function (state) {
- console.log("setPortletState", state);
+ console.log("setRenderState", state);
// check for exactly 1 argument of type 'object'
// make sure an onStateChange listener is registered by providing portlet ID
checkArguments(arguments, 1, 1, ['object']);
- // validate portlet state & throw exception if incorrect
+ // validate render state & throw exception if incorrect
validateState(portletId, state);
// Ok so far, so do the update. Throws if busy or no callback registered
@@ -1424,8 +1424,8 @@ var portlet = portlet || {};
* the server-side serveResource method.
* <p>
* Resource parameters are optional parameters attached to a resource
- * URL in addition to any portlet state values that may be present.
- * Resource parameters do not influence the portlet state.
+ * URL in addition to any render state values that may be present.
+ * Resource parameters do not influence the render state.
* <p>
* The resource parameters must be an object containing properties
* representing parameter names whose values must be an array of string
@@ -1538,11 +1538,11 @@ var portlet = portlet || {};
* Initiates a portlet action using the specified action parameters and element
* arguments.
* <p>
- * When the action has successfully completed, a copy of the portlet state
+ * When the action has successfully completed, a copy of the render state
* will be provided to the portlet client
* through the {@link onStateChange} listener function.
* A portlet client can modify this state object and pass it to the
- * setPortletState function to update the portlet state.
+ * setRenderState function to update the render state.
* <p>
* However, it is also possible for the portal to completely refresh the
* page as a response to the action.
@@ -1553,8 +1553,8 @@ var portlet = portlet || {};
* render parameters set on the server.
* <p>
* Action parameters are optional parameters attached to a action
- * URL in addition to any portlet state values that may be present.
- * Action parameters do not influence the portlet state.
+ * URL in addition to any render state values that may be present.
+ * Action parameters do not influence the render state.
* <p>
* The action parameters must be an object containing properties
* representing parameter names whose values must be an array of string
@@ -1702,7 +1702,7 @@ var portlet = portlet || {};
* action and event processing on the server resulting from the partial action.
* <p>
* After the <code>setPageState</code> function has been called,
- * a copy of the portlet state will be provided to each affected portlet client
+ * a copy of the render state will be provided to each affected portlet client
* through the {@link onStateChange} listener function.
* <p>
* However, it is also possible for the portal to completely refresh the
@@ -1714,8 +1714,8 @@ var portlet = portlet || {};
* render parameters set on the server.
* <p>
* Action parameters are optional parameters attached to a action
- * URL in addition to any portlet state values that may be present.
- * Action parameters do not influence the portlet state.
+ * URL in addition to any render state values that may be present.
+ * Action parameters do not influence the render state.
* <p>
* The action parameters must be an object containing properties
* representing parameter names whose values must be an array of string
@@ -1797,14 +1797,14 @@ var portlet = portlet || {};
* state change is in progress before initiating a blocking operation.
* <p>
* Note that if the portlet client uses this function to implement
- * a waiting function, the portlet state may be changed during the
+ * a waiting function, the render state may be changed during the
* time that the portlet client waits.
* Also note that the portal may choose to refresh the page as a response
* to a blocking operation, in which case the waiting function would not
* complete.
* <p>
* The portlet hub provides for orderly state transitions by allowing only a
- * single blocking operation ({@link action}, {@link setPortletState},
+ * single blocking operation ({@link action}, {@link setRenderState},
* {@link startPartialAction}) to be active at any one time.
* <p>
* The state transition is considered to be active from the initial portlet
@@ -1852,9 +1852,9 @@ var portlet = portlet || {};
* Take for example a scenario where a portlet issues an event to
* several other portlets, perhaps including itself.
* Due to the event, each portlet updates parameters
- * through use of the {@link setPortletState} function.
+ * through use of the {@link setRenderState} function.
* <p>
- * The <code>setPortletState</code> function can cause a page refresh
+ * The <code>setRenderState</code> function can cause a page refresh
* depending on the situation.
* If all portlets on the page participate in the JSR 362 Ajax support,
* the portlet hub might not cause a page refresh.
@@ -1915,15 +1915,15 @@ var portlet = portlet || {};
},
/**
- * Creates and returns a new PortletState object.
+ * Creates and returns a new RenderState object.
* <p>
- * If no argument is provided, an empty PortletState object will be
- * returned. If an existing PortletState object is provided as argument,
+ * If no argument is provided, an empty RenderState object will be
+ * returned. If an existing RenderState object is provided as argument,
* a clone of the input object will be returned.
*
- * @param {PortletState} s An optional PortletState object to be copied
+ * @param {RenderState} s An optional RenderState object to be copied
*
- * @returns {PortletState} The new PortletState object
+ * @returns {RenderState} The new RenderState object
*
* @memberOf PortletInit
*/
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/pluto-portal/src/main/webapp/portletHubImpl.js
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/portletHubImpl.js b/pluto-portal/src/main/webapp/portletHubImpl.js
index 89f0406..91aff34 100644
--- a/pluto-portal/src/main/webapp/portletHubImpl.js
+++ b/pluto-portal/src/main/webapp/portletHubImpl.js
@@ -58,7 +58,7 @@ var portlet = portlet || {};
/**
* Callback function provided to the portlet hub to allow the the implementation
- * to initiate an unsolicited portlet state update for an array of portlet IDs.
+ * to initiate an unsolicited render state update for an array of portlet IDs.
* @param {string[]} pid An array of portlet IDs
* @returns {void}
* @function
@@ -188,11 +188,11 @@ var portlet = portlet || {};
},
/**
- * Compares the values of the named parameter in the new portlet state
+ * Compares the values of the named parameter in the new render state
* with the values of that parameter in the current state.
*
* @param {string} pid The portlet ID
- * @param {PortletState} state The new portlet state
+ * @param {RenderState} state The new render state
* @param {string} name The parameter name to check
* @returns {boolean} true if the new parm value is different
* from the current value
@@ -229,13 +229,13 @@ var portlet = portlet || {};
/**
* Gets the updated public parameters for the given portlet
- * ID and new portlet state.
+ * ID and new render state.
* Returns an object whose properties are the gruop indexes of the
* updated public parameters. The values are the new public
* parameter values.
*
* @param {string} pid The portlet ID
- * @param {PortletState} state The new portlet state
+ * @param {RenderState} state The new render state
* @returns {object} object containing the updated PRPs
* @private
*/
@@ -256,12 +256,12 @@ var portlet = portlet || {};
/**
- * Returns a deep-copy clone of the input portlet state object.
+ * Returns a deep-copy clone of the input render state object.
* Used to provide the portlet client with a copy of the current
* state data rather than a reference to the live state itself.
*
- * @param {PortletState} state The portlet state object to check
- * @returns {PortletState} Clone of the input portlet state
+ * @param {RenderState} state The render state object to check
+ * @returns {RenderState} Clone of the input render state
* @private
*/
cloneState = function (aState) {
@@ -922,12 +922,12 @@ var portlet = portlet || {};
getRenderData : function () {return getRenderData(pid);},
/**
- * Get current portlet state
+ * Get current render state
*/
getState : function () {return getState(pid);},
/**
- * Set new portlet state. Returns promise fullfilled with an array of
+ * Set new render state. Returns promise fullfilled with an array of
* IDs of portlets whose state have been modified.
*/
setState : function (state) {return setState(pid, state);},
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/main/java/javax/portlet/ActionResponse.java
----------------------------------------------------------------------
diff --git a/portlet-api/src/main/java/javax/portlet/ActionResponse.java b/portlet-api/src/main/java/javax/portlet/ActionResponse.java
index 31fb5f1..d2c9a87 100644
--- a/portlet-api/src/main/java/javax/portlet/ActionResponse.java
+++ b/portlet-api/src/main/java/javax/portlet/ActionResponse.java
@@ -1,186 +1,186 @@
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * This source code implements specifications defined by the Java
- * Community Process. In order to remain compliant with the specification
- * DO NOT add / change / or delete method signatures!
- */
-
-package javax.portlet;
-
-import javax.portlet.MimeResponse.Copy;
-
-
-/**
- * <span class="changed_modified_3_0">The</span>
- * <CODE>ActionResponse</CODE> interface represents the portlet
- * response to an action request.
- * It extends the <CODE>StateAwareResponse</CODE> interface to provide specific
- * action response functionality to portlets.<br>
- * The portlet container creates an <CODE>ActionResponse</CODE> object and
- * passes it as argument to the portlet's <CODE>processAction</CODE> method.
- *
- * @see StateAwareResponse
- * @see PortletResponse
- * @see ActionRequest
- */
-public interface ActionResponse extends StateAwareResponse
-{
-
- /**
- * Instructs the portlet container to send a redirect response
- * to the client using the specified redirect location URL.
- * <p>
- * This method only accepts an absolute URL (e.g.
- * <code>http://my.co/myportal/mywebap/myfolder/myresource.gif</code>)
- * or a full path URI (e.g. <code>/myportal/mywebap/myfolder/myresource.gif</code>).
- * If required,
- * the portlet container may encode the given URL before the
- * redirection is issued to the client.
- * <p>
- * The sendRedirect method cannot be invoked after any of the
- * following methods of the ActionResponse interface has been called:
- * <ul>
- * <li>setPortletMode</li>
- * <li>setWindowState</li>
- * <li>setRenderParameter</li>
- * <li>setRenderParameters</li>
- * <li>removePublicRenderParamter</li>
- * <li>getRenderParameters</li>
- * </ul>
- *
- * @param location the redirect location URL
- *
- * @exception java.io.IOException
- * if an input or output exception occurs.
- * @exception java.lang.IllegalArgumentException
- * if a relative path URL is given
- * @exception java.lang.IllegalStateException
- * if the method is invoked after any of above mentioned methods of
- * the ActionResponse interface has been called.
- */
-
- public void sendRedirect(String location)
- throws java.io.IOException;
-
- /**
- * Instructs the portlet container to send a redirect response
- * to the client using the specified redirect location URL and
- * encode a render URL as parameter on the redirect URL.
- * <p>
- * This method only accepts an absolute URL (e.g.
- * <code>http://my.co/myportal/mywebap/myfolder/myresource.gif</code>)
- * or a full path URI (e.g. <code>/myportal/mywebap/myfolder/myresource.gif</code>).
- * If required,
- * the portlet container may encode the given URL before the
- * redirection is issued to the client.
- * <p>
- * The portlet container will attach a render URL with the currently set portlet mode, window state
- * and render parameters on the <code>ActionResponse</code> and the current public render parameters.
- * The attached URL will be available as query parameter value under the key provided with the
- * <code>renderUrlParamName</code> parameter.
- * <p>
- * New values for
- * <ul>
- * <li>setPortletMode
- * <li>setWindowState
- * <li>setRenderParameter
- * <li>setRenderParameters
- * <li>getRenderParameters</li>
- * </ul>
- * are only used for creating the render URL and not remembered after the redirect
- * is issued.
- *
- * @param location the redirect location URL
- * @param renderUrlParamName name of the query parameter under which the portlet container should
- * store a render URL to this portlet
- *
- * @exception java.io.IOException
- * if an input or output exception occurs.
- * @exception java.lang.IllegalArgumentException
- * if a relative path URL is given
- *
- * @since 2.0
- */
-
- public void sendRedirect(String location, String renderUrlParamName)
- throws java.io.IOException;
-
-
- /**
- * <div class="changed_added_3_0">
- * Returns a render URL containing render parameters according to the
- * MimeResponse.Copy argument. The portlet may modify the returned render URL. The
- * URL is intended to be used in the sendRedirect(String location) method to allow
- * the portlet to force a redirect to the same page with modified portlet state. * Creates a render URL targeting the current portlet.
- * <p>
- * The getRedirectURL method cannot be invoked after any of the
- * following methods of the ActionResponse interface has been called:
- * <ul>
- * <li>setPortletMode</li>
- * <li>setWindowState</li>
- * <li>setRenderParameter</li>
- * <li>setRenderParameters</li>
- * <li>removePublicRenderParameter</li>
- * <li>getRenderParameters</li>
- * </ul>
- * <p>
- *
- * <p>
- * The new render URL will contain render parameters from the
- * current request as specified by the <code>option</code> parameter.
- * <dl>
- * <dt>NONE</dt>
- * <dd>All public and private parameters are removed from the URL.</dd>
- * <dt>ALL</dt>
- * <dd>The public and private parameters governing the current
- * request are added to the URL.</dd>
- * <dt>PUBLIC</dt>
- * <dd>Only public parameters governing the current
- * request are added to the URL.</dd>
- * </dl>
- * The URL can be further extended by adding render
- * parameters, portlet mode, and window state.
- * If no additional portlet mode, window
- * state or security modifier is set on the URL, the values from the
- * current render or resource request are preserved.
- * <p>
- * If a public render parameter value is set or removed on a render URL, then the public
- * render parameter will be set to the new value or removed when the URL is activated.
- * </div>
- *
- * @param option
- * Specifies how current parameters are to be copied to the URL
- *
- * @see Copy
- *
- * @return a portlet render URL
- *
- * @exception java.lang.IllegalStateException
- * if the method is invoked after any of above mentioned methods of
- * the ActionResponse interface has been called.
- *
- * @since 3.0
- */
- public RenderURL getRedirectURL(Copy option) throws IllegalStateException;
-}
-
-
-
-
+/* Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * This source code implements specifications defined by the Java
+ * Community Process. In order to remain compliant with the specification
+ * DO NOT add / change / or delete method signatures!
+ */
+
+package javax.portlet;
+
+import javax.portlet.MimeResponse.Copy;
+
+
+/**
+ * <span class="changed_modified_3_0">The</span>
+ * <CODE>ActionResponse</CODE> interface represents the portlet
+ * response to an action request.
+ * It extends the <CODE>StateAwareResponse</CODE> interface to provide specific
+ * action response functionality to portlets.<br>
+ * The portlet container creates an <CODE>ActionResponse</CODE> object and
+ * passes it as argument to the portlet's <CODE>processAction</CODE> method.
+ *
+ * @see StateAwareResponse
+ * @see PortletResponse
+ * @see ActionRequest
+ */
+public interface ActionResponse extends StateAwareResponse
+{
+
+ /**
+ * Instructs the portlet container to send a redirect response
+ * to the client using the specified redirect location URL.
+ * <p>
+ * This method only accepts an absolute URL (e.g.
+ * <code>http://my.co/myportal/mywebap/myfolder/myresource.gif</code>)
+ * or a full path URI (e.g. <code>/myportal/mywebap/myfolder/myresource.gif</code>).
+ * If required,
+ * the portlet container may encode the given URL before the
+ * redirection is issued to the client.
+ * <p>
+ * The sendRedirect method cannot be invoked after any of the
+ * following methods of the ActionResponse interface has been called:
+ * <ul>
+ * <li>setPortletMode</li>
+ * <li>setWindowState</li>
+ * <li>setRenderParameter</li>
+ * <li>setRenderParameters</li>
+ * <li>removePublicRenderParamter</li>
+ * <li>getRenderParameters</li>
+ * </ul>
+ *
+ * @param location the redirect location URL
+ *
+ * @exception java.io.IOException
+ * if an input or output exception occurs.
+ * @exception java.lang.IllegalArgumentException
+ * if a relative path URL is given
+ * @exception java.lang.IllegalStateException
+ * if the method is invoked after any of above mentioned methods of
+ * the ActionResponse interface has been called.
+ */
+
+ public void sendRedirect(String location)
+ throws java.io.IOException;
+
+ /**
+ * Instructs the portlet container to send a redirect response
+ * to the client using the specified redirect location URL and
+ * encode a render URL as parameter on the redirect URL.
+ * <p>
+ * This method only accepts an absolute URL (e.g.
+ * <code>http://my.co/myportal/mywebap/myfolder/myresource.gif</code>)
+ * or a full path URI (e.g. <code>/myportal/mywebap/myfolder/myresource.gif</code>).
+ * If required,
+ * the portlet container may encode the given URL before the
+ * redirection is issued to the client.
+ * <p>
+ * The portlet container will attach a render URL with the currently set portlet mode, window state
+ * and render parameters on the <code>ActionResponse</code> and the current public render parameters.
+ * The attached URL will be available as query parameter value under the key provided with the
+ * <code>renderUrlParamName</code> parameter.
+ * <p>
+ * New values for
+ * <ul>
+ * <li>setPortletMode
+ * <li>setWindowState
+ * <li>setRenderParameter
+ * <li>setRenderParameters
+ * <li>getRenderParameters</li>
+ * </ul>
+ * are only used for creating the render URL and not remembered after the redirect
+ * is issued.
+ *
+ * @param location the redirect location URL
+ * @param renderUrlParamName name of the query parameter under which the portlet container should
+ * store a render URL to this portlet
+ *
+ * @exception java.io.IOException
+ * if an input or output exception occurs.
+ * @exception java.lang.IllegalArgumentException
+ * if a relative path URL is given
+ *
+ * @since 2.0
+ */
+
+ public void sendRedirect(String location, String renderUrlParamName)
+ throws java.io.IOException;
+
+
+ /**
+ * <div class="changed_added_3_0">
+ * Returns a render URL containing render parameters according to the
+ * MimeResponse.Copy argument. The portlet may modify the returned render URL. The
+ * URL is intended to be used in the sendRedirect(String location) method to allow
+ * the portlet to force a redirect to the same page with modified render state. * Creates a render URL targeting the current portlet.
+ * <p>
+ * The getRedirectURL method cannot be invoked after any of the
+ * following methods of the ActionResponse interface has been called:
+ * <ul>
+ * <li>setPortletMode</li>
+ * <li>setWindowState</li>
+ * <li>setRenderParameter</li>
+ * <li>setRenderParameters</li>
+ * <li>removePublicRenderParameter</li>
+ * <li>getRenderParameters</li>
+ * </ul>
+ * <p>
+ *
+ * <p>
+ * The new render URL will contain render parameters from the
+ * current request as specified by the <code>option</code> parameter.
+ * <dl>
+ * <dt>NONE</dt>
+ * <dd>All public and private parameters are removed from the URL.</dd>
+ * <dt>ALL</dt>
+ * <dd>The public and private parameters governing the current
+ * request are added to the URL.</dd>
+ * <dt>PUBLIC</dt>
+ * <dd>Only public parameters governing the current
+ * request are added to the URL.</dd>
+ * </dl>
+ * The URL can be further extended by adding render
+ * parameters, portlet mode, and window state.
+ * If no additional portlet mode, window
+ * state or security modifier is set on the URL, the values from the
+ * current render or resource request are preserved.
+ * <p>
+ * If a public render parameter value is set or removed on a render URL, then the public
+ * render parameter will be set to the new value or removed when the URL is activated.
+ * </div>
+ *
+ * @param option
+ * Specifies how current parameters are to be copied to the URL
+ *
+ * @see Copy
+ *
+ * @return a portlet render URL
+ *
+ * @exception java.lang.IllegalStateException
+ * if the method is invoked after any of above mentioned methods of
+ * the ActionResponse interface has been called.
+ *
+ * @since 3.0
+ */
+ public RenderURL getRedirectURL(Copy option) throws IllegalStateException;
+}
+
+
+
+