db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r991069 - in /db/torque/torque4/trunk/torque-templates/src/main: java/org/apache/torque/templates/ java/org/apache/torque/templates/skipdecider/ resources/org/apache/torque/templates/doc/html/conf/ resources/org/apache/torque/templates/om/c...
Date Tue, 31 Aug 2010 03:36:22 GMT
Author: tfischer
Date: Tue Aug 31 03:36:22 2010
New Revision: 991069

URL: http://svn.apache.org/viewvc?rev=991069&view=rev
Log:
adjusted class and package names to name change in generator from SourceFilter to SkipDecider

Added:
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/
      - copied from r944878, db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSkipDecider.java
      - copied, changed from r965168, db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSkipDecider.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSkipDecider.java
      - copied, changed from r965168, db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSkipDecider.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSkipDecider.java
      - copied, changed from r965168, db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSkipDecider.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSkipDecider.java
      - copied, changed from r965168, db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSkipDecider.java
Removed:
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSourceFilter.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSourceFilter.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSourceFilter.java
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSourceFilter.java
Modified:
    db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.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/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/TemplateOptionName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java?rev=991069&r1=991068&r2=991069&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/TemplateOptionName.java
Tue Aug 31 03:36:22 2010
@@ -48,7 +48,7 @@ public enum TemplateOptionName implement
     DEFAULT_TYPE("torque.om.column.defaultType"),
 
     /** Whether bean objects should be generated. */
-    GENERATE_BEANS("torque.om.generateBeans"),
+    OM_GENERATE_BEANS("torque.om.generateBeans"),
 
     /** Whether manager classes should be used. */
     OM_USE_MANAGERS("torque.om.useManagers"),

Copied: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSkipDecider.java
(from r965168, db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSkipDecider.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSkipDecider.java?p2=db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSkipDecider.java&p1=db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSkipDecider.java&r1=965168&r2=991069&rev=991069&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/BeanSkipDecider.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/BeanSkipDecider.java
Tue Aug 31 03:36:22 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.templates.sourcefilter;
+package org.apache.torque.templates.skipdecider;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -34,6 +34,6 @@ public class BeanSkipDecider implements 
     public boolean proceed(ControllerState controllerState)
     {
         return controllerState.getBooleanOption(
-                TemplateOptionName.GENERATE_BEANS);
+                TemplateOptionName.OM_GENERATE_BEANS);
     }
 }

Copied: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSkipDecider.java
(from r965168, db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSkipDecider.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSkipDecider.java?p2=db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSkipDecider.java&p1=db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSkipDecider.java&r1=965168&r2=991069&rev=991069&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/InterfaceSkipDecider.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/InterfaceSkipDecider.java
Tue Aug 31 03:36:22 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.templates.sourcefilter;
+package org.apache.torque.templates.skipdecider;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSkipDecider.java
(from r965168, db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSkipDecider.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSkipDecider.java?p2=db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSkipDecider.java&p1=db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSkipDecider.java&r1=965168&r2=991069&rev=991069&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/ManagerSkipDecider.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/ManagerSkipDecider.java
Tue Aug 31 03:36:22 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.templates.sourcefilter;
+package org.apache.torque.templates.skipdecider;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSkipDecider.java
(from r965168, db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSkipDecider.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSkipDecider.java?p2=db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSkipDecider.java&p1=db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSkipDecider.java&r1=965168&r2=991069&rev=991069&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/sourcefilter/MapInitSkipDecider.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/skipdecider/MapInitSkipDecider.java
Tue Aug 31 03:36:22 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.templates.sourcefilter;
+package org.apache.torque.templates.skipdecider;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

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=991069&r1=991068&r2=991069&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
Tue Aug 31 03:36:22 2010
@@ -33,7 +33,13 @@
   </output>
 
   <!-- Documentation html -->
-  <output name="torque.doc.html.html" file="datamodel.html">
+  <output name="torque.doc.html.html">
+    <filenameOutlet
+        xsi:type="javaOutlet"
+        class="org.apache.torque.generator.outlet.java.ModifySourcenameOutlet">
+      <discardFrom>.</discardFrom>
+      <suffix>.html</suffix>
+    </filenameOutlet>
     <source xsi:type="fileSource" elements="database">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>

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=991069&r1=991068&r2=991069&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
Tue Aug 31 03:36:22 2010
@@ -125,7 +125,7 @@
       </mergepoint>
     </filenameOutlet>
     <source xsi:type="fileSource" elements="database/table"
-        skipDecider="org.apache.torque.templates.sourcefilter.InterfaceSkipDecider">
+        skipDecider="org.apache.torque.templates.skipdecider.InterfaceSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -234,7 +234,7 @@
       </mergepoint>
     </filenameOutlet>
     <source xsi:type="fileSource" elements="database/table"
-        skipDecider="org.apache.torque.templates.sourcefilter.BeanSkipDecider">
+        skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -262,7 +262,7 @@
       </mergepoint>
     </filenameOutlet>
     <source xsi:type="fileSource" elements="database/table"
-        skipDecider="org.apache.torque.templates.sourcefilter.BeanSkipDecider">
+        skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -290,7 +290,7 @@
       </mergepoint>
     </filenameOutlet>
     <source xsi:type="fileSource" elements="database/table/column/inheritance"
-        skipDecider="org.apache.torque.templates.sourcefilter.BeanSkipDecider">
+        skipDecider="org.apache.torque.templates.skipdecider.BeanSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -317,7 +317,7 @@
       </mergepoint>
     </filenameOutlet>
     <source xsi:type="fileSource" elements="database" 
-        skipDecider="org.apache.torque.templates.sourcefilter.MapInitSkipDecider">
+        skipDecider="org.apache.torque.templates.skipdecider.MapInitSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.mapInit.MapInitDatabaseTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -345,7 +345,7 @@
       </mergepoint>
     </filenameOutlet>
     <source xsi:type="fileSource" elements="database" 
-        skipDecider="org.apache.torque.templates.sourcefilter.MapInitSkipDecider">
+        skipDecider="org.apache.torque.templates.skipdecider.MapInitSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.mapInit.MapInitDatabaseTransformer"/>
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
@@ -374,7 +374,7 @@
       </mergepoint>
     </filenameOutlet>
     <source xsi:type="fileSource" elements="database/table" 
-        skipDecider="org.apache.torque.templates.sourcefilter.ManagerSkipDecider">
+        skipDecider="org.apache.torque.templates.skipdecider.ManagerSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>
@@ -403,7 +403,7 @@
       </mergepoint>
     </filenameOutlet>
     <source xsi:type="fileSource" elements="database/table"
-        skipDecider="org.apache.torque.templates.sourcefilter.ManagerSkipDecider">
+        skipDecider="org.apache.torque.templates.skipdecider.ManagerSkipDecider">
       <transformer class="org.apache.torque.templates.transformer.om.OMTransformer"/>
       <include>*schema.xml</include>
       <exclude>id-table-schema.xml</exclude>

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=991069&r1=991068&r2=991069&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
Tue Aug 31 03:36:22 2010
@@ -25,7 +25,7 @@
 
   <options xsi:type="propertiesOptions" path="options.properties"/>
 
-  <output name="torque.sql.ddl" file="schema.sql">
+  <output name="torque.sql.ddl">
     <filenameOutlet
         xsi:type="javaOutlet"
         class="org.apache.torque.generator.outlet.java.ModifySourcenameOutlet">
@@ -38,6 +38,5 @@
     </source>
     <outlet name="torque.sql.ddl.database"/>
   </output>
-  
 </control>
   
\ 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