You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/11/02 21:09:33 UTC
svn commit: r330341 - in /beehive/trunk/netui:
src/pageflow/org/apache/beehive/netui/pageflow/
src/pageflow/org/apache/beehive/netui/pageflow/internal/
test/webapps/drt/coreWeb/WEB-INF/src/mockportal/
Author: rich
Date: Wed Nov 2 12:09:23 2005
New Revision: 330341
URL: http://svn.apache.org/viewcvs?rev=330341&view=rev
Log:
Deprecated the old ActionResolver interface. It's implemented by PageFlowController, but unused otherwise. Should have been gone a long time ago.
tests: bvt in netui (WinXP)
BB: same (linux)
Modified:
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowBeanContext.java
beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortletTag.java
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java?rev=330341&r1=330340&r2=330341&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ActionResolver.java Wed Nov 2 12:09:23 2005
@@ -24,6 +24,8 @@
/**
* Interface for controller classes that resolve actions to URIs.
+ *
+ * @deprecated This is a legacy interface that is implemented by {@link PageFlowController}, but unused in the framework.
*/
public interface ActionResolver
{
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java?rev=330341&r1=330340&r2=330341&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java Wed Nov 2 12:09:23 2005
@@ -250,8 +250,7 @@
*
* @param request the current HttpServletRequest.
* @param servletContext the current ServletContext.
- * @return the current PageFlowController from the user session, or <code>null</code>
- * if there is none.
+ * @return the current PageFlowController from the user session, or <code>null</code> if there is none.
*/
public static final PageFlowController getCurrentPageFlow( HttpServletRequest request, ServletContext servletContext )
{
@@ -283,7 +282,7 @@
/**
* Get the current ActionResolver.
- * @deprecated Use {@link #getCurrentActionResolver(HttpServletRequest, ServletContext)} instead.
+ * @deprecated Use {@link #getCurrentPageFlow(HttpServletRequest, ServletContext)} instead.
*
* @return the current ActionResolver from the user session, or <code>null</code> if there is none.
*/
@@ -295,6 +294,8 @@
/**
* Get the current ActionResolver.
+ * @deprecated Use {@link #getCurrentPageFlow(HttpServletRequest, ServletContext)} instead.
+ *
*
* @param request the current HttpServletRequest.
* @param servletContext the current ServletContext.
@@ -1419,7 +1420,7 @@
/**
* @deprecated This is an internal utility. {@link InternalUtils#setCurrentActionResolver} can be used, but it is
- * not guaranteed to be supported in the future.
+ * not guaranteed to be supported in the future. This method will be removed in the next version.
*/
public static void setCurrentActionResolver( ActionResolver resolver, HttpServletRequest request )
{
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java?rev=330341&r1=330340&r2=330341&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/StrutsModule.java Wed Nov 2 12:09:23 2005
@@ -24,7 +24,7 @@
/**
* An ActionResolver that submits actions to a Struts module.
*
- * @exclude
+ * @deprecated This class will be removed without replacement in the next version.
*/
public class StrutsModule
implements ActionResolver
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java?rev=330341&r1=330340&r2=330341&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java Wed Nov 2 12:09:23 2005
@@ -603,6 +603,7 @@
* Set the current ActionResolver ({@link PageFlowController}) in the user session.
*
* @param resolver the ActionResolver to set as the current one in the user session.
+ * @deprecated Will be removed in the next version.
*/
public static void setCurrentActionResolver( ActionResolver resolver, HttpServletRequest request,
ServletContext servletContext )
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowBeanContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowBeanContext.java?rev=330341&r1=330340&r2=330341&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowBeanContext.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/PageFlowBeanContext.java Wed Nov 2 12:09:23 2005
@@ -18,7 +18,6 @@
package org.apache.beehive.netui.pageflow.internal;
import org.apache.beehive.controls.runtime.servlet. ServletBeanContext;
-import org.apache.beehive.netui.pageflow.ActionResolver;
import org.apache.beehive.netui.pageflow.PageFlowController;
import javax.servlet.ServletRequest;
Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortletTag.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortletTag.java?rev=330341&r1=330340&r2=330341&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortletTag.java (original)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortletTag.java Wed Nov 2 12:09:23 2005
@@ -20,10 +20,9 @@
import org.apache.beehive.netui.core.urls.URLRewriterService;
import org.apache.beehive.netui.pageflow.PageFlowUtils;
import org.apache.beehive.netui.pageflow.FlowControllerFactory;
-import org.apache.beehive.netui.pageflow.ActionResolver;
-import org.apache.beehive.netui.pageflow.StrutsModuleFactory;
import org.apache.beehive.netui.pageflow.ActionResult;
import org.apache.beehive.netui.pageflow.RequestContext;
+import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.pageflow.scoping.ScopedResponse;
@@ -106,18 +105,14 @@
scopedRequest.setAttribute( "portletID", _portletID );
scopedRequest.setAttribute( "repostURL", outerRequest.getRequestURI() );
- ActionResolver actionResolver = PageFlowUtils.getCurrentActionResolver( scopedRequest );
- if ( actionResolver == null )
+ PageFlowController pfc = PageFlowUtils.getCurrentPageFlow( scopedRequest, pageContext.getServletContext() );
+ if ( pfc == null )
{
if ( _pageFlowURI != null )
{
scopedRequest.setRequestURI( outerRequest.getContextPath() + _pageFlowURI );
FlowControllerFactory factory = FlowControllerFactory.get( pageContext.getServletContext() );
- actionResolver = factory.getPageFlowForRequest( new RequestContext( scopedRequest, scopedResponse ) );
- }
- else
- {
- actionResolver = StrutsModuleFactory.getStrutsModule( _strutsModulePath, scopedRequest );
+ pfc = factory.getPageFlowForRequest( new RequestContext( scopedRequest, scopedResponse ) );
}
}
@@ -133,9 +128,9 @@
if ( currentURL == null ) // First time -- execute the begin action
{
- if ( actionResolver != null )
+ if ( pfc != null )
{
- currentURL = actionResolver.getURI();
+ currentURL = pfc.getURI();
action = "begin"; // @TODO add a tag attr to allow overriding this
}
@@ -163,7 +158,7 @@
try
{
- String modulePath = ( actionResolver != null ? actionResolver.getModulePath() : null );
+ String modulePath = ( pfc != null ? pfc.getModulePath() : null );
action = modulePath + "/" + action;
actionResult = PageFlowUtils.strutsLookup( outerServletContext, scopedRequest, scopedResponse,
action, null );
@@ -211,16 +206,17 @@
outerRequest.getSession().setAttribute( CURRENT_URL_ATTR_PREFIX + _portletID , currentURL );
- ActionResolver currentActionResolver = PageFlowUtils.getCurrentActionResolver( scopedRequest ) ;
- String type = ( currentActionResolver != null ? currentActionResolver.getClass().getName() : "null" );
+ PageFlowController currentPageFlow =
+ PageFlowUtils.getCurrentPageFlow( scopedRequest, pageContext.getServletContext() ) ;
+ String type = ( currentPageFlow != null ? currentPageFlow.getClass().getName() : "null" );
printValue( out, "PageFlow/StrutsModule type", type );
printValue( out, "Current URL", currentURL );
out.println( "</td></tr>" );
- if ( currentActionResolver != null && ! submittedThisPortlet )
+ if ( currentPageFlow != null && ! submittedThisPortlet )
{
- currentActionResolver.refresh( scopedRequest, scopedResponse );
+ currentPageFlow.refresh( scopedRequest, scopedResponse );
}