Changeset 1451

Timestamp:

01/01/07 20:08:37 (2 years ago)

Author:

david

Message:

threw out action stack completely, made execution container factory configurable, refs #373, #290

Location:

branches/david-execution_flow

Files:

• samples/app/config/factories.xml (modified) (2 diffs)
• src/action/AgaviActionStack.class.php (deleted)
• src/action/AgaviActionStackEntry.class.php (deleted)
• src/buildtools/code_templates/config/factories.xml (modified) (2 diffs)
• src/config/AgaviFactoryConfigHandler.class.php (modified) (2 diffs)
• src/config/defaults/compile.xml (modified) (1 diff)
• src/config/xsd/factories.xsd (modified) (2 diffs)
• src/controller/AgaviController.class.php (modified) (2 diffs)
• src/controller/AgaviExecutionContainer.class.php (modified) (1 diff)

branches/david-execution_flow/samples/app/config/factories.xml

@@ -26 +26 @@
   <configuration>
     
-    <action_stack class="AgaviActionStack" />
-    
     <controller class="AgaviWebController" />
     
@@ -33 +31 @@
     
     <dispatch_filter class="AgaviDispatchFilter" />
+    
+    <execution_container class="AgaviExecutionContainer" />
     
     <execution_filter class="AgaviExecutionFilter" />

branches/david-execution_flow/src/buildtools/code_templates/config/factories.xml

@@ -35 +35 @@
   <configuration>
     
-    <action_stack class="AgaviActionStack" />
-    
     <controller class="AgaviWebController" />
     
@@ -42 +40 @@
     
     <dispatch_filter class="AgaviDispatchFilter" />
+    
+    <execution_container class="AgaviExecutionContainer" />
     
     <execution_filter class="AgaviExecutionFilter" />

branches/david-execution_flow/src/config/AgaviFactoryConfigHandler.class.php

@@ -60 +60 @@
     $data = array();
     foreach($configurations as $cfg) {
-      // Class names for ActionStack, DispatchFilter, ExecutionFilter, FilterChain, Response and SecurityFilter
-      if(isset($cfg->action_stack)) {
-        $data['action_stack'] = isset($data['action_stack']) ? $data['action_stack'] : array('class' => null, 'params' => array());
-        $data['action_stack']['class'] = $cfg->action_stack->hasAttribute('class')? $cfg->action_stack->getAttribute('class') : $data['action_stack']['class'];
-        $data['action_stack']['params'] = $this->getItemParameters($cfg->action_stack, $data['action_stack']['params']);
-
-        $data['action_stack_code'] = '$this->factories["action_stack"] = array("class" => "' . $data['action_stack']['class'] . '", "parameters" => ' . var_export($data['action_stack']['params'], true) . ');';
+      // Class names for Execution Container, DispatchFilter, ExecutionFilter, FilterChain, Response and SecurityFilter
+      if(isset($cfg->execution_container)) {
+        $data['execution_container'] = isset($data['execution_container']) ? $data['execution_container'] : array('class' => null, 'params' => array());
+        $data['execution_container']['class'] = $cfg->execution_container->hasAttribute('class')? $cfg->execution_container->getAttribute('class') : $data['execution_container']['class'];
+        $data['execution_container']['params'] = $this->getItemParameters($cfg->execution_container, $data['execution_container']['params']);
+
+        $data['execution_container_code'] = '$this->factories["execution_container"] = array("class" => "' . $data['execution_container']['class'] . '", "parameters" => ' . var_export($data['execution_container']['params'], true) . ');';
       }
 
@@ -230 +230 @@
     // name => required?
     $requiredItems = array(
-      'action_stack' => true,
+      'execution_container' => true,
       'dispatch_filter' => true,
       'execution_filter' => true,

branches/david-execution_flow/src/config/defaults/compile.xml

@@ -41 +41 @@
       <compile>%core.agavi_dir%/util/AgaviArrayPathDefinition.class.php</compile>
       <compile>%core.agavi_dir%/action/AgaviAction.class.php</compile>
-      <compile>%core.agavi_dir%/action/AgaviActionStack.class.php</compile>
-      <compile>%core.agavi_dir%/action/AgaviActionStackEntry.class.php</compile>
       <compile>%core.agavi_dir%/core/AgaviContext.class.php</compile>
       <compile>%core.agavi_dir%/controller/AgaviController.class.php</compile>

branches/david-execution_flow/src/config/xsd/factories.xsd

@@ -10 +10 @@
         <xs:complexType>
         <xs:all>
-          <xs:element name="action_stack" minOccurs="0">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:group ref="parameters" />
-              </xs:sequence>
-              <xs:attribute name="class" type="xs:string" use="required" />
-            </xs:complexType>
-          </xs:element>
           <xs:element name="controller" minOccurs="0">
             <xs:complexType>
@@ -35 +27 @@
           </xs:element>
           <xs:element name="dispatch_filter" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:group ref="parameters" />
+              </xs:sequence>
+              <xs:attribute name="class" type="xs:string" use="required" />
+            </xs:complexType>
+          </xs:element>
+          <xs:element name="execution_container" minOccurs="0">
             <xs:complexType>
               <xs:sequence>

branches/david-execution_flow/src/controller/AgaviController.class.php

@@ -119 +119 @@
   public function createExecutionContainer($moduleName, $actionName, array $parameters = array())
   {
-    $container = new AgaviExecutionContainer();
-    $container->initialize($this->context, $moduleName, $actionName, $parameters);
+    // create a new filter chain
+    $ecfi = $this->context->getFactoryInfo('execution_container');
+    $container = new $ecfi['class']();
+    $container->initialize($this->context, $ecfi['parameters']);
+    $container->setModuleName($moduleName);
+    $container->setActionName($actionName);
+    $container->setParameters($parameters);
     return $container;
   }
@@ -333 +338 @@
     $this->context = $response->getContext();
     
-    $asfi = $this->context->getFactoryInfo('action_stack');
-    $this->actionStack = new $asfi['class']();
-    
     $cfg = AgaviConfig::get('core.config_dir') . '/output_types.xml';
     require(AgaviConfigCache::checkConfig($cfg, $this->context->getName()));

branches/david-execution_flow/src/controller/AgaviExecutionContainer.class.php

@@ -80 +80 @@
    *
    * @param      AgaviContext The current Context instance.
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function initialize(AgaviContext $context, $moduleName, $actionName, array $parameters = array())
-  {
-    $this->setModuleName($moduleName);
-    $this->setActionName($actionName);
-    
-    $this->setParameters($parameters);
-    
+   * @param      array        An array of initialization parameters.
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.11.0
+   */
+  public function initialize(AgaviContext $context, array $parameters = array())
+  {
     $this->microtime = microtime(true);