db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r593893 - in /db/torque: maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/ site/trunk/xdocs/
Date Sun, 11 Nov 2007 14:38:21 GMT
Author: tfischer
Date: Sun Nov 11 06:38:20 2007
New Revision: 593893

URL: http://svn.apache.org/viewvc?rev=593893&view=rev
Log:
Changed the default value of the property schemaExcludes in the sql goal from "id-table-schema.xml"
to "". 
In all other goals, the property retains its old value.

Modified:
    db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataDtdMojo.java
    db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataDumpMojo.java
    db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataModelTaskMojo.java
    db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataSqlMojo.java
    db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DocumentationMojo.java
    db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/IdTableInitSqlMojo.java
    db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/OMMojo.java
    db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/SqlMojo.java
    db/torque/site/trunk/xdocs/changes.xml

Modified: db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataDtdMojo.java
URL: http://svn.apache.org/viewvc/db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataDtdMojo.java?rev=593893&r1=593892&r2=593893&view=diff
==============================================================================
--- db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataDtdMojo.java (original)
+++ db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataDtdMojo.java Sun
Nov 11 06:38:20 2007
@@ -37,9 +37,9 @@
     /** The context property for the name of the project. */
     public static final String PROJECT_CONTEXT_PROPERTY = "project";
 
-    // The following three dummies trick the Mojo Description Extractor
+    // The following dummies trick the Mojo Description Extractor
     // into setting the correct default values for
-    // outputDir, reportFile and contextPropertiesPath
+    // outputDir, reportFile, contextPropertiesPath, schemaExcludes
     /**
      * The directory in which the SQL will be generated.
      *
@@ -66,6 +66,14 @@
      */
     private String dummy3;
 
+    /**
+     * The schema files which should be excluded in generation
+     * (in ant-style notation).
+     *
+     * @parameter property="schemaExcludes" expression="id-table-schema.xml"
+     */
+    private String dummy4;
+ 
     /**
      * The name of the project, used as a prefix of the name of the datadtd.
      *

Modified: db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataDumpMojo.java
URL: http://svn.apache.org/viewvc/db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataDumpMojo.java?rev=593893&r1=593892&r2=593893&view=diff
==============================================================================
--- db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataDumpMojo.java (original)
+++ db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataDumpMojo.java Sun
Nov 11 06:38:20 2007
@@ -39,9 +39,9 @@
     public static final String PROJECT_CONTEXT_PROPERTY
         = "project";
 
-    // The following three dummies trick the Mojo Description Extractor
+    // The following dummies trick the Mojo Description Extractor
     // into setting the correct default values for
-    // outputDir, reportFile and contextPropertiesPath
+    // outputDir, reportFile, contextPropertiesPath, schemaExcludes
     /**
      * The directory in which the data files will be created.
      *
@@ -66,6 +66,14 @@
      *            expression="${project.build.directory}/torque/context.data.properties"
      */
     private String dummy3;
+
+    /**
+     * The schema files which should be excluded in generation
+     * (in ant-style notation).
+     *
+     * @parameter property="schemaExcludes" expression="id-table-schema.xml"
+     */
+    private String dummy4;
 
     /**
      * The fully qualified class name of the database driver.

Modified: db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataModelTaskMojo.java
URL: http://svn.apache.org/viewvc/db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataModelTaskMojo.java?rev=593893&r1=593892&r2=593893&view=diff
==============================================================================
--- db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataModelTaskMojo.java
(original)
+++ db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataModelTaskMojo.java
Sun Nov 11 06:38:20 2007
@@ -61,8 +61,6 @@
     /**
      * The schema files which should be excluded in generation
      * (in ant-style notation).
-     *
-     * @parameter expression="id-table-schema.xml"
      */
     private String schemaExcludes;
 

Modified: db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataSqlMojo.java
URL: http://svn.apache.org/viewvc/db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataSqlMojo.java?rev=593893&r1=593892&r2=593893&view=diff
==============================================================================
--- db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataSqlMojo.java (original)
+++ db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DataSqlMojo.java Sun
Nov 11 06:38:20 2007
@@ -63,6 +63,14 @@
     private String dummy3;
 
     /**
+     * The schema files which should be excluded in generation
+     * (in ant-style notation).
+     *
+     * @parameter property="schemaExcludes" expression="id-table-schema.xml"
+     */
+    private String dummy4;
+
+    /**
      * The data Xml file to process.
      *
      * @parameter

Modified: db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DocumentationMojo.java
URL: http://svn.apache.org/viewvc/db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DocumentationMojo.java?rev=593893&r1=593892&r2=593893&view=diff
==============================================================================
--- db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DocumentationMojo.java
(original)
+++ db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/DocumentationMojo.java
Sun Nov 11 06:38:20 2007
@@ -38,9 +38,9 @@
     public static final String OUTPUT_FORMAT_CONTEXT_PROPERTY
         = "outputFormat";
 
-    // The following three dummies trick the Mojo Description Extractor
+    // The following dummies trick the Mojo Description Extractor
     // into setting the correct default values for
-    // outputDir, reportFile and contextPropertiesPath
+    // outputDir, reportFile, contextPropertiesPath, schemaExcludes
     /**
      * The directory in which the documentation will be generated
      *
@@ -65,6 +65,14 @@
      *            expression="${project.build.directory}/torque/context.doc.properties"
      */
     private String dummy3;
