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 2010/02/24 20:55:48 UTC
svn commit: r915954 - in /db/torque/torque4/trunk/torque-templates/src/main:
java/org/apache/torque/templates/sourcefilter/
resources/org/apache/torque/templates/doc/html/conf/
resources/org/apache/torque/templates/doc/xdoc/conf/
resources/org/apache/t...
Author: tfischer
Date: Wed Feb 24 19:55:48 2010
New Revision: 915954
URL: http://svn.apache.org/viewvc?rev=915954&view=rev
Log:
- modified control files to match new syntax
- removed idtable solution from yesterday and used source exclude instead
Removed:
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ExcludeIdTableSchemaSourceFilter.java
Modified:
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSourceFilter.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSourceFilter.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSourceFilter.java
db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSourceFilter.java
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/xdoc/conf/control.xml
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml
Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSourceFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSourceFilter.java?rev=915954&r1=915953&r2=915954&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSourceFilter.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSourceFilter.java Wed Feb 24 19:55:48 2010
@@ -33,10 +33,6 @@
{
public boolean proceed(ControllerState controllerState)
{
- if (!new ExcludeIdTableSchemaSourceFilter().proceed(controllerState))
- {
- return false;
- }
return controllerState.getBooleanOption(
TemplateOptionName.GENERATE_BEANS);
}
Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSourceFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSourceFilter.java?rev=915954&r1=915953&r2=915954&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSourceFilter.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSourceFilter.java Wed Feb 24 19:55:48 2010
@@ -35,10 +35,6 @@
{
public boolean proceed(ControllerState controllerState)
{
- if (!new ExcludeIdTableSchemaSourceFilter().proceed(controllerState))
- {
- return false;
- }
SourceElement sourceElement = controllerState.getSourceElement();
String interfaceName
= (String) sourceElement.getAttribute(
Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSourceFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSourceFilter.java?rev=915954&r1=915953&r2=915954&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSourceFilter.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSourceFilter.java Wed Feb 24 19:55:48 2010
@@ -32,10 +32,6 @@
{
public boolean proceed(ControllerState controllerState)
{
- if (!new ExcludeIdTableSchemaSourceFilter().proceed(controllerState))
- {
- return false;
- }
if (!controllerState.getBooleanOption(
TemplateOptionName.OM_USE_MANAGERS))
{
Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSourceFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSourceFilter.java?rev=915954&r1=915953&r2=915954&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSourceFilter.java (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSourceFilter.java Wed Feb 24 19:55:48 2010
@@ -33,10 +33,6 @@
{
public boolean proceed(ControllerState controllerState)
{
- if (!new ExcludeIdTableSchemaSourceFilter().proceed(controllerState))
- {
- return false;
- }
return controllerState.getBooleanOption(
TemplateOptionName.OM_GENERATE_MAP_INIT);
}
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=915954&r1=915953&r2=915954&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 Feb 24 19:55:48 2010
@@ -26,14 +26,16 @@
<!-- Documentation css -->
<output name="torque.doc.html.css" file="datamodel.css">
- <source elements="database" path="*schema.xml">
+ <source elements="database">
+ <include>*schema.xml</include>
</source>
<generator name="torque.doc.html.css"/>
</output>
<!-- Documentation html -->
<output name="torque.doc.html.html" file="datamodel.html">
- <source elements="database" path="*schema.xml">
+ <source elements="database">
+ <include>*schema.xml</include>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.doc.html.html"/>
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=915954&r1=915953&r2=915954&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 Wed Feb 24 19:55:48 2010
@@ -26,7 +26,8 @@
<!-- Documentation xdoc -->
<output name="torque.doc.xdoc.xdoc" file="datamodel.xml">
- <source elements="database" path="*schema.xml">
+ <source elements="database">
+ <include>*schema.xml</include>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.doc.xdoc.xdoc"/>
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml?rev=915954&r1=915953&r2=915954&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml Wed Feb 24 19:55:48 2010
@@ -24,7 +24,9 @@
xmlns="http://db.apache.org/torque/gf/4.0/configuration">
<options xsi:type="propertiesOptions" path="options.properties"/>
<output name="torque.sql.idtable.idtable" file="id-table-init.sql">
- <source elements="database" path="*schema.xml">
+ <source elements="database">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
</source>
<generator name="torque.sql.idtable.idtable"/>
</output>
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml?rev=915954&r1=915953&r2=915954&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml Wed Feb 24 19:55:48 2010
@@ -43,9 +43,9 @@
acceptNotSet="false"/>
</mergepoint>
</filenameGenerator>
- <source elements="database/table"
- path="*schema.xml"
- filter="org.apache.torque.templates.sourcefilter.ExcludeIdTableSchemaSourceFilter">
+ <source elements="database/table">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.dbObject"/>
@@ -69,9 +69,9 @@
acceptNotSet="false"/>
</mergepoint>
</filenameGenerator>
- <source elements="database/table"
- path="*schema.xml"
- filter="org.apache.torque.templates.sourcefilter.ExcludeIdTableSchemaSourceFilter">
+ <source elements="database/table">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
<transformer class="org.apache.torque.templates.transformer.om.dbobject.base.BaseDbObjectTransformer"/>
</source>
@@ -97,9 +97,9 @@
acceptNotSet="false"/>
</mergepoint>
</filenameGenerator>
- <source elements="database/table/column/inheritance"
- path="*schema.xml"
- filter="org.apache.torque.templates.sourcefilter.ExcludeIdTableSchemaSourceFilter">
+ <source elements="database/table/column/inheritance">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.inheritanceDbObject"/>
@@ -125,8 +125,9 @@
</mergepoint>
</filenameGenerator>
<source elements="database/table"
- path="*schema.xml"
filter="org.apache.torque.templates.sourcefilter.InterfaceSourceFilter">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.interface"/>
@@ -151,9 +152,9 @@
acceptNotSet="false"/>
</mergepoint>
</filenameGenerator>
- <source elements="database/table"
- path="*schema.xml"
- filter="org.apache.torque.templates.sourcefilter.ExcludeIdTableSchemaSourceFilter">
+ <source elements="database/table">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.peer"/>
@@ -178,9 +179,9 @@
acceptNotSet="false"/>
</mergepoint>
</filenameGenerator>
- <source elements="database/table"
- path="*schema.xml"
- filter="org.apache.torque.templates.sourcefilter.ExcludeIdTableSchemaSourceFilter">
+ <source elements="database/table">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.basePeer"/>
@@ -205,9 +206,9 @@
acceptNotSet="false"/>
</mergepoint>
</filenameGenerator>
- <source elements="database/table"
- path="*schema.xml"
- filter="org.apache.torque.templates.sourcefilter.ExcludeIdTableSchemaSourceFilter">
+ <source elements="database/table">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.mapBuilder"/>
@@ -233,8 +234,9 @@
</mergepoint>
</filenameGenerator>
<source elements="database/table"
- path="*schema.xml"
filter="org.apache.torque.templates.sourcefilter.BeanSourceFilter">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.bean.bean"/>
@@ -260,8 +262,9 @@
</mergepoint>
</filenameGenerator>
<source elements="database/table"
- path="*schema.xml"
filter="org.apache.torque.templates.sourcefilter.BeanSourceFilter">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.bean.baseBean"/>
@@ -286,9 +289,9 @@
acceptNotSet="false"/>
</mergepoint>
</filenameGenerator>
- <source elements="database/table/column/inheritance"
- path="*schema.xml"
- filter="org.apache.torque.templates.sourcefilter.ExcludeIdTableSchemaSourceFilter">
+ <source elements="database/table/column/inheritance">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.inheritanceBean"/>
@@ -313,8 +316,9 @@
</mergepoint>
</filenameGenerator>
<source elements="database"
- path="*schema.xml"
filter="org.apache.torque.templates.sourcefilter.MapInitSourceFilter">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.mapInit.MapInitDatabaseTransformer"/>
</source>
<generator name="torque.om.mapInit.mapInit"/>
@@ -340,8 +344,9 @@
</mergepoint>
</filenameGenerator>
<source elements="database"
- path="*schema.xml"
filter="org.apache.torque.templates.sourcefilter.MapInitSourceFilter">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.mapInit.MapInitDatabaseTransformer"/>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
@@ -368,8 +373,9 @@
</mergepoint>
</filenameGenerator>
<source elements="database/table"
- path="*schema.xml"
filter="org.apache.torque.templates.sourcefilter.ManagerSourceFilter">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.manager.manager"/>
@@ -396,8 +402,9 @@
</mergepoint>
</filenameGenerator>
<source elements="database/table"
- path="*schema.xml"
filter="org.apache.torque.templates.sourcefilter.ManagerSourceFilter">
+ <include>*schema.xml</include>
+ <exclude>id-table-schema.xml</exclude>
<transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
</source>
<generator name="torque.om.manager.baseManager"/>
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml?rev=915954&r1=915953&r2=915954&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml Wed Feb 24 19:55:48 2010
@@ -32,7 +32,8 @@
<discardFrom>.</discardFrom>
<suffix>.sql</suffix>
</filenameGenerator>
- <source elements="database" path="*schema.xml">
+ <source elements="database">
+ <include>*schema.xml</include>
<transformer class="org.apache.torque.templates.transformer.sql.SQLTransformer"/>
</source>
<generator name="torque.sql.ddl.database"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org