You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tf...@apache.org on 2014/09/03 21:51:10 UTC
svn commit: r1622338 - in
/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html:
conf/ outlets/ templates/
Author: tfischer
Date: Wed Sep 3 19:51:09 2014
New Revision: 1622338
URL: http://svn.apache.org/r1622338
Log:
Use automatic template name resolving
Added:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/css.vm
- copied unchanged from r1470231, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/datamodel.css.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/html-datamodel.vm
- copied unchanged from r1470231, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/datamodel.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/html-table.vm
- copied unchanged from r1470231, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/table.vm
Removed:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/datamodel.css.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/datamodel.vm
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/templates/table.vm
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/html.xml
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml?rev=1622338&r1=1622337&r2=1622338&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml Wed Sep 3 19:51:09 2014
@@ -33,15 +33,15 @@
resource="../../../xsd/database-4-0-strict.xsd" />
<!-- Documentation css -->
- <output name="torque.doc.html.css" file="datamodel.css">
+ <output name="css" file="datamodel.css">
<source xsi:type="fileSource">
<include>*schema.xml</include>
</source>
- <outlet name="torque.doc.html.css"/>
+ <outlet name="css"/>
</output>
<!-- Documentation html -->
- <output name="torque.doc.html.html">
+ <output name="html-datamodel">
<filenameOutlet
xsi:type="javaOutlet"
class="org.apache.torque.generator.outlet.java.ModifySourcenameOutlet">
@@ -52,7 +52,7 @@
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
<include>*schema.xml</include>
</source>
- <outlet name="torque.doc.html.html"/>
+ <outlet name="html-datamodel"/>
</output>
</control>
\ No newline at end of file
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/html.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/html.xml?rev=1622338&r1=1622337&r2=1622338&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/html.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/outlets/html.xml Wed Sep 3 19:51:09 2014
@@ -21,21 +21,13 @@
<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.html.css"
- xsi:type="velocityOutlet"
- path="datamodel.css.vm">
- </outlet>
- <outlet name="torque.doc.html.html"
- xsi:type="velocityOutlet"
- path="datamodel.vm">
+ <outlet xsi:type="velocityOutlet" path="html-datamodel.vm">
<mergepoint name="tableDocs">
<action xsi:type="traverseAllAction" element="table"
- outlet="torque.doc.html.table"/>
+ outlet="html-table"/>
</mergepoint>
</outlet>
- <outlet name="torque.doc.html.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