Author: rich
Date: Wed Jan 26 23:43:10 2005
New Revision: 126592
URL: http://svn.apache.org/viewcvs?view=rev&rev=126592
Log:
Moving the ActionInterceptor, RequestInterceptor, and Interceptor classes and
packages. This needs to be nicely organized -- more are coming. :)
DRT: netui (WinXP)
BB: self (linux)
Added:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/
- copied from r126591,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/
- copied from r126591,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptor.java
- copied, changed from r126591,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorConfig.java
(contents, props changed)
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java
- copied, changed from r126591,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptorContext.java
Removed:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptorContext.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorChain.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorConfig.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorException.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptors.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorConfig.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/AfterNestedInterceptContext.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/InterceptorForward.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/OriginalForward.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptorConfig.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardAwayInterceptor.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedInterceptor.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedThenAwayInterceptor.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNullInterceptor.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/GlobalInterceptor.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptAfterActionInterceptor.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptBeforeActionInterceptor.java
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
Wed Jan 26 23:43:10 2005
@@ -30,16 +30,17 @@
import org.apache.beehive.netui.pageflow.internal.RequestValues;
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
import org.apache.beehive.netui.pageflow.internal.ViewRenderer;
-import
org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorException;
-import org.apache.beehive.netui.pageflow.actioninterceptor.ActionInterceptor;
-import org.apache.beehive.netui.pageflow.actioninterceptor.InterceptorForward;
-import
org.apache.beehive.netui.pageflow.actioninterceptor.AfterNestedInterceptContext;
+import org.apache.beehive.netui.pageflow.interceptor.action.ActionInterceptor;
+import
org.apache.beehive.netui.pageflow.interceptor.action.AfterNestedInterceptContext;
+import org.apache.beehive.netui.pageflow.interceptor.action.InterceptorForward;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorException;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
+import static
org.apache.beehive.netui.pageflow.PageFlowConstants.AUTO_VIEW_RENDER_FORWARD_NAME;
+import static
org.apache.beehive.netui.pageflow.PageFlowConstants.ACTION_EXTENSION;
class ForwardHandler
- implements PageFlowConstants
{
private static final Logger _log = Logger.getInstance(
ForwardHandler.class );
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
Wed Jan 26 23:43:10 2005
@@ -18,8 +18,6 @@
package org.apache.beehive.netui.pageflow;
import org.apache.beehive.netui.core.urls.URLRewriterService;
-import
org.apache.beehive.netui.pageflow.actioninterceptor.ActionInterceptorContext;
-import org.apache.beehive.netui.pageflow.actioninterceptor.InterceptorForward;
import org.apache.beehive.netui.pageflow.config.PageFlowActionFormBean;
import org.apache.beehive.netui.pageflow.config.PageFlowActionForward;
import org.apache.beehive.netui.pageflow.config.PageFlowActionMapping;
@@ -33,11 +31,13 @@
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.internal.JavaControlUtils;
import org.apache.beehive.netui.pageflow.internal.RequestValues;
-import org.apache.beehive.netui.pageflow.internal.interceptor.Interceptor;
-import
org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorException;
-import org.apache.beehive.netui.pageflow.internal.interceptor.Interceptors;
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
+import org.apache.beehive.netui.pageflow.interceptor.Interceptor;
+import org.apache.beehive.netui.pageflow.interceptor.Interceptors;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorException;
+import
org.apache.beehive.netui.pageflow.interceptor.action.ActionInterceptorContext;
+import org.apache.beehive.netui.pageflow.interceptor.action.InterceptorForward;
import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
import org.apache.beehive.netui.util.DiscoveryUtils;
import org.apache.beehive.netui.util.FileUtils;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowStack.java
Wed Jan 26 23:43:10 2005
@@ -21,9 +21,9 @@
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.pageflow.internal.InternalConstants;
import org.apache.beehive.netui.pageflow.internal.AdapterManager;
-import org.apache.beehive.netui.pageflow.actioninterceptor.ActionInterceptor;
-import org.apache.beehive.netui.pageflow.actioninterceptor.InterceptorForward;
-import
org.apache.beehive.netui.pageflow.actioninterceptor.ActionInterceptorContext;
+import org.apache.beehive.netui.pageflow.interceptor.action.InterceptorForward;
+import org.apache.beehive.netui.pageflow.interceptor.action.ActionInterceptor;
+import
org.apache.beehive.netui.pageflow.interceptor.action.ActionInterceptorContext;
import javax.servlet.http.HttpSessionBindingListener;
import javax.servlet.http.HttpSessionBindingEvent;
Deleted:
/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptor.java?view=auto&rev=126591
==============================================================================
Deleted:
/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptorContext.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptorContext.java?view=auto&rev=126591
==============================================================================
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/Interceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/Interceptor.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptor.java
Wed Jan 26 23:43:10 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.internal.interceptor;
+package org.apache.beehive.netui.pageflow.interceptor;
/**
* Base class for all interceptors.
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorChain.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorChain.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/InterceptorChain.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorChain.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/InterceptorChain.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorChain.java
Wed Jan 26 23:43:10 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.internal.interceptor;
+package org.apache.beehive.netui.pageflow.interceptor;
import java.util.List;
import java.util.LinkedList;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorConfig.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorConfig.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/InterceptorConfig.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorConfig.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/InterceptorConfig.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorConfig.java
Wed Jan 26 23:43:10 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.internal.interceptor;
+package org.apache.beehive.netui.pageflow.interceptor;
import java.io.Serializable;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/InterceptorContext.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/InterceptorContext.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorContext.java
Wed Jan 26 23:43:10 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.internal.interceptor;
+package org.apache.beehive.netui.pageflow.interceptor;
import java.io.Serializable;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorException.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorException.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/InterceptorException.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorException.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/InterceptorException.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/InterceptorException.java
Wed Jan 26 23:43:10 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.internal.interceptor;
+package org.apache.beehive.netui.pageflow.interceptor;
public class InterceptorException
extends Exception
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptors.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptors.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/Interceptors.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptors.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/interceptor/Interceptors.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/Interceptors.java
Wed Jan 26 23:43:10 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.internal.interceptor;
+package org.apache.beehive.netui.pageflow.interceptor;
import org.apache.beehive.netui.util.DiscoveryUtils;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/ActionInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/ActionInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -15,19 +15,19 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.actioninterceptor;
+package org.apache.beehive.netui.pageflow.interceptor.action;
-import org.apache.beehive.netui.pageflow.internal.interceptor.Interceptor;
-import org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorChain;
-import
org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorException;
-import
org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorContext;
-import
org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorConfig;
+import org.apache.beehive.netui.pageflow.interceptor.Interceptor;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorChain;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorException;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorContext;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorConfig;
import java.io.Serializable;
/**
- * Interface for page flow action interceptors. These are configured in
/WEB-INF/netui-config.xml like this:
+ * Base class for page flow action interceptors. These are configured in
/WEB-INF/netui-config.xml like this:
* <pre>
* <netui-config
xmlns="http://beehive.apache.org/netui/2004/server/config">
* ...
@@ -106,8 +106,8 @@
return _config;
}
- protected void setInterceptorForward( InterceptorForward forward,
ActionInterceptorContext context )
+ protected void setOverrideForward( InterceptorForward forward,
ActionInterceptorContext context )
{
- context.setInterceptorForward( forward, this );
+ context.setOverrideForward( forward, this );
}
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorConfig.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorConfig.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/ActionInterceptorConfig.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorConfig.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/ActionInterceptorConfig.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorConfig.java
Wed Jan 26 23:43:10 2005
@@ -15,9 +15,9 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.actioninterceptor;
+package org.apache.beehive.netui.pageflow.interceptor.action;
-import
org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorConfig;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorConfig;
import java.util.Map;
import java.util.HashMap;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/ActionInterceptorContext.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/ActionInterceptorContext.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/ActionInterceptorContext.java
Wed Jan 26 23:43:10 2005
@@ -15,12 +15,12 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.actioninterceptor;
+package org.apache.beehive.netui.pageflow.interceptor.action;
import org.apache.beehive.netui.pageflow.PageFlowController;
-import
org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorContext;
-import org.apache.beehive.netui.pageflow.internal.interceptor.Interceptor;
-import org.apache.beehive.netui.pageflow.internal.interceptor.Interceptors;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorContext;
+import org.apache.beehive.netui.pageflow.interceptor.Interceptor;
+import org.apache.beehive.netui.pageflow.interceptor.Interceptors;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.util.config.bean.*;
import org.apache.beehive.netui.util.config.ConfigUtil;
@@ -117,7 +117,7 @@
* InterceptorForward points to a nested page flow, then [EMAIL
PROTECTED] ActionInterceptor#afterNestedIntercept} will be
* called before the nested page flow returns to the original page flow.
*/
- public void setInterceptorForward( InterceptorForward fwd,
ActionInterceptor interceptor )
+ public void setOverrideForward( InterceptorForward fwd, ActionInterceptor
interceptor )
{
setResultOverride( fwd, interceptor );
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/AfterNestedInterceptContext.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/AfterNestedInterceptContext.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/AfterNestedInterceptContext.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/AfterNestedInterceptContext.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/AfterNestedInterceptContext.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/AfterNestedInterceptContext.java
Wed Jan 26 23:43:10 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.actioninterceptor;
+package org.apache.beehive.netui.pageflow.interceptor.action;
import org.apache.beehive.netui.pageflow.PageFlowController;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/InterceptorForward.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/InterceptorForward.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/InterceptorForward.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/InterceptorForward.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/InterceptorForward.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/InterceptorForward.java
Wed Jan 26 23:43:10 2005
@@ -15,11 +15,11 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.actioninterceptor;
+package org.apache.beehive.netui.pageflow.interceptor.action;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
-import
org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorException;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.ServletContext;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/OriginalForward.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/OriginalForward.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/OriginalForward.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/OriginalForward.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/OriginalForward.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/OriginalForward.java
Wed Jan 26 23:43:10 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.actioninterceptor;
+package org.apache.beehive.netui.pageflow.interceptor.action;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.pageflow.Forward;
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/SimpleActionInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/SimpleActionInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -15,10 +15,10 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.actioninterceptor;
+package org.apache.beehive.netui.pageflow.interceptor.action;
-import
org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorException;
-import org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorChain;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorException;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorChain;
import java.net.URI;
import java.net.URISyntaxException;
@@ -49,7 +49,7 @@
try
{
String path = getConfig().getPath();
- setInterceptorForward( new InterceptorForward( new URI( path ) ),
context );
+ setOverrideForward( new InterceptorForward( new URI( path ) ),
context );
chain.continueChain();
}
catch ( URISyntaxException e )
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptorConfig.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptorConfig.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/SimpleActionInterceptorConfig.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptorConfig.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/actioninterceptor/SimpleActionInterceptorConfig.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/action/SimpleActionInterceptorConfig.java
Wed Jan 26 23:43:10 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow.actioninterceptor;
+package org.apache.beehive.netui.pageflow.interceptor.action;
class SimpleActionInterceptorConfig
extends ActionInterceptorConfig
Copied:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptor.java
(from r126591,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptor.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -15,37 +15,60 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow;
+package org.apache.beehive.netui.pageflow.interceptor.request;
+
+import org.apache.beehive.netui.pageflow.interceptor.Interceptor;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorChain;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorException;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorContext;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorConfig;
+
+import java.io.Serializable;
-import org.apache.beehive.netui.pageflow.internal.interceptor.Interceptor;
-import org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorChain;
-import
org.apache.beehive.netui.pageflow.internal.interceptor.InterceptorException;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletResponse;
public abstract class RequestInterceptor
- implements Interceptor
+ implements Interceptor, Serializable
{
- public void init( Object config )
+ private RequestInterceptorConfig _config;
+
+ /**
+ * Called when this interceptor is being initialized.
+ *
+ * @param config the configuration object associated with this interceptor.
+ */
+ public void init( RequestInterceptorConfig config )
{
+ _config = config;
}
- public final void preInvoke( Object context, InterceptorChain chain )
throws InterceptorException
+ public void init( InterceptorConfig config )
{
- preRequest( ( RequestInterceptorContext ) context, chain );
+ init( ( RequestInterceptorConfig ) config );
}
-
+
public abstract void preRequest( RequestInterceptorContext context,
InterceptorChain chain )
throws InterceptorException;
-
- public final void postInvoke( Object context, InterceptorChain chain )
throws InterceptorException
+
+ public void preInvoke( InterceptorContext context, InterceptorChain chain
) throws InterceptorException
{
- postRequest( ( RequestInterceptorContext ) context, chain );
+ preRequest( ( RequestInterceptorContext ) context, chain );
}
public abstract void postRequest( RequestInterceptorContext context,
InterceptorChain chain )
- throws InterceptorException;
-}
+ throws InterceptorException;
+
+ public void postInvoke( InterceptorContext context, InterceptorChain chain
) throws InterceptorException
+ {
+ postRequest( ( RequestInterceptorContext ) context, chain );
+ }
+ public RequestInterceptorConfig getConfig()
+ {
+ return _config;
+ }
+
+ protected void cancelRequest( RequestInterceptorContext context )
+ {
+ context.cancelRequest( this );
+ }
+}
Added:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorConfig.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorConfig.java?view=auto&rev=126592
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorConfig.java
Wed Jan 26 23:43:10 2005
@@ -0,0 +1,49 @@
+/*
+ * 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.interceptor.request;
+
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorConfig;
+
+import java.util.Map;
+import java.util.HashMap;
+
+public class RequestInterceptorConfig
+ extends InterceptorConfig
+{
+ private Map< String, String > _customProperties = new HashMap< String,
String >();
+
+ public RequestInterceptorConfig( String interceptorClass )
+ {
+ super( interceptorClass );
+ }
+
+ public Map< String, String > getCustomProperties()
+ {
+ return _customProperties;
+ }
+
+ void addCustomProperty( String name, String value )
+ {
+ _customProperties.put( name, value );
+ }
+
+ public String getCustomProperty( String name )
+ {
+ return _customProperties.get( name );
+ }
+}
Copied:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java
(from r126591,
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptorContext.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptorContext.java&r1=126591&p2=incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/RequestInterceptorContext.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/interceptor/request/RequestInterceptorContext.java
Wed Jan 26 23:43:10 2005
@@ -15,37 +15,17 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.pageflow;
+package org.apache.beehive.netui.pageflow.interceptor.request;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import org.apache.beehive.netui.pageflow.interceptor.InterceptorContext;
+import org.apache.beehive.netui.pageflow.interceptor.Interceptor;
+import org.apache.beehive.netui.pageflow.interceptor.Interceptors;
-class RequestInterceptorContext
+public class RequestInterceptorContext
+ extends InterceptorContext
{
- private ServletContext _servletContext;
- private ServletRequest _request;
- private ServletResponse _response;
-
- public RequestInterceptorContext( ServletContext servletContext,
ServletRequest request, ServletResponse response )
+ public void cancelRequest( RequestInterceptor interceptor )
{
- _servletContext = servletContext;
- _request = request;
- _response = response;
+ setResultOverride( null, interceptor );
}
-
- public ServletContext getServletContext()
- {
- return _servletContext;
- }
-
- public ServletRequest getRequest()
- {
- return _request;
- }
-
- public ServletResponse getResponse()
- {
- return _response;
- }
-}
\ No newline at end of file
+}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/BaseInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -1,7 +1,7 @@
package miniTests.actionInterceptors;
-import org.apache.beehive.netui.pageflow.actioninterceptor.*;
-import org.apache.beehive.netui.pageflow.internal.interceptor.*;
+import org.apache.beehive.netui.pageflow.interceptor.action.*;
+import org.apache.beehive.netui.pageflow.interceptor.*;
import java.net.*;
import java.util.*;
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardAwayInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardAwayInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardAwayInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardAwayInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardAwayInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardAwayInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -1,7 +1,7 @@
package miniTests.actionInterceptors;
-import org.apache.beehive.netui.pageflow.actioninterceptor.*;
-import org.apache.beehive.netui.pageflow.internal.interceptor.*;
+import org.apache.beehive.netui.pageflow.interceptor.action.*;
+import org.apache.beehive.netui.pageflow.interceptor.*;
import java.net.*;
import java.util.*;
@@ -12,7 +12,7 @@
{
try
{
- setInterceptorForward( new InterceptorForward( new URI(
"/miniTests/actionInterceptors/overrideForwards/alternate.jsp" ) ), context );
+ setOverrideForward( new InterceptorForward( new URI(
"/miniTests/actionInterceptors/overrideForwards/alternate.jsp" ) ), context );
}
catch ( URISyntaxException e )
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -1,7 +1,7 @@
package miniTests.actionInterceptors;
-import org.apache.beehive.netui.pageflow.actioninterceptor.*;
-import org.apache.beehive.netui.pageflow.internal.interceptor.*;
+import org.apache.beehive.netui.pageflow.interceptor.action.*;
+import org.apache.beehive.netui.pageflow.interceptor.*;
import java.net.*;
import java.util.*;
@@ -12,7 +12,7 @@
{
try
{
- setInterceptorForward( new InterceptorForward( new URI(
"/miniTests/actionInterceptors/nested/Controller.jpf" ) ), context );
+ setOverrideForward( new InterceptorForward( new URI(
"/miniTests/actionInterceptors/nested/Controller.jpf" ) ), context );
}
catch ( URISyntaxException e )
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedThenAwayInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedThenAwayInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedThenAwayInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedThenAwayInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedThenAwayInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNestedThenAwayInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -1,7 +1,7 @@
package miniTests.actionInterceptors;
-import org.apache.beehive.netui.pageflow.actioninterceptor.*;
-import org.apache.beehive.netui.pageflow.internal.interceptor.*;
+import org.apache.beehive.netui.pageflow.interceptor.action.*;
+import org.apache.beehive.netui.pageflow.interceptor.*;
import java.net.*;
import java.util.*;
@@ -12,7 +12,7 @@
{
try
{
- setInterceptorForward( new InterceptorForward( new URI(
"/miniTests/actionInterceptors/nested/Controller.jpf" ) ), context );
+ setOverrideForward( new InterceptorForward( new URI(
"/miniTests/actionInterceptors/nested/Controller.jpf" ) ), context );
}
catch ( URISyntaxException e )
{
@@ -30,7 +30,7 @@
{
try
{
- setInterceptorForward( new InterceptorForward( new URI(
"/miniTests/actionInterceptors/overrideForwards/alternate.jsp" ) ), context );
+ setOverrideForward( new InterceptorForward( new URI(
"/miniTests/actionInterceptors/overrideForwards/alternate.jsp" ) ), context );
}
catch ( URISyntaxException e )
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNullInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNullInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNullInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNullInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNullInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/ForwardToNullInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -1,7 +1,7 @@
package miniTests.actionInterceptors;
-import org.apache.beehive.netui.pageflow.actioninterceptor.*;
-import org.apache.beehive.netui.pageflow.internal.interceptor.*;
+import org.apache.beehive.netui.pageflow.interceptor.action.*;
+import org.apache.beehive.netui.pageflow.interceptor.*;
import java.net.*;
import java.util.*;
import java.io.IOException;
@@ -11,7 +11,7 @@
public void preAction( ActionInterceptorContext context, InterceptorChain
chain )
throws InterceptorException
{
- setInterceptorForward( null, context );
+ setOverrideForward( null, context );
try
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/GlobalInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/GlobalInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/GlobalInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/GlobalInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/GlobalInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/GlobalInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -1,7 +1,7 @@
package miniTests.actionInterceptors;
-import org.apache.beehive.netui.pageflow.actioninterceptor.*;
-import org.apache.beehive.netui.pageflow.internal.interceptor.*;
+import org.apache.beehive.netui.pageflow.interceptor.action.*;
+import org.apache.beehive.netui.pageflow.interceptor.*;
import java.net.*;
import java.util.*;
@@ -27,7 +27,7 @@
{
try
{
- setInterceptorForward( new InterceptorForward( new URI(
"/miniTests/actionInterceptors/nested/Controller.jpf" ) ), context );
+ setOverrideForward( new InterceptorForward( new URI(
"/miniTests/actionInterceptors/nested/Controller.jpf" ) ), context );
}
catch ( URISyntaxException e )
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptAfterActionInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptAfterActionInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptAfterActionInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptAfterActionInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptAfterActionInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptAfterActionInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -1,7 +1,7 @@
package miniTests.actionInterceptors;
-import org.apache.beehive.netui.pageflow.actioninterceptor.*;
-import org.apache.beehive.netui.pageflow.internal.interceptor.*;
+import org.apache.beehive.netui.pageflow.interceptor.action.*;
+import org.apache.beehive.netui.pageflow.interceptor.*;
import java.net.*;
import java.util.*;
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptBeforeActionInterceptor.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptBeforeActionInterceptor.java?view=diff&rev=126592&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptBeforeActionInterceptor.java&r1=126591&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptBeforeActionInterceptor.java&r2=126592
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptBeforeActionInterceptor.java
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/miniTests/actionInterceptors/InterruptBeforeActionInterceptor.java
Wed Jan 26 23:43:10 2005
@@ -1,7 +1,7 @@
package miniTests.actionInterceptors;
-import org.apache.beehive.netui.pageflow.actioninterceptor.*;
-import org.apache.beehive.netui.pageflow.internal.interceptor.*;
+import org.apache.beehive.netui.pageflow.interceptor.action.*;
+import org.apache.beehive.netui.pageflow.interceptor.*;
import java.net.*;
import java.util.*;
