db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1515577 - in /db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc: conf/control.xml outlets/xdoc.xml templates/datamodel.vm templates/table.vm templates/xdoc-datamodel.vm templates/xdoc-table.vm
Date Mon, 19 Aug 2013 19:49:29 GMT
Author: tfischer
Date: Mon Aug 19 19:49:29 2013
New Revision: 1515577

URL: http://svn.apache.org/r1515577
Log:
Make use of features of TORQUE-295 and TORQUE-296

Added:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/xdoc-datamodel.vm
      - copied unchanged from r1470231, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/datamodel.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/xdoc-table.vm
      - copied unchanged from r1470231, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/table.vm
Removed:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/datamodel.vm
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/templates/table.vm
Modified:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/xdoc.xml

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml?rev=1515577&r1=1515576&r2=1515577&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml
Mon Aug 19 19:49:29 2013
@@ -38,7 +38,7 @@
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
     </source>
-    <outlet name="torque.doc.xdoc.xdoc"/>
+    <outlet name="xdoc-datamodel"/>
   </output>
 </control>
   
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/xdoc.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/xdoc.xml?rev=1515577&r1=1515576&r2=1515577&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/xdoc.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/outlets/xdoc.xml
Mon Aug 19 19:49:29 2013
@@ -21,17 +21,12 @@
 <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">
-  <outlet name="torque.doc.xdoc.xdoc"
-      xsi:type="velocityOutlet" 
-      path="datamodel.vm">
+  <outlet xsi:type="velocityOutlet" path="xdoc-datamodel.vm">
     <mergepoint name="tableDocs">
       <action xsi:type="traverseAllAction"
           element="table"
-          outlet="torque.doc.xdoc.table"/>
+          outlet="xdoc-table"/>
     </mergepoint>
   </outlet>
-  <outlet name="torque.doc.xdoc.table"
-      xsi:type="velocityOutlet" 
-      path="table.vm">
-  </outlet>
+  <!-- other outlets are defined via their template names -->
 </outlets>
\ No newline at end of file



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


Mime
View raw message