You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/04/18 20:10:42 UTC
svn commit: r394995 - in /beehive/trunk/netui/src:
pageflow/org/apache/beehive/netui/pageflow/
pageflow/org/apache/beehive/netui/pageflow/internal/
tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/
Author: ekoneil
Date: Tue Apr 18 11:10:40 2006
New Revision: 394995
URL: http://svn.apache.org/viewcvs?rev=394995&view=rev
Log:
More code cleanup / Javadoc. Also added some missing copyright / license files.
BB: self
Test: NetUI pass
Modified:
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContext.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextActivator.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestParameterHandler.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SessionExpiredException.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnresolvableForwardException.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java
beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContext.java?rev=394995&r1=394994&r2=394995&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContext.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContext.java Tue Apr 18 11:10:40 2006
@@ -1,3 +1,20 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ *
+ * $Header:$
+ */
package org.apache.beehive.netui.pageflow;
import javax.servlet.http.HttpServletRequest;
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextActivator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextActivator.java?rev=394995&r1=394994&r2=394995&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextActivator.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContextActivator.java Tue Apr 18 11:10:40 2006
@@ -1,3 +1,20 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ *
+ * $Header:$
+ */
package org.apache.beehive.netui.pageflow;
/**
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?rev=394995&r1=394994&r2=394995&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java Tue Apr 18 11:10:40 2006
@@ -98,8 +98,7 @@
{
private static int requestNumber = 0;
- private static final Logger _log = Logger.getInstance( PageFlowRequestProcessor.class );
-
+ private static final Logger LOG = Logger.getInstance( PageFlowRequestProcessor.class );
private static final String ACTION_OVERRIDE_PARAM_PREFIX = "actionOverride:";
private static final int ACTION_OVERRIDE_PARAM_PREFIX_LEN = ACTION_OVERRIDE_PARAM_PREFIX.length();
private static final String SCHEME_UNSECURE = "http";
@@ -108,7 +107,6 @@
private static final String REDIRECT_REQUEST_ATTRS_PARAM = "forceRedirect";
private static final String FLOW_CONTROLLER_ACTION_CLASSNAME = FlowControllerAction.class.getName();
-
private Map/*< String, Class >*/ _formBeanClasses = new HashMap/*< String, Class >*/();
private Map/*< String, List< ActionMapping > >*/ _overloadedActions = new HashMap/*< String, List< ActionMapping > >*/();
private Handlers _handlers;
@@ -165,7 +163,7 @@
field = InternalUtils.lookupField( fc.getClass(), formMember );
if ( field == null || Modifier.isPrivate( field.getModifiers() ) )
{
- _log.error("Could not find page flow member " + formMember + " as the form bean.");
+ LOG.error("Could not find page flow member " + formMember + " as the form bean.");
return null;
}
}
@@ -210,7 +208,7 @@
}
catch ( IllegalAccessException e )
{
- _log.error( "Could not access page flow member " + formMemberField.getName()
+ LOG.error( "Could not access page flow member " + formMemberField.getName()
+ " as the form bean.", e );
}
}
@@ -263,7 +261,7 @@
}
catch ( IllegalAccessException e )
{
- _log.error( "Could not access page flow member " + formMemberField.getName() + " as the form bean.", e );
+ LOG.error( "Could not access page flow member " + formMemberField.getName() + " as the form bean.", e );
}
}
@@ -290,9 +288,9 @@
return;
}
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( "Populating bean properties from this request" );
+ LOG.debug( "Populating bean properties from this request" );
}
// struts does this
@@ -370,9 +368,9 @@
String qualifiedAction = InternalUtils.qualifyAction( servletContext,actionPath );
actionPath = InternalUtils.createActionPath(request, qualifiedAction );
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( "A request parameter overrode the action. Forwarding to: " + actionPath );
+ LOG.debug( "A request parameter overrode the action. Forwarding to: " + actionPath );
}
wrapper.setForwardedByButton( true );
@@ -423,11 +421,9 @@
//
if ( _servletContainerAdapter.doSecurityRedirect( uri, request, response ) )
{
- if ( _log.isDebugEnabled() )
- {
- _log.debug( "checkSecurity() caused a redirect. Ending processing for this request "
+ if ( LOG.isDebugEnabled() )
+ LOG.debug( "checkSecurity() caused a redirect. Ending processing for this request "
+ '(' + uri + ')' );
- }
return;
}
@@ -487,18 +483,17 @@
// If this isn't a blank module initialized in place of a missing root PageFlowController, emit a warning
// about the missing controllerClass property.
//
- _log.warn( "Struts module " + moduleConfig.getPrefix() + " is configured to use " + getClass().getName()
- + " as the request processor, but the <controller> element does not contain a <set-property>"
- + " for \"controllerClass\". Page Flow actions in this module may not be handled correctly." );
+ if(LOG.isWarnEnabled())
+ LOG.warn( "Struts module " + moduleConfig.getPrefix() + " is configured to use " + getClass().getName()
+ + " as the request processor, but the <controller> element does not contain a <set-property>"
+ + " for \"controllerClass\". Page Flow actions in this module may not be handled correctly." );
}
//
// Look up or create the appropriate SharedFlowControllers if they don't exist.
//
- if ( _log.isInfoEnabled() )
- {
- _log.info( "Attempting to instantiate SharedFlowControllers for request " + request.getRequestURI() );
- }
+ if ( LOG.isInfoEnabled() )
+ LOG.info( "Attempting to instantiate SharedFlowControllers for request " + request.getRequestURI() );
FlowController currentFlowController = null;
@@ -524,17 +519,17 @@
}
catch ( ClassNotFoundException e )
{
- _log.error( "Could not find FlowController class " + flowControllerClassName, e );
+ LOG.error( "Could not find FlowController class " + flowControllerClassName, e );
ServletUtils.throwServletException(e);
}
catch ( InstantiationException e )
{
- _log.error( "Could not instantiate FlowController of type " + flowControllerClassName, e );
+ LOG.error( "Could not instantiate FlowController of type " + flowControllerClassName, e );
ServletUtils.throwServletException(e);
}
catch ( IllegalAccessException e )
{
- _log.error( "Could not instantiate FlowController of type " + flowControllerClassName, e );
+ LOG.error( "Could not instantiate FlowController of type " + flowControllerClassName, e );
ServletUtils.throwServletException(e);
}
@@ -566,19 +561,22 @@
catch ( ServletException servletEx )
{
// If a ServletException escapes out of any of the processing methods, let the current FlowController handle it.
- if ( ! handleException( servletEx, currentFlowController, request, response ) ) throw servletEx;
+ if ( ! handleException( servletEx, currentFlowController, request, response ) )
+ throw servletEx;
}
catch ( IOException ioe )
{
// If an IOException escapes out of any of the processing methods, let the current FlowController handle it.
- if ( ! handleException( ioe, currentFlowController, request, response ) ) throw ioe;
+ if ( ! handleException( ioe, currentFlowController, request, response ) )
+ throw ioe;
}
catch ( Throwable th )
{
// If a Throwable escapes out of any of the processing methods, let the current FlowController handle it.
if ( ! handleException( th, currentFlowController, request, response ) )
{
- if ( th instanceof Error ) throw ( Error ) th;
+ if ( th instanceof Error )
+ throw ( Error ) th;
ServletUtils.throwServletException(th);
}
}
@@ -597,9 +595,9 @@
if ( current != null && current.getClass().equals( fcClass ) )
{
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( "Using current page flow: " + current );
+ LOG.debug( "Using current page flow: " + current );
}
//
@@ -642,16 +640,16 @@
}
catch ( UnhandledException unhandledException )
{
- if ( _log.isInfoEnabled() )
+ if ( LOG.isInfoEnabled() )
{
- _log.info( "This exception was unhandled by any exception handler.", unhandledException );
+ LOG.info( "This exception was unhandled by any exception handler.", unhandledException );
}
return false;
}
catch ( Throwable t )
{
- _log.error( "Exception while handling exception " + th.getClass().getName()
+ LOG.error( "Exception while handling exception " + th.getClass().getName()
+ ". The original exception will be thrown.", t );
return false;
}
@@ -685,11 +683,11 @@
String modulePath = PageFlowUtils.getModulePath( request );
if ( ! moduleConfig.getPrefix().equals( modulePath ) )
{
- if ( _log.isErrorEnabled() )
+ if ( LOG.isErrorEnabled() )
{
InternalStringBuilder msg = new InternalStringBuilder( "No module configuration registered for " );
msg.append( uri ).append( " (module path " ).append( modulePath ).append( ")." );
- _log.error( msg.toString() );
+ LOG.error( msg.toString() );
}
if ( modulePath.length() == 0 ) modulePath = "/";
@@ -710,17 +708,17 @@
if ( ! requestedType.equals( desiredType ) )
{
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( "Wrong .jpf requested for this directory: got " + requestedType
+ LOG.debug( "Wrong .jpf requested for this directory: got " + requestedType
+ ", expected " + desiredType );
}
- if ( _log.isErrorEnabled() )
+ if ( LOG.isErrorEnabled() )
{
InternalStringBuilder msg = new InternalStringBuilder( "Wrong .jpf requested for this directory: got " );
msg.append( requestedType ).append( ", expected " ).append( desiredType ).append( '.' );
- _log.error( msg.toString() );
+ LOG.error( msg.toString() );
}
InternalUtils.sendDevTimeError( "PageFlow_WrongPath", null,
@@ -733,9 +731,9 @@
uri = PageFlowUtils.getBeginActionURI( uri );
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( "Got request for " + request.getRequestURI() + ", forwarding to " + uri );
+ LOG.debug( "Got request for " + request.getRequestURI() + ", forwarding to " + uri );
}
doForward( uri, request, response );
@@ -772,10 +770,10 @@
{
int localRequestCount = -1;
- if ( _log.isTraceEnabled() )
+ if ( LOG.isTraceEnabled() )
{
localRequestCount = ++requestNumber;
- _log.trace( "------------------------------- Start Request #" +
+ LOG.trace( "------------------------------- Start Request #" +
localRequestCount +
" -----------------------------------" );
}
@@ -801,9 +799,9 @@
if ( context.requestWasCancelled() )
{
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug ( "Interceptor " + context.getOverridingInterceptor() + " cancelled the request." );
+ LOG.debug ( "Interceptor " + context.getOverridingInterceptor() + " cancelled the request." );
}
return;
@@ -883,9 +881,9 @@
ServletUtils.throwServletException(e);
}
- if ( _log.isTraceEnabled() )
+ if ( LOG.isTraceEnabled() )
{
- _log.trace( "-------------------------------- End Request #" +
+ LOG.trace( "-------------------------------- End Request #" +
localRequestCount +
" ------------------------------------" );
}
@@ -922,7 +920,7 @@
}
catch ( ServletException e )
{
- _log.error( "Could not parse multipart request.", e.getRootCause() );
+ LOG.error( "Could not parse multipart request.", e.getRootCause() );
return request;
}
@@ -1089,7 +1087,7 @@
}
catch ( ServletException servletException)
{
- _log.error( "Exception occurred while handling " + ex.getClass().getName(), servletException );
+ LOG.error( "Exception occurred while handling " + ex.getClass().getName(), servletException );
}
}
@@ -1130,24 +1128,7 @@
RequestInterceptorContext.init( servletContext );
ensurePageServletFilter();
- }
-
- // todo: why does the framework create a subclass of the page flow page filter here?
- private class PageServletFilter extends PageFlowPageFilter
- {
- public PageServletFilter()
- {
- super( getServletContext() );
- }
-
- /**
- * Accept all file extensions.
- * @return the set of acceptable file extensions
- */
- protected Set getValidFileExtensions()
- {
- return null; // accept all
- }
+ assert _pageServletFilter != null;
}
private void cacheOverloadedActionMappings()
@@ -1196,7 +1177,7 @@
}
catch ( ClassNotFoundException e )
{
- _log.error( "Could not load class " + formType + " referenced from form bean config "
+ LOG.error( "Could not load class " + formType + " referenced from form bean config "
+ formBeanConfig.getName() + " in Struts module " + moduleConfig );
}
}
@@ -1277,9 +1258,9 @@
{
request.setAttribute( Globals.MAPPING_KEY, bestMatch );
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( "Found form-specific action mapping " + bestMatch.getPath() + " for " + path
+ LOG.debug( "Found form-specific action mapping " + bestMatch.getPath() + " for " + path
+ ", form " + forwardedFormClass.getName() );
}
@@ -1332,8 +1313,8 @@
&& (globalApp.findActionConfig(path) != null || getUnknownActionFromConfig(globalApp) != null))
{
- if (_log.isDebugEnabled()) {
- _log.debug("Trying Global.app for unhandled action " + path);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Trying Global.app for unhandled action " + path);
}
errorServletPath = InternalUtils.getDecodedServletPath( request );
@@ -1345,7 +1326,7 @@
}
catch ( ServletException e )
{
- _log.error( "Could not forward to Global.app path " + globalAppURI );
+ LOG.error( "Could not forward to Global.app path " + globalAppURI );
}
return null;
}
@@ -1367,7 +1348,7 @@
doForward(servletPath, request, response);
}
catch ( ServletException e ) {
- _log.error( "Could not forward to path " + servletPath );
+ LOG.error( "Could not forward to path " + servletPath );
}
return null;
}
@@ -1412,9 +1393,9 @@
if ( sf != null )
{
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( "Forwarding to shared flow " + sf.getDisplayName() + " to handle action \""
+ LOG.debug( "Forwarding to shared flow " + sf.getDisplayName() + " to handle action \""
+ actionPath + "\"." );
}
@@ -1441,7 +1422,7 @@
}
catch ( ServletException e )
{
- _log.error( "Could not forward to shared flow URI " + uri, e );
+ LOG.error( "Could not forward to shared flow URI " + uri, e );
}
}
}
@@ -1454,10 +1435,10 @@
HttpServletResponse response, Object returningForm )
throws IOException
{
- if ( _log.isInfoEnabled() )
+ if ( LOG.isInfoEnabled() )
{
InternalStringBuilder msg = new InternalStringBuilder( "Action \"" ).append( actionPath );
- _log.info( msg.append( "\" was also unhandled by Global.app." ).toString() );
+ LOG.info( msg.append( "\" was also unhandled by Global.app." ).toString() );
}
//
@@ -1481,15 +1462,15 @@
{
// ignore this -- just let Struts do its thing.
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( e );
+ LOG.debug( e );
}
}
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( "Couldn't handle an ActionNotFoundException -- delegating to Struts" );
+ LOG.debug( "Couldn't handle an ActionNotFoundException -- delegating to Struts" );
}
return super.processMapping( request, response, actionPath );
@@ -1515,9 +1496,9 @@
{
if ( _handlers.getLoginHandler().isUserInRole( context, roles[i] ) )
{
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( " User " + request.getRemoteUser() + " has role '" + roles[i] + "', granting access" );
+ LOG.debug( " User " + request.getRemoteUser() + " has role '" + roles[i] + "', granting access" );
}
return true;
@@ -1525,9 +1506,9 @@
}
// The current user is not authorized for this action
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( " User '" + request.getRemoteUser() + "' does not have any required role, denying access" );
+ LOG.debug( " User '" + request.getRemoteUser() + "' does not have any required role, denying access" );
}
//
@@ -1600,7 +1581,7 @@
//
if ( fwd != null )
{
- if ( _log.isDebugEnabled() ) _log.debug( "processForwardConfig(" + fwd + ')' );
+ if ( LOG.isDebugEnabled() ) LOG.debug( "processForwardConfig(" + fwd + ')' );
//
// Try to process a tiles definition. If the forward doesn't contain a
@@ -1699,9 +1680,9 @@
{
if ( port == -1 )
{
- if ( _log.isWarnEnabled() )
+ if ( LOG.isWarnEnabled() )
{
- _log.warn( "Could not change the scheme to " + scheme + " because the relevant port was not provided "
+ LOG.warn( "Could not change the scheme to " + scheme + " because the relevant port was not provided "
+ "by the ServletContainerAdapter." );
return false;
}
@@ -1742,9 +1723,9 @@
ForwardRedirectHandler fwdRedirectHandler = _handlers.getForwardRedirectHandler();
fwdRedirectHandler.redirect( context, redirectURI.toString() );
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( "Redirected to " + redirectURI );
+ LOG.debug( "Redirected to " + redirectURI );
}
return true;
@@ -1805,7 +1786,7 @@
}
catch ( URISyntaxException e )
{
- _log.error( "Bad forward URI " + uri, e );
+ LOG.error( "Bad forward URI " + uri, e );
}
}
}
@@ -1868,26 +1849,26 @@
if ( Servlet.class.isAssignableFrom( pageServletClass ) )
{
- if ( _log.isInfoEnabled() )
+ if ( LOG.isInfoEnabled() )
{
- _log.info( "Loaded page Servlet class " + className + " for path " + pagePath );
+ LOG.info( "Loaded page Servlet class " + className + " for path " + pagePath );
}
}
else
{
pageServletClass = Void.class;
- _log.error( "Page Servlet class " + className + " for path " + pagePath
+ LOG.error( "Page Servlet class " + className + " for path " + pagePath
+ " does not extend " + Servlet.class.getName() );
}
}
}
catch ( IOException e )
{
- _log.error( "Error while reading " + path, e );
+ LOG.error( "Error while reading " + path, e );
}
catch ( ClassNotFoundException e )
{
- _log.error( "Error while loading page Servlet class " + className, e );
+ LOG.error( "Error while loading page Servlet class " + className, e );
}
}
@@ -1909,16 +1890,34 @@
}
catch ( InstantiationException e )
{
- _log.error( "Error while instantiating page Servlet of type " + pageServletClass.getName(), e );
+ LOG.error( "Error while instantiating page Servlet of type " + pageServletClass.getName(), e );
}
catch ( IllegalAccessException e )
{
- _log.error( "Error while instantiating page Servlet of type " + pageServletClass.getName(), e );
+ LOG.error( "Error while instantiating page Servlet of type " + pageServletClass.getName(), e );
}
return false;
}
+ // todo: why does the framework create a subclass of the page flow page filter here?
+ private class PageServletFilter extends PageFlowPageFilter
+ {
+ public PageServletFilter()
+ {
+ super( getServletContext() );
+ }
+
+ /**
+ * Accept all file extensions.
+ * @return the set of acceptable file extensions
+ */
+ protected Set getValidFileExtensions()
+ {
+ return null; // accept all
+ }
+ }
+
/**
* Used by {@link PageFlowRequestProcessor#processPageForward} to run a page Servlet.
*/
@@ -2066,7 +2065,8 @@
}
}
- if ( interceptors != null && interceptors.size() == 0 ) interceptors = null;
+ if ( interceptors != null && interceptors.size() == 0 )
+ interceptors = null;
try
{
@@ -2081,7 +2081,7 @@
{
InterceptorForward fwd = context.getInterceptorForward();
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
Interceptor overridingInterceptor = context.getOverridingInterceptor();
@@ -2092,7 +2092,7 @@
msg.append( actionName );
msg.append( ": forwarding to " );
msg.append( fwd != null ? fwd.getPath() : "null [no forward]" );
- _log.debug( msg.toString() );
+ LOG.debug( msg.toString() );
}
return fwd;
@@ -2125,9 +2125,9 @@
{
InterceptorForward fwd = context.getInterceptorForward();
- if ( _log.isDebugEnabled() )
+ if ( LOG.isDebugEnabled() )
{
- _log.debug( "Action interceptor " + context.getOverridingInterceptor().getClass().getName()
+ LOG.debug( "Action interceptor " + context.getOverridingInterceptor().getClass().getName()
+ " after action " + actionName + ": forwarding to "
+ fwd != null ? fwd.getPath() : "null [no forward]" );
}
@@ -2142,8 +2142,9 @@
{
ServletUtils.throwServletException(e);
}
-
- assert false; // should not get here -- either a value is returned or an exception is thrown.
+
+ // should not get here -- either a value is returned or an exception is thrown.
+ assert false;
return null;
}
@@ -2172,6 +2173,18 @@
return super.processValidate(request, response, form, mapping);
}
+ /**
+ * Internal method used to ensure that the PageServletFilter is available for use by the request processor.
+ * If serialization has occurred, this object is transient in this class and may need to be recreated.
+ * @return the page servlet filter
+ */
+ private PageFlowPageFilter ensurePageServletFilter() {
+ if(_pageServletFilter == null)
+ _pageServletFilter = new PageServletFilter();
+
+ return _pageServletFilter;
+ }
+
private static class ActionFormValidationWrapper extends BaseActionForm
{
private ActionForm _actionForm;
@@ -2187,17 +2200,5 @@
protected ActionErrors getAdditionalActionErrors(ActionMapping mapping, HttpServletRequest request) {
return _actionForm.validate(mapping, request);
}
- }
-
- /**
- * Internal method used to ensure that the PageServletFilter is available for use by the request processor.
- * If serialization has occurred, this object is transient in this class and may need to be recreated.
- * @return the page servlet filter
- */
- private PageFlowPageFilter ensurePageServletFilter() {
- if(_pageServletFilter == null)
- _pageServletFilter = new PageServletFilter();
-
- return _pageServletFilter;
}
}
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestParameterHandler.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestParameterHandler.java?rev=394995&r1=394994&r2=394995&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestParameterHandler.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestParameterHandler.java Tue Apr 18 11:10:40 2006
@@ -17,12 +17,7 @@
*/
package org.apache.beehive.netui.pageflow;
-// java imports
import javax.servlet.http.HttpServletRequest;
-
-// internal imports
-
-// external imports
/**
*
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SessionExpiredException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SessionExpiredException.java?rev=394995&r1=394994&r2=394995&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SessionExpiredException.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SessionExpiredException.java Tue Apr 18 11:10:40 2006
@@ -17,7 +17,6 @@
*/
package org.apache.beehive.netui.pageflow;
-
/**
* Exception thrown in place of another {@link PageFlowException} when:
* <ul>
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java?rev=394995&r1=394994&r2=394995&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java Tue Apr 18 11:10:40 2006
@@ -30,7 +30,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
/**
* <p>
* Base "shared flow" class for controller logic, exception handlers, and state that can be shared by any number of page
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnresolvableForwardException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnresolvableForwardException.java?rev=394995&r1=394994&r2=394995&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnresolvableForwardException.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/UnresolvableForwardException.java Tue Apr 18 11:10:40 2006
@@ -17,7 +17,6 @@
*/
package org.apache.beehive.netui.pageflow;
-
/**
* Exception thrown by {@link Forward} when its name does not resolve to one defined by a
* {@link org.apache.beehive.netui.pageflow.annotations.Jpf.Forward @Jpf.Forward} annotation in the current action's
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java?rev=394995&r1=394994&r2=394995&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/XmlBeanActionForm.java Tue Apr 18 11:10:40 2006
@@ -30,7 +30,6 @@
private static final Logger _log = Logger.getInstance( XmlBeanActionForm.class );
private String _formClassName;
-
public XmlBeanActionForm()
{
Modified: beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java?rev=394995&r1=394994&r2=394995&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java (original)
+++ beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java Tue Apr 18 11:10:40 2006
@@ -22,7 +22,7 @@
import org.apache.beehive.netui.util.Bundle;
/**
- *
+ * Internal method used by the data grid to instantiate classes. This class should not be used elsewhere.
*/
public final class ExtensionUtil {
@@ -35,11 +35,12 @@
* Utility method that helps instantiate a class used to extend the data grid.
*
* @param className the name of a class to instantiate
+ * @param assignableFrom the type that should be assignable from an instance of type <code>className</code>
* @return an instance of the given class
* @throws org.apache.beehive.netui.databinding.datagrid.api.exceptions.DataGridExtensionException
* when an error occurs creating an instance of the class
*/
- public static final Object instantiateClass(String className, Class assignableFrom) {
+ public static Object instantiateClass(String className, Class assignableFrom) {
if(className == null)
throw new IllegalArgumentException(Bundle.getErrorString("DataGridUtil_CantCreateClass"));
@@ -64,11 +65,12 @@
* Utility method that helps instantiate a class used to extend the data grid.
*
* @param clazz the name of a class to instantiate
+ * @param assignableFrom the type that should be assignable from an instance of type <code>className</code>
* @return an instance of the given class
* @throws org.apache.beehive.netui.databinding.datagrid.api.exceptions.DataGridExtensionException
* when an error occurs creating an instance of the class
*/
- public static final Object instantiateClass(Class clazz, Class assignableFrom) {
+ public static Object instantiateClass(Class clazz, Class assignableFrom) {
if(clazz == null)
throw new IllegalArgumentException(Bundle.getErrorString("DataGridUtil_CantCreateClass"));