Changeset 2965

Timestamp:

09/30/08 08:39:17 (7 weeks ago)

Author:

felix

Message:

Merged revisions 2947,2953-2954,2957 via svnmerge from
http://svn.agavi.org/branches/1.0

........

r2947 | david | 2008-09-26 07:42:28 +0200 (Fri, 26 Sep 2008) | 1 line

merge [2944:2946/branches/0.11]

........

r2953 | david | 2008-09-28 00:28:48 +0200 (Sun, 28 Sep 2008) | 1 line

made _common.xsl more modular, with callable templates for migrating elements to new namespcaes and separate templates for each envelope element

........

r2954 | david | 2008-09-28 00:33:31 +0200 (Sun, 28 Sep 2008) | 1 line

fixed copy/paste mistake in [2953]

........

r2957 | david | 2008-09-28 22:39:19 +0200 (Sun, 28 Sep 2008) | 1 line

fixed copy/paste errors in comments

........

Location:

branches/felix-testing-implementation

Files:

• . (modified) (1 prop)
• CHANGELOG (modified) (1 diff)
• src/config/xsl/_common.xsl (modified) (2 diffs)
• src/config/xsl/config_handlers.xsl (modified) (1 diff)
• src/config/xsl/module.xsl (modified) (1 diff)
• src/config/xsl/routing.xsl (modified) (1 diff)
• src/database/AgaviDoctrineDatabase.class.php (modified) (3 diffs)

branches/felix-testing-implementation/CHANGELOG

@@ -79 +79 @@
 0.11.4 RC1 (September ??, 2008)
 -------------------------------
+
+ADD: Allow specifying of doctrine template implementations (#864) (David, TANAKA Koichi)
 
 FIX: SOAP and XMLRPC test scripts in sample app are broken (#866) (David)

branches/felix-testing-implementation/src/config/xsl/_common.xsl

@@ -9 +9 @@
   <xsl:variable name="envelope_1_0" select="'http://agavi.org/agavi/config/global/envelope/1.0'" />
   
-  <xsl:template match="envelope_0_11:configurations | envelope_0_11:configuration | envelope_0_11:sandbox | envelope_0_11:parameters | envelope_0_11:parameter">
-    <xsl:element name="{local-name()}" namespace="{$envelope_1_0}">
+  <!-- callable template for migrating envelope nodes -->
+  <xsl:template name="_common-migrate-envelope-element">
+    <!-- param for the target namespace; defaults to 1.0 -->
+    <xsl:param name="namespace"><xsl:value-of select="$envelope_1_0" /></xsl:param>
+    
+    <xsl:call-template name="_common-migrate-element">
+      <xsl:with-param name="namespace"><xsl:value-of select="$namespace" /></xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
+  
+  <xsl:template name="_common-migrate-element">
+    <!-- param for the target namespace; no default -->
+    <xsl:param name="namespace" />
+    
+    <!-- create an element of the same name -->
+    <xsl:element name="{local-name()}" namespace="{$namespace}">
       <xsl:copy-of select="@*" />
       <!-- also copy all namespace declarations, except the one of the current element (otherwise, we'd overwrite the namespace in the <element> above if it's just xmlns etc) -->
@@ -18 +32 @@
   </xsl:template>
   
+  <xsl:template match="envelope_0_11:configurations">
+    <xsl:call-template name="_common-migrate-envelope-element" />
+  </xsl:template>
+  <xsl:template match="envelope_0_11:configuration">
+    <xsl:call-template name="_common-migrate-envelope-element" />
+  </xsl:template>
+  <xsl:template match="envelope_0_11:sandbox">
+    <xsl:call-template name="_common-migrate-envelope-element" />
+  </xsl:template>
+  <xsl:template match="envelope_0_11:parameters">
+    <xsl:call-template name="_common-migrate-envelope-element" />
+  </xsl:template>
+  <xsl:template match="envelope_0_11:parameter">
+    <xsl:call-template name="_common-migrate-envelope-element" />
+  </xsl:template>
+  
   <xsl:template match="*">
     <xsl:copy-of select="." />

branches/felix-testing-implementation/src/config/xsl/config_handlers.xsl

@@ -13 +13 @@
   
   <!-- pre-1.0 backwards compatibility for 1.0 -->
-  <!-- non-"envelope" elements are copied to the 1.0 factories namespace -->
+  <!-- non-"envelope" elements are copied to the 1.0 config_handlers namespace -->
   <xsl:template match="envelope_0_11:*">
     <xsl:element name="{local-name()}" namespace="{$config_handlers_1_0}">

branches/felix-testing-implementation/src/config/xsl/module.xsl

@@ -16 +16 @@
   
   <!-- pre-1.0 backwards compatibility for 1.0 -->
-  <!-- non-"envelope" elements are copied to the 1.0 factories namespace -->
+  <!-- non-"envelope" elements are copied to the 1.0 module namespace -->
   
   <!-- overwrite the configuration rule, as we need to work on the elements directly inside it -->

branches/felix-testing-implementation/src/config/xsl/routing.xsl

@@ -13 +13 @@
   
   <!-- pre-1.0 backwards compatibility for 1.0 -->
-  <!-- non-"envelope" elements are copied to the 1.0 factories namespace -->
+  <!-- non-"envelope" elements are copied to the 1.0 routing namespace -->
   <xsl:template match="envelope_0_11:*">
     <xsl:element name="{local-name()}" namespace="{$routing_1_0}">

branches/felix-testing-implementation/src/database/AgaviDoctrineDatabase.class.php

@@ -22 +22 @@
  * @author     Ross Lawley <ross.lawley@gmail.com>
  * @author     David Zülke <dz@bitxtender.com>
+ * @author     TANAKA Koichi <tanaka@ensites.com>
  * @copyright  Authors
  * @copyright  The Agavi Project
@@ -74 +75 @@
    * @author     David Zülke <dz@bitxtender.com>
    * @author     Ross Lawley <ross.lawley@gmail.com>
+   * @author     TANAKA Koichi <tanaka@ensites.com>
    * @since      0.11.0
    */
@@ -138 +140 @@
       }
       
+      foreach((array)$this->getParameter('impls', array()) as $templateName => $className) {
+        $this->connection->setImpl($templateName, $className);
+      }
+      
+      foreach((array)$this->getParameter('manager_impls', array()) as $templateName => $className) {
+        $this->doctrineManager->setImpl($templateName, $className);
+      }
+      
       Doctrine::loadModels($this->getParameter('load_models'));