+
+    /**
+     * The schema files which should be excluded in generation
+     * (in ant-style notation).
+     *
+     * @parameter property="schemaExcludes" expression="id-table-schema.xml"
+     */
+    private String dummy4;
 
     /**
      * The format of the generated documentation. Can be either html or anakia.

Modified: db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/IdTableInitSqlMojo.java
URL: http://svn.apache.org/viewvc/db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/IdTableInitSqlMojo.java?rev=593893&r1=593892&r2=593893&view=diff
==============================================================================
--- db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/IdTableInitSqlMojo.java
(original)
+++ db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/IdTableInitSqlMojo.java
Sun Nov 11 06:38:20 2007
@@ -42,7 +42,7 @@
 
     // The following dummies trick the Mojo Description Extractor
     // into setting the correct default values for
-    // outputDir, reportFile, contextPropertiesPath and suffix
+    // outputDir, reportFile, contextPropertiesPath, schemaExcludes, suffix
     /**
      * The directory in which the SQL will be generated.
      *
@@ -69,12 +69,20 @@
     private String dummy3;
 
     /**
+     * The schema files which should be excluded in generation
+     * (in ant-style notation).
+     *
+     * @parameter property="schemaExcludes" expression="id-table-schema.xml"
+     */
+    private String dummy4;
+
+    /**
      * The suffix of the idTable-sql files.
      *
      * @parameter property="suffix"
      *            expression="-idtable-init"
      */
-    private String dummy4;
+    private String dummy5;
  
     /**
      * The initial ID of the idtables

Modified: db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/OMMojo.java
URL: http://svn.apache.org/viewvc/db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/OMMojo.java?rev=593893&r1=593892&r2=593893&view=diff
==============================================================================
--- db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/OMMojo.java (original)
+++ db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/OMMojo.java Sun Nov
11 06:38:20 2007
@@ -38,9 +38,9 @@
 public class OMMojo
         extends DataModelTaskMojo
 {
-    // The following three dummies trick the Mojo Description Extractor
+    // The following dummies trick the Mojo Description Extractor
     // into setting the correct default values for
-    // outputDir, reportFile and contextPropertiesPath
+    // outputDir, reportFile, contextPropertiesPath, schemaExcludes
     /**
      * The directory in which the sources for the non-base persistence classes
      * will be generated.
@@ -67,6 +67,14 @@
      *            expression="${project.build.directory}/torque/context.om.properties"
      */
     private String dummy3;
+
+    /**
+     * The schema files which should be excluded in generation
+     * (in ant-style notation).
+     *
+     * @parameter property="schemaExcludes" expression="id-table-schema.xml"
+     */
+    private String dummy4;
 
     /**
      * The directory where the sources for the base persistence classes

Modified: db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/SqlMojo.java
URL: http://svn.apache.org/viewvc/db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/SqlMojo.java?rev=593893&r1=593892&r2=593893&view=diff
==============================================================================
--- db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/SqlMojo.java (original)
+++ db/torque/maven2-plugin/trunk/src/main/java/org/apache/torque/mojo/SqlMojo.java Sun Nov
11 06:38:20 2007
@@ -37,7 +37,7 @@
 {
     // The following three dummies trick the Mojo Description Extractor
     // into setting the correct default values for
-    // outputDir, reportFile, contextPropertiesPath and suffix.
+    // outputDir, reportFile, contextPropertiesPath, schemaExcludes, suffix.
     /**
      * The directory in which the SQL will be generated.
      *
@@ -64,10 +64,18 @@
     private String dummy3;
 
     /**
+     * The schema files which should be excluded in generation
+     * (in ant-style notation).
+     *
+     * @parameter property="schemaExcludes" expression=""
+     */
+    private String dummy4;
+
+    /**
      * The suffix of the generated sql files.
      *
      * @parameter property="suffix"
      *            expression=""
      */
-    private String dummy4;
+    private String dummy5;
 }

Modified: db/torque/site/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/changes.xml?rev=593893&r1=593892&r2=593893&view=diff
==============================================================================
--- db/torque/site/trunk/xdocs/changes.xml (original)
+++ db/torque/site/trunk/xdocs/changes.xml Sun Nov 11 06:38:20 2007
@@ -31,6 +31,11 @@
 
   <body>
   <release version="3.3-RC3" date="in SVN">
+    <action type="change" dev="tfischer">
+      maven2 plugin: changed the default value of the property schemaExcludes
+      in the sql goal from "id-table-schema.xml" to "". So the default
+      property settings also work if the idMethod is idbroker.
+    </action>
     <action type="fix" dev="gmonroe" issue="TORQUE-53" >
       Added better handling in Village for BigDecimal values.  Double and
       Float types will be converted using appropriate constructors rather



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