db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1354016 - in /db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates: TestProcessing.java jdbc2schema/Jdbc2SchemaTest.java
Date Tue, 26 Jun 2012 13:47:52 GMT
Author: tfischer
Date: Tue Jun 26 13:47:51 2012
New Revision: 1354016

URL: http://svn.apache.org/viewvc?rev=1354016&view=rev
Log:
Allow setting a defaultOutputEncoding from the maven and ant plugins

Modified:
    db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
    db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java

Modified: db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java?rev=1354016&r1=1354015&r2=1354016&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/TestProcessing.java
Tue Jun 26 13:47:51 2012
@@ -101,14 +101,14 @@ public class TestProcessing
                         null,
                         sourceFileset,
                         null);
-        unitDescriptors.add(new UnitDescriptor(
+        UnitDescriptor unitDescriptor = new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGeneratorPaths(),
-                null,
-                sourceProvider,
-                new MapOptionsConfiguration(overrideOptions),
-                null));
+                new DefaultTorqueGeneratorPaths());
+        unitDescriptor.setOverrideSourceProvider(sourceProvider);
+        unitDescriptor.setOverrideOptions(
+                new MapOptionsConfiguration(overrideOptions));
+        unitDescriptors.add(unitDescriptor);
 
         // sql ddl templates
         projectPaths
@@ -124,14 +124,13 @@ public class TestProcessing
         projectPaths.setOutputDirectory(
                 Maven2ProjectPaths.MODIFIABLE_OUTPUT_DIR_KEY,
                 new File("target/generated-sql-2"));
-        unitDescriptors.add(new UnitDescriptor(
+        unitDescriptor = new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGeneratorPaths(),
-                null,
-                null,
-                new MapOptionsConfiguration(overrideOptions),
-                null));
+                new DefaultTorqueGeneratorPaths());
+        unitDescriptor.setOverrideOptions(
+                new MapOptionsConfiguration(overrideOptions));
+        unitDescriptors.add(unitDescriptor);
 
         // sql createdb templates
         projectPaths
@@ -147,14 +146,13 @@ public class TestProcessing
         projectPaths.setOutputDirectory(
                 Maven2ProjectPaths.MODIFIABLE_OUTPUT_DIR_KEY,
                 new File("target/generated-sql-2"));
-        unitDescriptors.add(new UnitDescriptor(
+        unitDescriptor = new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGeneratorPaths(),
-                null,
-                null,
-                new MapOptionsConfiguration(overrideOptions),
-                null));
+                new DefaultTorqueGeneratorPaths());
+        unitDescriptor.setOverrideOptions(
+                new MapOptionsConfiguration(overrideOptions));
+        unitDescriptors.add(unitDescriptor);
 
         // idbroker-init-sql templates
         projectPaths
@@ -170,14 +168,13 @@ public class TestProcessing
         projectPaths.setOutputDirectory(
                 Maven2ProjectPaths.MODIFIABLE_OUTPUT_DIR_KEY,
                 new File("target/generated-sql-2"));
-        unitDescriptors.add(new UnitDescriptor(
+        unitDescriptor = new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGeneratorPaths(),
-                null,
-                null,
-                new MapOptionsConfiguration(overrideOptions),
-                null));
+                new DefaultTorqueGeneratorPaths());
+        unitDescriptor.setOverrideOptions(
+                new MapOptionsConfiguration(overrideOptions));
+        unitDescriptors.add(unitDescriptor);
 
         // html doc templates
         projectPaths = new CustomProjectPaths(
@@ -192,14 +189,13 @@ public class TestProcessing
         projectPaths.setOutputDirectory(
                 Maven2ProjectPaths.MODIFIABLE_OUTPUT_DIR_KEY,
                 new File("target/generated-docs-2"));
-        unitDescriptors.add(new UnitDescriptor(
+        unitDescriptor = new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGeneratorPaths(),
-                null,
-                null,
-                new MapOptionsConfiguration(overrideOptions),
-                null));
+                new DefaultTorqueGeneratorPaths());
+        unitDescriptor.setOverrideOptions(
+                new MapOptionsConfiguration(overrideOptions));
+        unitDescriptors.add(unitDescriptor);
 
         // xdoc doc templates
         projectPaths = new CustomProjectPaths(
@@ -214,14 +210,13 @@ public class TestProcessing
         projectPaths.setOutputDirectory(
                 Maven2ProjectPaths.MODIFIABLE_OUTPUT_DIR_KEY,
                 new File("target/generated-xdocs-2"));
-        unitDescriptors.add(new UnitDescriptor(
+        unitDescriptor = new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGeneratorPaths(),
-                null,
-                null,
-                new MapOptionsConfiguration(overrideOptions),
-                null));
+                new DefaultTorqueGeneratorPaths());
+        unitDescriptor.setOverrideOptions(
+                new MapOptionsConfiguration(overrideOptions));
+        unitDescriptors.add(unitDescriptor);
 
         // generate
         controller.run(unitDescriptors);

Modified: db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java?rev=1354016&r1=1354015&r2=1354016&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
(original)
+++ db/torque/torque4/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
Tue Jun 26 13:47:51 2012
@@ -129,14 +129,13 @@ public class Jdbc2SchemaTest
         projectPaths.setOutputDirectory(
                 null,
                 new File("target/generated-schema"));
-        unitDescriptors.add(new UnitDescriptor(
+        UnitDescriptor unitDescriptor = new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGeneratorPaths(),
-                null,
-                null,
-                new MapOptionsConfiguration(overrideOptions),
-                null));
+                new DefaultTorqueGeneratorPaths());
+        unitDescriptor.setOverrideOptions(
+                new MapOptionsConfiguration(overrideOptions));
+        unitDescriptors.add(unitDescriptor);
 
         controller.run(unitDescriptors);
 



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