Helge Weissig created TORQUE-339:
------------------------------------

             Summary: Correct the order of outlet and mergepoint in the last 
example of the configuration section of the code generation documentation
                 Key: TORQUE-339
                 URL: https://issues.apache.org/jira/browse/TORQUE-339
             Project: Torque
          Issue Type: Bug
          Components: Documentation
            Reporter: Helge Weissig


When overriding a single mergepoint, the outlet must be listed first according 
to the schema definition. The following patch addresses that:
{code}
Index: 
torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml
===================================================================
--- torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml 
(revision 1689921)
+++ torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml 
(working copy)
@@ -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>
{code}



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

---------------------------------------------------------------------
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