db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g.@apache.org
Subject svn commit: r1834958 - in /db/torque/torque4/trunk: ./ torque-generator/src/test/java/org/apache/torque/generator/file/ torque-site/src/ant/ torque-site/src/site/xdoc/documentation/codegen-reference/ torque-site/src/site/xdoc/documentation/modules/temp...
Date Tue, 03 Jul 2018 13:43:09 GMT
Author: gk
Date: Tue Jul  3 13:43:09 2018
New Revision: 1834958

URL: http://svn.apache.org/viewvc?rev=1834958&view=rev
Log:
- update bug report, add profile to fix javadoc/java8 
- update documentation

Modified:
    db/torque/torque4/trunk/pom.xml
    db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FileTestUtils.java
    db/torque/torque4/trunk/torque-site/src/ant/build.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/templates/index.xml
    db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/codegen/gettingStarted.xml

Modified: db/torque/torque4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1834958&r1=1834957&r2=1834958&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Tue Jul  3 13:43:09 2018
@@ -547,7 +547,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>findbugs-maven-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.0.3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -623,6 +623,15 @@
         <module>torque-test</module>
       </modules>
     </profile>
+     <profile>
+        <id>java8</id>
+        <activation>
+            <jdk>[1.8,)</jdk>  
+        </activation>
+        <properties>
+          <additionalparam>-Xdoclint:none</additionalparam>
+        </properties>
+    </profile>
   </profiles>
 
 </project>

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FileTestUtils.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FileTestUtils.java?rev=1834958&r1=1834957&r2=1834958&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FileTestUtils.java
(original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FileTestUtils.java
Tue Jul  3 13:43:09 2018
@@ -40,11 +40,11 @@ public class FileTestUtils
      */
     public static void assertFileListEquals(
                 final Fileset fileset,
-                final File... expected)
+                final File... expectedPaths)
             throws IOException
     {
         List<File> fileList = fileset.getFiles();
-        assertFileListEquals(fileList, expected);
+        assertFileListEquals(fileList, expectedPaths);
     }
 
     /**

Modified: db/torque/torque4/trunk/torque-site/src/ant/build.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/ant/build.xml?rev=1834958&r1=1834957&r2=1834958&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/ant/build.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/ant/build.xml Tue Jul  3 13:43:09 2018
@@ -172,7 +172,12 @@
       <fileset dir="${basedir}/../torque-runtime/target/site/testapidocs" />
     </copy>
     <!-- generator extra report pages-->
-    <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/reports/apidocs">
+     <copy todir="${project.reporting.outputDirectory}/documentation/codegen-reference">
+      <fileset dir="${basedir}/../torque-generator/src/main/resources/org/apache/torque/generator/configuration">
+        <include name="*.xsd" />
+      </fileset>
+    </copy>   
+   <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/reports/apidocs">
       <fileset dir="${basedir}/../torque-generator/target/site/apidocs" />
     </copy>
     <copy todir="${project.reporting.outputDirectory}/documentation/modules/generator/reports/testapidocs">

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml?rev=1834958&r1=1834957&r2=1834958&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml
(original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/codegen-reference/configuration.xml
Tue Jul  3 13:43:09 2018
@@ -67,7 +67,7 @@
     The Torque generator uses a standard directory layout for its
     configuration:
     <source>
-      - torque-gen directory (e.g. src/main/torque-gen for maven 2)
+      - torque-gen directory (e.g. src/main/torque-gen for maven 3)
         - conf
           - control.xml
           - options.properties (not always present, name can differ)
@@ -92,6 +92,10 @@
     The main configuration consists of the file <code>control.xml</code>, 
     and maybe of one or more options file, and is located in the directory
     <code>conf</code>.<br/>
+    <p>
+     The configuraton file complies to
+        <a href="configuration.xsd">configuration.xsd</a> and the referenced
<a href="outlet.xsd">outlet.xsd</a>.
+      </p>
     In the file <code>control.xml</code>, the option files are declared,
     and the output files are defined. A control file may like this:
     <source><![CDATA[

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/templates/index.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/templates/index.xml?rev=1834958&r1=1834957&r2=1834958&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/templates/index.xml
(original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/modules/templates/index.xml
Tue Jul  3 13:43:09 2018
@@ -29,6 +29,12 @@
     <p>
       The Torque Templates are a set of templates for the Torque
       generator to produce code and SQL for a given data model.
+      As an example in Torque module <strong>torque-templates</strong> the following
generator directory layout is used for
+      configuration:
+      <li>resource folder: /src/main/resources</li>
+      <li>package: org.apache.torque.templates.om </li>
+      <li>directories: conf, outlets and templates</li>
+      <p>Cft. <a href="../../codegen-reference/configuration.html">Configuration
(Code-Generation)</a>.</p>
     </p>
   </section>
  </body>

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/codegen/gettingStarted.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/codegen/gettingStarted.xml?rev=1834958&r1=1834957&r2=1834958&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/codegen/gettingStarted.xml
(original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/documentation/tutorial/codegen/gettingStarted.xml
Tue Jul  3 13:43:09 2018
@@ -293,7 +293,7 @@ $torqueGen.mergepoint("methods")##
       create a "output" tag in the root "control" tag. 
       An output needs a name by which it can be identified.
       Each output needs a filename, which can be either fixed 
-      (then you can use the "filename" attribute of the "output" tag),
+      (then you can use the "file" attribute of the "output" tag),
       or which is generated (in which case you would use a "filenameGenerator"
       tag inside the "output" tag.
     </p>



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