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/07/13 23:22:54 UTC

svn commit: r216269 - in /incubator/beehive/trunk/netui: src/pageflow/org/apache/beehive/netui/pageflow/ test/webapps/drt/coreWeb/WEB-INF/src/pageFlowCore/eventReporter/

Author: rich
Date: Wed Jul 13 14:22:52 2005
New Revision: 216269

URL: http://svn.apache.org/viewcvs?rev=216269&view=rev
Log:
More work for http://issues.apache.org/jira/browse/BEEHIVE-846 : add a "PageFlow registered" event to the EventReporter (see comments there).

tests: bvt in netui (WinXP)
BB: self (linux)


Modified:
    incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
    incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultPageFlowEventReporter.java
    incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowEventReporter.java
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageFlowCore/eventReporter/TestEventReporter.java

Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java?rev=216269&r1=216268&r2=216269&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/AutoRegisterActionServlet.java Wed Jul 13 14:22:52 2005
@@ -564,7 +564,7 @@
         {
             PageFlowControllerConfig pfcc = ( PageFlowControllerConfig ) cc;
             PageFlowEventReporter er = AdapterManager.getServletContainerAdapter( getServletContext() ).getEventReporter();
-            er.flowControllerRegistered( modulePath, pfcc.getControllerClass() );
+            er.flowControllerRegistered( modulePath, pfcc.getControllerClass(), ac );
         }
         
         if ( _log.isDebugEnabled() )

Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultPageFlowEventReporter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultPageFlowEventReporter.java?rev=216269&r1=216268&r2=216269&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultPageFlowEventReporter.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/DefaultPageFlowEventReporter.java Wed Jul 13 14:22:52 2005
@@ -20,6 +20,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
+import org.apache.struts.config.ModuleConfig;
 import org.apache.beehive.netui.util.internal.InternalStringBuilder;
 import org.apache.beehive.netui.util.logging.Logger;
 
@@ -175,13 +176,14 @@
         }
     }
 
-    public void flowControllerRegistered( String modulePath, String controllerClassName )
+    public void flowControllerRegistered( String modulePath, String controllerClassName, ModuleConfig moduleConfig )
     {
         if ( _log.isDebugEnabled() )
         {
             LogMsg msg = new LogMsg( "flowControllerRegistered" );
             msg.addParam( "ModulePath", modulePath );
             msg.addParam( "ControllerClassName", controllerClassName );
+            msg.addParam( "ModuleConfig", moduleConfig );
             _log.debug( msg );
         }
     }

Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowEventReporter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowEventReporter.java?rev=216269&r1=216268&r2=216269&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowEventReporter.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowEventReporter.java Wed Jul 13 14:22:52 2005
@@ -20,6 +20,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
+import org.apache.struts.config.ModuleConfig;
 
 import javax.servlet.ServletContext;
 
@@ -168,8 +169,10 @@
      * 
      * @param modulePath the module path, which is the "parent directory" for actions on the controller.
      * @param controllerClassName the name of the controller class.
+     * @param moduleConfig the Struts ModuleConfig that corresponds to the controller.
      */ 
-    public abstract void flowControllerRegistered( String modulePath, String controllerClassName );
+    public abstract void flowControllerRegistered( String modulePath, String controllerClassName,
+                                                   ModuleConfig moduleConfig );
     
     protected ServletContext getServletContext()
     {

Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageFlowCore/eventReporter/TestEventReporter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageFlowCore/eventReporter/TestEventReporter.java?rev=216269&r1=216268&r2=216269&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageFlowCore/eventReporter/TestEventReporter.java (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/pageFlowCore/eventReporter/TestEventReporter.java Wed Jul 13 14:22:52 2005
@@ -4,6 +4,7 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 import org.apache.struts.action.*;
+import org.apache.struts.config.ModuleConfig;
 import java.util.*;
 
 /**
@@ -138,7 +139,7 @@
         getHistory( requestContext ).add( msg.toString() );
     }
 
-    public void flowControllerRegistered( String modulePath, String controllerClassName )
+    public void flowControllerRegistered( String modulePath, String controllerClassName, ModuleConfig moduleConfig )
     {
         if ( modulePath.equals( "/pageFlowCore/eventReporter" ) )
         {