Author: tfischer
Date: Sun Sep  6 18:17:31 2015
New Revision: 1701508

URL: http://svn.apache.org/r1701508
Log:
TORQUE-339 Correct the order of outlet and mergepoint in the last example of 
the configuration section of the code generation documentation.
Thanks to Helge Weissig for the patch

Modified:
    
db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml

Modified: 
db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml?rev=1701508&r1=1701507&r2=1701508&view=diff
==============================================================================
--- 
db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml
 (original)
+++ 
db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml
 Sun Sep  6 18:17:31 2015
@@ -294,14 +294,14 @@
 <outlets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
     
xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration 
http://db.apache.org/torque/4.0/generator/configuration.xsd";
     xmlns="http://db.apache.org/torque/4.0/generator/configuration";>
-  <mergepoint name="torque.om.bean.base.getterSetter.setter">
-    <action xsi:type="applyAction" outlet="torque.om.bean.base.setter2"/>
-  </mergepoint>
-
   <outlet name="torque.om.bean.base.setter2"
       xsi:type="velocityOutlet"
       path="bean/base/setter2.vm">
   </outlet>
+
+  <mergepoint name="torque.om.bean.base.getterSetter.setter">
+    <action xsi:type="applyAction" outlet="torque.om.bean.base.setter2"/>
+  </mergepoint>
 </outlets>
 ]]></source>
       <p>



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org

Reply via email to