You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bridges-commits@portals.apache.org by at...@apache.org on 2006/08/27 15:11:56 UTC
svn commit: r437372 - in /portals/bridges/trunk: ./
jsf/src/java/org/apache/portals/bridges/jsf/
struts/src/java/org/apache/portals/bridges/struts/
Author: ate
Date: Sun Aug 27 06:11:53 2006
New Revision: 437372
URL: http://svn.apache.org/viewvc?rev=437372&view=rev
Log:
Starting new bugfix versions of jsf and struts bridge (1.0.1-dev) because of http://issues.apache.org/jira/browse/PB-45:
Should not use instanceof on Portlet request interfaces to distinguise ActionRequest from RenderRequest
Modified:
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletFacesContextImpl.java
portals/bridges/trunk/project.properties
portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.java
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java?rev=437372&r1=437371&r2=437372&view=diff
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java Sun Aug 27 06:11:53 2006
@@ -67,6 +67,12 @@
*/
public static final String REQUEST_SERVLET_PATH = "org.apache.portals.bridges.jsf.REQUEST_SERVLET_PATH";
+ /**
+ * The REQUEST_TYPE request attribute can be used to determine the Portlet request type ({@link #ACTION_REQUEST},
+ * {@link #VIEW_REQUEST}, {@link #HELP_REQUEST}, {@link #EDIT_REQUEST} or {@link #CUSTOM_REQUEST}) of the current request.
+ */
+ public static final String REQUEST_TYPE = "org.apache.portals.bridges.jsf.request_type";
+
/** The JSF_VIEW_ID used to maintain the state of the view action. */
public static final String JSF_VIEW_ID = "jsf_viewid";
public static final String JSF_EDIT_ID = "jsf_editid";
@@ -403,8 +409,10 @@
private void process(PortletRequest request, PortletResponse response, String defaultPage, String requestType, String viewId)
throws PortletException, IOException
{
- boolean actionRequest = (request instanceof ActionRequest);
- boolean renderRequest = (request instanceof RenderRequest);
+ boolean actionRequest = ACTION_REQUEST.equals(requestType);
+ boolean renderRequest = !actionRequest;
+
+ request.setAttribute(REQUEST_TYPE, requestType);
String defaultView = defaultPage;
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletFacesContextImpl.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletFacesContextImpl.java?rev=437372&r1=437371&r2=437372&view=diff
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletFacesContextImpl.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletFacesContextImpl.java Sun Aug 27 06:11:53 2006
@@ -132,7 +132,8 @@
log.debug("Resolving view root - Using view id: " + viewId);
}
- if (portletRequest instanceof ActionRequest)
+ String requestType = (String)portletRequest.getAttribute(FacesPortlet.REQUEST_TYPE);
+ if (requestType != null && requestType.equals(FacesPortlet.ACTION_REQUEST))
{
if (log.isDebugEnabled())
{
Modified: portals/bridges/trunk/project.properties
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/project.properties?rev=437372&r1=437371&r2=437372&view=diff
==============================================================================
--- portals/bridges/trunk/project.properties (original)
+++ portals/bridges/trunk/project.properties Sun Aug 27 06:11:53 2006
@@ -87,11 +87,11 @@
portals.bridges.version=1.0
portals.bridges.common.version=1.0.1-dev
portals.bridges.frameworks.version=1.0
-portals.bridges.jsf.version=1.0
+portals.bridges.jsf.version=1.0.1-dev
portals.bridges.perl.version=1.0
portals.bridges.php.version=1.0
portals.bridges.python.version=1.0
-portals.bridges.struts.version=1.0
+portals.bridges.struts.version=1.0.1-dev
portals.bridges.velocity.version=1.0
portals.bridges.portletfilter.version=1.0
Modified: portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.java?rev=437372&r1=437371&r2=437372&view=diff
==============================================================================
--- portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.java (original)
+++ portals/bridges/trunk/struts/src/java/org/apache/portals/bridges/struts/StrutsPortlet.java Sun Aug 27 06:11:53 2006
@@ -289,7 +289,7 @@
HttpSession session = req.getSession();
String portletName = this.getPortletConfig().getPortletName();
req.setAttribute(PORTLET_NAME, portletName);
- boolean actionRequest = (request instanceof ActionRequest);
+ boolean actionRequest = ACTION_REQUEST.equals(requestType);
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: bridges-commits-unsubscribe@portals.apache.org
For additional commands, e-mail: bridges-commits-help@portals.apache.org