db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r944867 [2/3] - in /db/torque/torque4/trunk/torque-generator: ./ src/main/resources/org/apache/torque/generator/ src/main/resources/org/apache/torque/generator/configuration/ src/test/configuration/src/main/torque-gen-parent/ src/test/confi...
Date Sun, 16 May 2010 15:45:40 GMT
Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java (from r917591, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/ReadConfigurationTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/ReadConfigurationTest.java&r1=917591&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/ReadConfigurationTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration;
+package org.apache.torque.generator.configuration;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -34,34 +34,38 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.torque.gf.BaseTest;
-import org.apache.torque.gf.configuration.controller.GeneratorReference;
-import org.apache.torque.gf.configuration.controller.Loglevel;
-import org.apache.torque.gf.configuration.controller.Output;
-import org.apache.torque.gf.configuration.generator.GeneratorConfiguration;
-import org.apache.torque.gf.configuration.mergepoint.MergepointMapping;
-import org.apache.torque.gf.configuration.option.MapOptionsConfiguration;
-import org.apache.torque.gf.configuration.option.OptionsConfiguration;
-import org.apache.torque.gf.configuration.paths.CustomProjectPaths;
-import org.apache.torque.gf.configuration.paths.DefaultTorqueGfPaths;
-import org.apache.torque.gf.configuration.paths.Maven2DirectoryProjectPaths;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.control.action.ApplyAction;
-import org.apache.torque.gf.control.action.MergepointAction;
-import org.apache.torque.gf.control.action.TraverseAllAction;
-import org.apache.torque.gf.file.Fileset;
-import org.apache.torque.gf.generator.Generator;
-import org.apache.torque.gf.java.JavaGenerator;
-import org.apache.torque.gf.option.Option;
-import org.apache.torque.gf.option.OptionImpl;
-import org.apache.torque.gf.option.Options;
-import org.apache.torque.gf.qname.QualifiedName;
-import org.apache.torque.gf.source.FileSourcesImpl;
-import org.apache.torque.gf.source.TransformerDefinition;
-import org.apache.torque.gf.source.properties.PropertiesSourceType;
-import org.apache.torque.gf.source.xml.XmlSourceType;
-import org.apache.torque.gf.template.velocity.VelocityGenerator;
+import org.apache.torque.generator.BaseTest;
+import org.apache.torque.generator.configuration.ConfigurationHandlers;
+import org.apache.torque.generator.configuration.UnitConfiguration;
+import org.apache.torque.generator.configuration.UnitConfigurationReader;
+import org.apache.torque.generator.configuration.UnitDescriptor;
+import org.apache.torque.generator.configuration.controller.Loglevel;
+import org.apache.torque.generator.configuration.controller.OutletReference;
+import org.apache.torque.generator.configuration.controller.Output;
+import org.apache.torque.generator.configuration.mergepoint.MergepointMapping;
+import org.apache.torque.generator.configuration.option.MapOptionsConfiguration;
+import org.apache.torque.generator.configuration.option.OptionsConfiguration;
+import org.apache.torque.generator.configuration.outlet.OutletConfiguration;
+import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
+import org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
+import org.apache.torque.generator.configuration.paths.Maven2DirectoryProjectPaths;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.control.action.ApplyAction;
+import org.apache.torque.generator.control.action.MergepointAction;
+import org.apache.torque.generator.control.action.TraverseAllAction;
+import org.apache.torque.generator.file.Fileset;
+import org.apache.torque.generator.java.JavaOutlet;
+import org.apache.torque.generator.option.Option;
+import org.apache.torque.generator.option.OptionImpl;
+import org.apache.torque.generator.option.Options;
+import org.apache.torque.generator.outlet.Outlet;
+import org.apache.torque.generator.qname.QualifiedName;
+import org.apache.torque.generator.source.FileSourcesImpl;
+import org.apache.torque.generator.source.TransformerDefinition;
+import org.apache.torque.generator.source.properties.PropertiesSourceType;
+import org.apache.torque.generator.source.xml.XmlSourceType;
+import org.apache.torque.generator.template.velocity.VelocityOutlet;
 import org.junit.Test;
 
 
@@ -80,7 +84,7 @@ public class ReadConfigurationTest exten
         UnitDescriptor unitDescriptor = new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGfPaths());
+                new DefaultTorqueGeneratorPaths());
         UnitConfigurationReader configurationReader
                 = new UnitConfigurationReader();
         ConfigurationHandlers configurationHandlers
@@ -117,7 +121,7 @@ public class ReadConfigurationTest exten
             {
                 QualifiedName optionWithNamespaceQName
                         = new QualifiedName(
-                                "org.apache.torque.gf.optionWithNamespace");
+                                "org.apache.torque.generator.optionWithNamespace");
                 Option optionWithNamespace
                         = globalScope.get(optionWithNamespaceQName);
                 assertEquals(
@@ -173,29 +177,29 @@ public class ReadConfigurationTest exten
                 Output outputFile = outputFiles.get(0);
                 assertEquals(
                         outputFile.getName(),
-                        new QualifiedName("org.apache.torque.gf.firstOutput"));
+                        new QualifiedName("org.apache.torque.generator.firstOutput"));
 
                 {
-                    GeneratorReference generatorConfiguration
-                            = outputFile.getContentGenerator();
+                    OutletReference outletConfiguration
+                            = outputFile.getContentOutlet();
                     assertEquals(
                             new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.javaGenerator"),
-                            generatorConfiguration.getName());
+                                "org.apache.torque.generator.test.readConfiguration.javaOutlet"),
+                            outletConfiguration.getName());
                 }
 
                 assertNull(outputFile.getFilename());
                 assertTrue(outputFile.isSkipIfExists());
 
                 {
-                    JavaGenerator filenameGenerator
-                            = (JavaGenerator) outputFile.getFilenameGenerator();
-                    assertEquals("Foo", filenameGenerator.getFoo());
-                    assertEquals("Bar", filenameGenerator.getBar());
+                    JavaOutlet filenameOutlet
+                            = (JavaOutlet) outputFile.getFilenameOutlet();
+                    assertEquals("Foo", filenameOutlet.getFoo());
+                    assertEquals("Bar", filenameOutlet.getBar());
                     assertEquals(
                             new QualifiedName(
-                                    "org.apache.torque.gf.configuration.filenameGenerator"),
-                            filenameGenerator.getName());
+                                    "org.apache.torque.generator.configuration.filenameOutlet"),
+                            filenameOutlet.getName());
                 }
 
                 {
@@ -226,12 +230,12 @@ public class ReadConfigurationTest exten
                         new QualifiedName("secondOutput"));
 
                 {
-                    GeneratorReference generatorConfiguration
-                            = outputFile.getContentGenerator();
+                    OutletReference outletConfiguration
+                            = outputFile.getContentOutlet();
                     assertEquals(
                             new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.anotherGenerator"),
-                            generatorConfiguration.getName());
+                                "org.apache.torque.generator.test.readConfiguration.anotherOutlet"),
+                            outletConfiguration.getName());
                 }
 
 
@@ -239,10 +243,10 @@ public class ReadConfigurationTest exten
                 assertFalse(outputFile.isSkipIfExists());
 
                 {
-                    VelocityGenerator filenameGenerator
-                            = (VelocityGenerator) outputFile.getFilenameGenerator();
+                    VelocityOutlet filenameOutlet
+                            = (VelocityOutlet) outputFile.getFilenameOutlet();
                     String templateContent
-                            = filenameGenerator.getContent(controllerState);
+                            = filenameOutlet.getContent(controllerState);
                     // remove License from template by comparing only
                     // the last line
                     String templateContentLicenseRemoved
@@ -252,11 +256,11 @@ public class ReadConfigurationTest exten
                             templateContentLicenseRemoved);
                     assertEquals(
                             new QualifiedName(
-                                    "org.apache.torque.gf.configuration.filenameGenerator"),
-                            filenameGenerator.getName());
-                    assertTrue(filenameGenerator.isOptionsInContext());
-                    assertTrue(filenameGenerator.isSourceAttributesInContext());
-                    assertTrue(filenameGenerator.isVariablesInContext());
+                                    "org.apache.torque.generator.configuration.filenameOutlet"),
+                            filenameOutlet.getName());
+                    assertTrue(filenameOutlet.isOptionsInContext());
+                    assertTrue(filenameOutlet.isSourceAttributesInContext());
+                    assertTrue(filenameOutlet.isVariablesInContext());
                 }
 
                 {
@@ -285,17 +289,17 @@ public class ReadConfigurationTest exten
                         new QualifiedName("thirdOutput"));
 
                 {
-                    GeneratorReference generatorConfiguration
-                            = outputFile.getContentGenerator();
+                    OutletReference outletConfiguration
+                            = outputFile.getContentOutlet();
                     assertEquals(
                             new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.thirdGenerator"),
-                            generatorConfiguration.getName());
+                                "org.apache.torque.generator.test.readConfiguration.thirdOutlet"),
+                            outletConfiguration.getName());
                 }
 
 
                 assertEquals("outputFileName", outputFile.getFilename());
-                assertNull(outputFile.getFilenameGenerator());
+                assertNull(outputFile.getFilenameOutlet());
                 assertFalse(outputFile.isSkipIfExists());
 
                 {
@@ -320,19 +324,19 @@ public class ReadConfigurationTest exten
         }
 
         {
-            GeneratorConfiguration generatorConfiguration
-                    = unitConfiguration.getGeneratorConfiguration();
-            Map <QualifiedName, Generator> generatorMap
-                    = generatorConfiguration.getGenerators();
-            assertEquals(2, generatorMap.size());
-            {
-                JavaGenerator generator
-                        = (JavaGenerator) generatorMap.get(new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.javaGenerator"));
-                assertEquals("Foo2", generator.getFoo());
-                assertEquals("Bar2", generator.getBar());
+            OutletConfiguration outletConfiguration
+                    = unitConfiguration.getOutletConfiguration();
+            Map <QualifiedName, Outlet> outletMap
+                    = outletConfiguration.getOutlets();
+            assertEquals(2, outletMap.size());
+            {
+                JavaOutlet outlet
+                        = (JavaOutlet) outletMap.get(new QualifiedName(
+                                "org.apache.torque.generator.test.readConfiguration.javaOutlet"));
+                assertEquals("Foo2", outlet.getFoo());
+                assertEquals("Bar2", outlet.getBar());
                 Map<String, MergepointMapping> mergepointMappings
-                        = generator.getMergepointMappings();
+                        = outlet.getMergepointMappings();
                 assertEquals(3, mergepointMappings.size());
                 {
                     MergepointMapping mergepointMapping
@@ -343,10 +347,10 @@ public class ReadConfigurationTest exten
                     assertEquals(
                             new TraverseAllAction(
                                     "entry",
-                                    "org.apache.torque.gf.velocity.propertyCopy",
+                                    "org.apache.torque.generator.velocity.propertyCopy",
                                     true),
                             action);
-                    assertEquals("inputElement", generator.getInputElementName());
+                    assertEquals("inputElement", outlet.getInputElementName());
                 }
                 {
                     // mergepoint from the separate mapping
@@ -358,10 +362,10 @@ public class ReadConfigurationTest exten
                     assertEquals(
                             new ApplyAction(
                                     null,
-                                    "someGeneratorAction",
+                                    "someOutletAction",
                                     false),
                             action);
-                    assertEquals("inputElement", generator.getInputElementName());
+                    assertEquals("inputElement", outlet.getInputElementName());
                 }
                 {
                     // other mergepoint from the separate mapping
@@ -373,19 +377,19 @@ public class ReadConfigurationTest exten
                     assertEquals(
                             new ApplyAction(
                                     null,
-                                    "newGeneratorAction",
+                                    "newOutletAction",
                                     true),
                             action);
-                    assertEquals("inputElement", generator.getInputElementName());
+                    assertEquals("inputElement", outlet.getInputElementName());
                 }
             }
 
             {
-                VelocityGenerator generator
-                        = (VelocityGenerator) generatorMap.get(new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.anotherGenerator"));
+                VelocityOutlet outlet
+                        = (VelocityOutlet) outletMap.get(new QualifiedName(
+                                "org.apache.torque.generator.test.readConfiguration.anotherOutlet"));
                 String templateContent
-                        = generator.getContent(controllerState);
+                        = outlet.getContent(controllerState);
                 // remove License from template by comparing only
                 // the last line
                 String templateContentLicenseRemoved
@@ -393,11 +397,11 @@ public class ReadConfigurationTest exten
                 assertEquals(
                         "test template output",
                         templateContentLicenseRemoved);
-                assertEquals(0, generator.getMergepointMappings().size());
-                assertNull(generator.getInputElementName());
-                assertFalse(generator.isOptionsInContext());
-                assertFalse(generator.isSourceAttributesInContext());
-                assertFalse(generator.isVariablesInContext());
+                assertEquals(0, outlet.getMergepointMappings().size());
+                assertNull(outlet.getInputElementName());
+                assertFalse(outlet.isOptionsInContext());
+                assertFalse(outlet.isSourceAttributesInContext());
+                assertFalse(outlet.isVariablesInContext());
             }
         }
     }
@@ -407,14 +411,14 @@ public class ReadConfigurationTest exten
     {
         ProjectPaths projectPaths = new CustomProjectPaths(
                 null,
-                "org.apache.torque.gf.test.readfromclasspath",
+                "org.apache.torque.generator.test.readfromclasspath",
                 new File("src"),
                 new File("target"),
                 new File("generated-src"));
         UnitDescriptor unitDescriptor = new UnitDescriptor(
                 UnitDescriptor.Packaging.CLASSPATH,
                 projectPaths,
-                new DefaultTorqueGfPaths());
+                new DefaultTorqueGeneratorPaths());
         ConfigurationHandlers configurationHandlers
                 = new ConfigurationHandlers();
         UnitConfigurationReader configurationReader
@@ -433,13 +437,13 @@ public class ReadConfigurationTest exten
             assertEquals("fromClasspath", option.getValue());
         }
 
-        // check that the generators are read
+        // check that the outlets are read
         {
-            GeneratorConfiguration generatorConfiguration
-                    = unitConfiguration.getGeneratorConfiguration();
-            Map <QualifiedName, Generator> generatorMap
-                    = generatorConfiguration.getGenerators();
-            assertEquals(2, generatorMap.size());
+            OutletConfiguration outletConfiguration
+                    = unitConfiguration.getOutletConfiguration();
+            Map <QualifiedName, Outlet> outletMap
+                    = outletConfiguration.getOutlets();
+            assertEquals(2, outletMap.size());
         }
     }
 
@@ -457,7 +461,7 @@ public class ReadConfigurationTest exten
         UnitDescriptor unitDescriptor = new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGfPaths(),
+                new DefaultTorqueGeneratorPaths(),
                 null,
                 null,
                 optionConfiguration,
@@ -497,7 +501,7 @@ public class ReadConfigurationTest exten
                             new Maven2DirectoryProjectPaths(
                                     new File("src/test/configuration")));
             parentProjectPaths.setConfigurationDir(
-                    new File("src/test/configuration/src/main/torque-gf-parent"));
+                    new File("src/test/configuration/src/main/torque-gen-parent"));
             parentProjectPaths.setNewFileTargetDir(
                     new File("src/test/configuration/target/parentCustom"));
             parentProjectPaths.setModifiedFileTargetDir(
@@ -505,7 +509,7 @@ public class ReadConfigurationTest exten
             UnitDescriptor parentUnitDescriptor = new UnitDescriptor(
                     UnitDescriptor.Packaging.DIRECTORY,
                     parentProjectPaths,
-                    new DefaultTorqueGfPaths(),
+                    new DefaultTorqueGeneratorPaths(),
                     null,
                     null,
                     null,
@@ -521,7 +525,7 @@ public class ReadConfigurationTest exten
             UnitDescriptor unitDescriptor = new UnitDescriptor(
                     UnitDescriptor.Packaging.DIRECTORY,
                     projectPaths,
-                    new DefaultTorqueGfPaths(),
+                    new DefaultTorqueGeneratorPaths(),
                     parentUnitDescriptor,
                     null,
                     null,
@@ -568,7 +572,7 @@ public class ReadConfigurationTest exten
             {
                 QualifiedName optionWithNamespaceQName
                         = new QualifiedName(
-                                "org.apache.torque.gf.optionWithNamespace");
+                                "org.apache.torque.generator.optionWithNamespace");
                 Option optionWithNamespace
                         = globalScope.get(optionWithNamespaceQName);
                 assertEquals(
@@ -591,7 +595,7 @@ public class ReadConfigurationTest exten
             {
                 QualifiedName optionWithNamespaceQName
                         = new QualifiedName(
-                                "org.apache.torque.gf.parentOptionWithNamespace");
+                                "org.apache.torque.generator.parentOptionWithNamespace");
                 Option optionWithNamespace
                         = globalScope.get(optionWithNamespaceQName);
                 assertEquals(
@@ -611,26 +615,26 @@ public class ReadConfigurationTest exten
                         outputFile.getName(),
                         new QualifiedName("parentOutput"));
                 {
-                    GeneratorReference generatorConfiguration
-                            = outputFile.getContentGenerator();
+                    OutletReference outletConfiguration
+                            = outputFile.getContentOutlet();
                     assertEquals(
                             new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.testParentGenerator"),
-                            generatorConfiguration.getName());
+                                "org.apache.torque.generator.test.readConfiguration.testParentOutlet"),
+                            outletConfiguration.getName());
                 }
 
 
                 assertNull(outputFile.getFilename());
 
                 {
-                    JavaGenerator filenameGenerator
-                            = (JavaGenerator) outputFile.getFilenameGenerator();
-                    assertEquals("ParentFoo", filenameGenerator.getFoo());
-                    assertEquals("ParentBar", filenameGenerator.getBar());
+                    JavaOutlet filenameOutlet
+                            = (JavaOutlet) outputFile.getFilenameOutlet();
+                    assertEquals("ParentFoo", filenameOutlet.getFoo());
+                    assertEquals("ParentBar", filenameOutlet.getBar());
                     assertEquals(
                             new QualifiedName(
-                                    "org.apache.torque.gf.configuration.filenameGenerator"),
-                            filenameGenerator.getName());
+                                    "org.apache.torque.generator.configuration.filenameOutlet"),
+                            filenameOutlet.getName());
                 }
 
                 {
@@ -656,29 +660,29 @@ public class ReadConfigurationTest exten
                 Output outputFile = outputFiles.get(1);
                 assertEquals(
                         outputFile.getName(),
-                        new QualifiedName("org.apache.torque.gf.firstOutput"));
+                        new QualifiedName("org.apache.torque.generator.firstOutput"));
 
                 {
-                    GeneratorReference generatorConfiguration
-                            = outputFile.getContentGenerator();
+                    OutletReference outletConfiguration
+                            = outputFile.getContentOutlet();
                     assertEquals(
                             new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.javaGenerator"),
-                            generatorConfiguration.getName());
+                                "org.apache.torque.generator.test.readConfiguration.javaOutlet"),
+                            outletConfiguration.getName());
                 }
 
 
                 assertNull(outputFile.getFilename());
 
                 {
-                    JavaGenerator filenameGenerator
-                            = (JavaGenerator) outputFile.getFilenameGenerator();
-                    assertEquals("Foo", filenameGenerator.getFoo());
-                    assertEquals("Bar", filenameGenerator.getBar());
+                    JavaOutlet filenameOutlet
+                            = (JavaOutlet) outputFile.getFilenameOutlet();
+                    assertEquals("Foo", filenameOutlet.getFoo());
+                    assertEquals("Bar", filenameOutlet.getBar());
                     assertEquals(
                             new QualifiedName(
-                                    "org.apache.torque.gf.configuration.filenameGenerator"),
-                            filenameGenerator.getName());
+                                    "org.apache.torque.generator.configuration.filenameOutlet"),
+                            filenameOutlet.getName());
                 }
 
                 {
@@ -709,22 +713,22 @@ public class ReadConfigurationTest exten
                         new QualifiedName("secondOutput"));
 
                 {
-                    GeneratorReference generatorConfiguration
-                            = outputFile.getContentGenerator();
+                    OutletReference outletConfiguration
+                            = outputFile.getContentOutlet();
                     assertEquals(
                             new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.anotherGenerator"),
-                            generatorConfiguration.getName());
+                                "org.apache.torque.generator.test.readConfiguration.anotherOutlet"),
+                            outletConfiguration.getName());
                 }
 
 
                 assertNull(outputFile.getFilename());
 
                 {
-                    VelocityGenerator filenameGenerator
-                            = (VelocityGenerator) outputFile.getFilenameGenerator();
+                    VelocityOutlet filenameOutlet
+                            = (VelocityOutlet) outputFile.getFilenameOutlet();
                     String templateContent
-                            = filenameGenerator.getContent(controllerState);
+                            = filenameOutlet.getContent(controllerState);
                     // remove License from template by comparing only
                     // the last line
                     String templateContentLicenseRemoved
@@ -734,8 +738,8 @@ public class ReadConfigurationTest exten
                             templateContentLicenseRemoved);
                     assertEquals(
                             new QualifiedName(
-                                    "org.apache.torque.gf.configuration.filenameGenerator"),
-                            filenameGenerator.getName());
+                                    "org.apache.torque.generator.configuration.filenameOutlet"),
+                            filenameOutlet.getName());
                 }
 
                 {
@@ -764,16 +768,16 @@ public class ReadConfigurationTest exten
                         new QualifiedName("thirdOutput"));
 
                 {
-                    GeneratorReference generatorConfiguration
-                            = outputFile.getContentGenerator();
+                    OutletReference outletConfiguration
+                            = outputFile.getContentOutlet();
                     assertEquals(
                             new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.thirdGenerator"),
-                            generatorConfiguration.getName());
+                                "org.apache.torque.generator.test.readConfiguration.thirdOutlet"),
+                            outletConfiguration.getName());
                 }
 
                 assertEquals("outputFileName", outputFile.getFilename());
-                assertNull(outputFile.getFilenameGenerator());
+                assertNull(outputFile.getFilenameOutlet());
                 {
                     Fileset sourceFileset = new Fileset(
                             projectPaths.getDefaultSourcePath(),
@@ -796,19 +800,19 @@ public class ReadConfigurationTest exten
         }
 
         {
-            GeneratorConfiguration generatorConfiguration
-                    = unitConfiguration.getGeneratorConfiguration();
-            Map <QualifiedName, Generator> generatorMap
-                    = generatorConfiguration.getGenerators();
-            assertEquals(3, generatorMap.size());
-            {
-                JavaGenerator generator
-                        = (JavaGenerator) generatorMap.get(new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.javaGenerator"));
-                assertEquals("Foo2", generator.getFoo());
-                assertEquals("Bar2", generator.getBar());
+            OutletConfiguration outletConfiguration
+                    = unitConfiguration.getOutletConfiguration();
+            Map <QualifiedName, Outlet> outletMap
+                    = outletConfiguration.getOutlets();
+            assertEquals(3, outletMap.size());
+            {
+                JavaOutlet outlet
+                        = (JavaOutlet) outletMap.get(new QualifiedName(
+                                "org.apache.torque.generator.test.readConfiguration.javaOutlet"));
+                assertEquals("Foo2", outlet.getFoo());
+                assertEquals("Bar2", outlet.getBar());
                 Map<String,MergepointMapping> mergepointMappings
-                        = generator.getMergepointMappings();
+                        = outlet.getMergepointMappings();
                 assertEquals(3, mergepointMappings.size());
                 {
                     MergepointMapping mergepointMapping 
@@ -819,10 +823,10 @@ public class ReadConfigurationTest exten
                     assertEquals(
                             new TraverseAllAction(
                                     "entry",
-                                    "org.apache.torque.gf.velocity.propertyCopy",
+                                    "org.apache.torque.generator.velocity.propertyCopy",
                                     true),
                             action);
-                    assertEquals("inputElement", generator.getInputElementName());                    
+                    assertEquals("inputElement", outlet.getInputElementName());                    
                 }
                 {
                     // mergepoint from the separate mapping in child
@@ -834,10 +838,10 @@ public class ReadConfigurationTest exten
                     assertEquals(
                             new ApplyAction(
                                     null,
-                                    "someGeneratorAction",
+                                    "someOutletAction",
                                     false),
                             action);
-                    assertEquals("inputElement", generator.getInputElementName());
+                    assertEquals("inputElement", outlet.getInputElementName());
                 }
                 {
                     // other mergepoint from the separate mapping in child
@@ -849,19 +853,19 @@ public class ReadConfigurationTest exten
                     assertEquals(
                             new ApplyAction(
                                     null,
-                                    "newGeneratorAction",
+                                    "newOutletAction",
                                     true),
                             action);
-                    assertEquals("inputElement", generator.getInputElementName());
+                    assertEquals("inputElement", outlet.getInputElementName());
                 }
             }
 
             {
-                VelocityGenerator generator
-                        = (VelocityGenerator) generatorMap.get(new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.anotherGenerator"));
+                VelocityOutlet outlet
+                        = (VelocityOutlet) outletMap.get(new QualifiedName(
+                                "org.apache.torque.generator.test.readConfiguration.anotherOutlet"));
                 String templateContent
-                        = generator.getContent(controllerState);
+                        = outlet.getContent(controllerState);
                 // remove License from template by comparing only
                 // the last line
                 String templateContentLicenseRemoved
@@ -869,14 +873,14 @@ public class ReadConfigurationTest exten
                 assertEquals(
                         "test template output",
                         templateContentLicenseRemoved);
-                assertEquals(0, generator.getMergepointMappings().size());
+                assertEquals(0, outlet.getMergepointMappings().size());
             }
             {
-                VelocityGenerator generator
-                        = (VelocityGenerator) generatorMap.get(new QualifiedName(
-                                "org.apache.torque.gf.test.readConfiguration.parentGenerator"));
+                VelocityOutlet outlet
+                        = (VelocityOutlet) outletMap.get(new QualifiedName(
+                                "org.apache.torque.generator.test.readConfiguration.parentOutlet"));
                 String templateContent
-                        = generator.getContent(controllerState);
+                        = outlet.getContent(controllerState);
                 // remove License from template by comparing only
                 // the last line
                 String templateContentLicenseRemoved
@@ -884,7 +888,7 @@ public class ReadConfigurationTest exten
                 assertEquals(
                         "parent test template output",
                         templateContentLicenseRemoved);
-                assertEquals(0, generator.getMergepointMappings().size());
+                assertEquals(0, outlet.getMergepointMappings().size());
             }
         }
     }

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java (from r918869, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationTest.java&r1=918869&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.generator;
+package org.apache.torque.generator.configuration.outlet;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,123 +24,124 @@ import static org.junit.Assert.assertEqu
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.mergepoint.MergepointMapping;
-import org.apache.torque.gf.control.action.ApplyAction;
-import org.apache.torque.gf.generator.Generator;
-import org.apache.torque.gf.generator.java.PackageToPathGenerator;
-import org.apache.torque.gf.java.JavaGenerator;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.mergepoint.MergepointMapping;
+import org.apache.torque.generator.configuration.outlet.OutletConfiguration;
+import org.apache.torque.generator.control.action.ApplyAction;
+import org.apache.torque.generator.java.JavaOutlet;
+import org.apache.torque.generator.outlet.Outlet;
+import org.apache.torque.generator.outlet.java.PackageToPathOutlet;
+import org.apache.torque.generator.qname.QualifiedName;
 import org.junit.Test;
 
-public class GeneratorConfigurationTest
+public class OutletConfigurationTest
 {
-    private GeneratorConfiguration generatorConfiguration;
+    private OutletConfiguration outletConfiguration;
     
     
     /**
-     * Tests that getGenerators returns the correct result.
+     * Tests that getOutlets returns the correct result.
      * 
      * @throws ConfigurationException if an error occurs.
      */
     @Test
-    public void testGetGenerators() throws ConfigurationException
+    public void testGetOutlets() throws ConfigurationException
     {
-        List<Generator> generators = new ArrayList<Generator>();
-        generators.add(new JavaGenerator(
-                new QualifiedName("test.generator.0")));
-        generators.add(new PackageToPathGenerator(
-                new QualifiedName("test.generator.1")));
+        List<Outlet> outlets = new ArrayList<Outlet>();
+        outlets.add(new JavaOutlet(
+                new QualifiedName("test.outlet.0")));
+        outlets.add(new PackageToPathOutlet(
+                new QualifiedName("test.outlet.1")));
         List<MergepointMapping> mergepointMappings 
                 = new ArrayList<MergepointMapping>();
         
-        GeneratorConfiguration generatorConfiguration
-                = new GeneratorConfiguration(generators, mergepointMappings);
-        generatorConfiguration.resolveMergepointMappings();
+        OutletConfiguration outletConfiguration
+                = new OutletConfiguration(outlets, mergepointMappings);
+        outletConfiguration.resolveMergepointMappings();
         
-        assertEquals(2, generatorConfiguration.getGenerators().size());
+        assertEquals(2, outletConfiguration.getOutlets().size());
         assertEquals(
-                generators.get(0), 
-                generatorConfiguration.getGenerators().get(
-                        new QualifiedName("test.generator.0")));
+                outlets.get(0), 
+                outletConfiguration.getOutlets().get(
+                        new QualifiedName("test.outlet.0")));
         assertEquals(
-                generators.get(1), 
-                generatorConfiguration.getGenerators().get(
-                        new QualifiedName("test.generator.1")));
+                outlets.get(1), 
+                outletConfiguration.getOutlets().get(
+                        new QualifiedName("test.outlet.1")));
     }
 
     /**
-     * Tests that one cannot add a generator with the same name twice
+     * Tests that one cannot add a outlet with the same name twice
      * 
-     * @throws ConfigurationException if GeneratorConfiguration cannot be
+     * @throws ConfigurationException if OutletConfiguration cannot be
      *         created,
      */
     @Test(expected = ConfigurationException.class)
-    public void testConstructorWithSameGeneratorName() 
+    public void testConstructorWithSameOutletName() 
             throws ConfigurationException
     {
-        List<Generator> generators = new ArrayList<Generator>();
-        generators.add(new JavaGenerator(
+        List<Outlet> outlets = new ArrayList<Outlet>();
+        outlets.add(new JavaOutlet(
                 new QualifiedName("sameName")));
-        generators.add(new PackageToPathGenerator(
+        outlets.add(new PackageToPathOutlet(
                 new QualifiedName("sameName")));
         List<MergepointMapping> mergepointMappings 
                 = new ArrayList<MergepointMapping>();
 
-        new GeneratorConfiguration(generators, mergepointMappings);
+        new OutletConfiguration(outlets, mergepointMappings);
     }
 
     /**
      * Checks that resolveMergepointMappings adds the mergepoint
-     * to the correct generator.
+     * to the correct outlet.
      */
     @Test
     public void testResolveMergepointMappings() throws ConfigurationException
     {
-        List<Generator> generators = new ArrayList<Generator>();
-        generators.add(new JavaGenerator(
-                new QualifiedName("test.generator")));
-        generators.add(new PackageToPathGenerator(
-                new QualifiedName("test.generator.2")));
+        List<Outlet> outlets = new ArrayList<Outlet>();
+        outlets.add(new JavaOutlet(
+                new QualifiedName("test.outlet")));
+        outlets.add(new PackageToPathOutlet(
+                new QualifiedName("test.outlet.2")));
         List<MergepointMapping> mergepointMappings 
                 = new ArrayList<MergepointMapping>();
         mergepointMappings.add(
-                new MergepointMapping("test.generator.testMergepoint"));
+                new MergepointMapping("test.outlet.testMergepoint"));
         mergepointMappings.get(0).addAction(
-                new ApplyAction(".", "test.generator.2", false));
+                new ApplyAction(".", "test.outlet.2", false));
         
-        GeneratorConfiguration generatorConfiguration
-                = new GeneratorConfiguration(generators, mergepointMappings);
-        generatorConfiguration.resolveMergepointMappings();
-        
-        Generator generator = generatorConfiguration.getGenerator(
-                new QualifiedName("test.generator"));
-        assertEquals(1, generator.getMergepointMappings().size());
+        OutletConfiguration outletConfiguration
+                = new OutletConfiguration(outlets, mergepointMappings);
+        outletConfiguration.resolveMergepointMappings();
+        
+        Outlet outlet = outletConfiguration.getOutlet(
+                new QualifiedName("test.outlet"));
+        assertEquals(1, outlet.getMergepointMappings().size());
         assertEquals(
                 1, 
-                generator.getMergepointMapping("testMergepoint")
+                outlet.getMergepointMapping("testMergepoint")
                     .getActions().size());
     }
 
     /**
      * Checks that resolveMergepointMappings throws an error if the 
-     * generator name cannot be resolved.
+     * outlet name cannot be resolved.
      */
     @Test(expected = ConfigurationException.class)
-    public void testResolveMergepointMappingsNotExistingGenerator()
+    public void testResolveMergepointMappingsNotExistingOutlet()
             throws ConfigurationException
     {
-        List<Generator> generators = new ArrayList<Generator>();
-        generators.add(new JavaGenerator(
-                new QualifiedName("test.generator")));
+        List<Outlet> outlets = new ArrayList<Outlet>();
+        outlets.add(new JavaOutlet(
+                new QualifiedName("test.outlet")));
         List<MergepointMapping> mergepointMappings 
                 = new ArrayList<MergepointMapping>();
         mergepointMappings.add(
-                new MergepointMapping("not.existing.generator.testMergepoint"));
+                new MergepointMapping("not.existing.outlet.testMergepoint"));
         
-        GeneratorConfiguration generatorConfiguration
-                = new GeneratorConfiguration(generators, mergepointMappings);
-        generatorConfiguration.resolveMergepointMappings();
+        OutletConfiguration outletConfiguration
+                = new OutletConfiguration(outlets, mergepointMappings);
+        outletConfiguration.resolveMergepointMappings();
     }
 
     /**
@@ -151,16 +152,16 @@ public class GeneratorConfigurationTest
     public void testResolveMergepointMappingsNoNamespace()
             throws ConfigurationException
     {
-        List<Generator> generators = new ArrayList<Generator>();
-        generators.add(new JavaGenerator(
-                new QualifiedName("test.generator")));
+        List<Outlet> outlets = new ArrayList<Outlet>();
+        outlets.add(new JavaOutlet(
+                new QualifiedName("test.outlet")));
         List<MergepointMapping> mergepointMappings 
                 = new ArrayList<MergepointMapping>();
         mergepointMappings.add(
                 new MergepointMapping("testMergepoint"));
         
-        GeneratorConfiguration generatorConfiguration
-                = new GeneratorConfiguration(generators, mergepointMappings);
-        generatorConfiguration.resolveMergepointMappings();
+        OutletConfiguration outletConfiguration
+                = new OutletConfiguration(outlets, mergepointMappings);
+        outletConfiguration.resolveMergepointMappings();
     }
 }

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java (from r919745, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/control/DeeplyNestedMergepointsTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/control/DeeplyNestedMergepointsTest.java&r1=919745&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/control/DeeplyNestedMergepointsTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control;
+package org.apache.torque.generator.control;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,11 +28,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.torque.gf.BaseTest;
-import org.apache.torque.gf.configuration.UnitDescriptor;
-import org.apache.torque.gf.configuration.paths.CustomProjectPaths;
-import org.apache.torque.gf.configuration.paths.DefaultTorqueGfPaths;
-import org.apache.torque.gf.configuration.paths.Maven2DirectoryProjectPaths;
+import org.apache.torque.generator.BaseTest;
+import org.apache.torque.generator.configuration.UnitDescriptor;
+import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
+import org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
+import org.apache.torque.generator.configuration.paths.Maven2DirectoryProjectPaths;
+import org.apache.torque.generator.control.Controller;
 import org.junit.Test;
 
 /**
@@ -55,7 +56,7 @@ public class DeeplyNestedMergepointsTest
         unitDescriptors.add(new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGfPaths()));
+                new DefaultTorqueGeneratorPaths()));
         controller.run(unitDescriptors);
 
         assertTrue(targetDir.exists());

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java (from r919745, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/control/PropertyToJavaGenerationTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/control/PropertyToJavaGenerationTest.java&r1=919745&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/control/PropertyToJavaGenerationTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control;
+package org.apache.torque.generator.control;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,11 +26,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.torque.gf.BaseTest;
-import org.apache.torque.gf.configuration.UnitDescriptor;
-import org.apache.torque.gf.configuration.paths.CustomProjectPaths;
-import org.apache.torque.gf.configuration.paths.DefaultTorqueGfPaths;
-import org.apache.torque.gf.configuration.paths.Maven2DirectoryProjectPaths;
+import org.apache.torque.generator.BaseTest;
+import org.apache.torque.generator.configuration.UnitDescriptor;
+import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
+import org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
+import org.apache.torque.generator.configuration.paths.Maven2DirectoryProjectPaths;
+import org.apache.torque.generator.control.Controller;
 import org.junit.Test;
 
 public class PropertyToJavaGenerationTest extends BaseTest
@@ -49,7 +50,7 @@ public class PropertyToJavaGenerationTes
         unitDescriptors.add(new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGfPaths()));
+                new DefaultTorqueGeneratorPaths()));
         controller.run(unitDescriptors);
         // TODO: check outcome against reference file
         assertTrue(targetDir.exists());

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control;
+package org.apache.torque.generator.control;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,10 +26,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.torque.gf.BaseTest;
-import org.apache.torque.gf.configuration.UnitDescriptor;
-import org.apache.torque.gf.configuration.paths.DefaultTorqueGfPaths;
-import org.apache.torque.gf.configuration.paths.Maven2JarProjectPaths;
+import org.apache.torque.generator.BaseTest;
+import org.apache.torque.generator.configuration.UnitDescriptor;
+import org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
+import org.apache.torque.generator.configuration.paths.Maven2JarProjectPaths;
+import org.apache.torque.generator.control.Controller;
 import org.junit.Test;
 
 
@@ -47,7 +48,7 @@ public class PropertyToJavaJarGeneration
                 new Maven2JarProjectPaths(
                         new File("target/test/propertyToJavaJar"),
                         "propertyToJava.jar"),
-                new DefaultTorqueGfPaths()));
+                new DefaultTorqueGeneratorPaths()));
         controller.run(unitDescriptors);
         assertTrue(target.exists());
     }

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control;
+package org.apache.torque.generator.control;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,11 +21,13 @@ package org.apache.torque.gf.control;
 
 import static org.junit.Assert.assertEquals;
 
-import org.apache.torque.gf.BaseTest;
-import org.apache.torque.gf.configuration.UnitConfiguration;
-import org.apache.torque.gf.option.Option;
-import org.apache.torque.gf.option.OptionImpl;
-import org.apache.torque.gf.option.Options;
+import org.apache.torque.generator.BaseTest;
+import org.apache.torque.generator.configuration.UnitConfiguration;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.control.TokenReplacer;
+import org.apache.torque.generator.option.Option;
+import org.apache.torque.generator.option.OptionImpl;
+import org.apache.torque.generator.option.Options;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -45,7 +47,7 @@ public class TokenReplacerTest extends B
         }
         {
             Option optionWithNamespace = new OptionImpl(
-                    "org.apache.torque.gf.optionWithNamespace",
+                    "org.apache.torque.generator.optionWithNamespace",
                     "ValueWithNamespace");
             options.setGlobalOption(optionWithNamespace);
         }
@@ -83,7 +85,7 @@ public class TokenReplacerTest extends B
     public void testTokenWithNamespace() throws Exception
     {
         String input
-            = "Prefix${option:org.apache.torque.gf.optionWithNamespace}Postfix";
+            = "Prefix${option:org.apache.torque.generator.optionWithNamespace}Postfix";
         String output = tokenReplacer.process(input);
         assertEquals("PrefixValueWithNamespacePostfix", output);
     }

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStarted.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStarted.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStarted.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStarted.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.example.gettingstarted;
+package org.apache.torque.generator.example.gettingstarted;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,10 +24,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.torque.gf.configuration.UnitDescriptor;
-import org.apache.torque.gf.configuration.paths.DefaultTorqueGfPaths;
-import org.apache.torque.gf.configuration.paths.Maven2DirectoryProjectPaths;
-import org.apache.torque.gf.control.Controller;
+import org.apache.torque.generator.configuration.UnitDescriptor;
+import org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
+import org.apache.torque.generator.configuration.paths.Maven2DirectoryProjectPaths;
+import org.apache.torque.generator.control.Controller;
 
 public class GettingStarted
 {
@@ -41,7 +41,7 @@ public class GettingStarted
                 UnitDescriptor.Packaging.DIRECTORY,
                 new Maven2DirectoryProjectPaths(
                         new File(".")),
-                new DefaultTorqueGfPaths()));
+                new DefaultTorqueGeneratorPaths()));
         controller.run(unitDescriptors);
     }
 }

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java (from r919745, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/example/gettingstarted/GettingStartedTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/example/gettingstarted/GettingStartedTest.java&r1=919745&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/example/gettingstarted/GettingStartedTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.example.gettingstarted;
+package org.apache.torque.generator.example.gettingstarted;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,12 +26,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.torque.gf.BaseTest;
-import org.apache.torque.gf.configuration.UnitDescriptor;
-import org.apache.torque.gf.configuration.paths.CustomProjectPaths;
-import org.apache.torque.gf.configuration.paths.DefaultTorqueGfPaths;
-import org.apache.torque.gf.configuration.paths.Maven2DirectoryProjectPaths;
-import org.apache.torque.gf.control.Controller;
+import org.apache.torque.generator.BaseTest;
+import org.apache.torque.generator.configuration.UnitDescriptor;
+import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
+import org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
+import org.apache.torque.generator.configuration.paths.Maven2DirectoryProjectPaths;
+import org.apache.torque.generator.control.Controller;
 import org.junit.Test;
 
 public class GettingStartedTest extends BaseTest
@@ -50,15 +50,15 @@ public class GettingStartedTest extends 
         unitDescriptors.add(new UnitDescriptor(
                 UnitDescriptor.Packaging.DIRECTORY,
                 projectPaths,
-                new DefaultTorqueGfPaths()));
+                new DefaultTorqueGeneratorPaths()));
         controller.run(unitDescriptors);
         assertTrue(targetDir.exists());
         File generatedJavaFile = new File(
                 targetDir,
-                "org/apache/torque/gf/example/gettingstarted/PropertyKeys.java");
+                "org/apache/torque/generator/example/gettingstarted/PropertyKeys.java");
         assertTrue(generatedJavaFile.exists());
         File expectedJavaFile = new File(
-                "src/test/resources/org/apache/torque/gf/example/gettingstarted/PropertyKeys.java");
+                "src/test/resources/org/apache/torque/generator/example/gettingstarted/PropertyKeys.java");
         junitx.framework.FileAssert.assertEquals(
                 expectedJavaFile,
                 generatedJavaFile);

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.file;
+package org.apache.torque.generator.file;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,6 +28,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.torque.generator.file.Fileset;
 import org.junit.Test;
 
 public class FilesetTest

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaOutlet.java (from r916199, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/java/JavaGenerator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaOutlet.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaOutlet.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/java/JavaGenerator.java&r1=916199&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/java/JavaGenerator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaOutlet.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.java;
+package org.apache.torque.generator.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,12 +21,12 @@ package org.apache.torque.gf.java;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.generator.GeneratorImpl;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.outlet.OutletImpl;
+import org.apache.torque.generator.qname.QualifiedName;
 
-public class JavaGenerator extends GeneratorImpl
+public class JavaOutlet extends OutletImpl
 {
     @Override
     public int hashCode()
@@ -57,7 +57,7 @@ public class JavaGenerator extends Gener
         {
             return false;
         }
-        JavaGenerator other = (JavaGenerator) obj;
+        JavaOutlet other = (JavaOutlet) obj;
         if (bar == null)
         {
             if (other.bar != null)
@@ -95,13 +95,13 @@ public class JavaGenerator extends Gener
         return true;
     }
 
-    private static Log log = LogFactory.getLog(JavaGenerator.class);
+    private static Log log = LogFactory.getLog(JavaOutlet.class);
 
     private String foo;
 
     private String bar;
 
-    public JavaGenerator(QualifiedName name)
+    public JavaOutlet(QualifiedName name)
     {
         super(name);
     }
@@ -110,7 +110,7 @@ public class JavaGenerator extends Gener
     public String execute(ControllerState controllerState)
             throws GeneratorException
     {
-        return "Test Generator output";
+        return "Test Outlet output";
     }
 
     public void setFoo(String foo)

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutletTest.java (from r916199, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/generator/java/ModifySourcenameGeneratorTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutletTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutletTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/generator/java/ModifySourcenameGeneratorTest.java&r1=916199&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/generator/java/ModifySourcenameGeneratorTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutletTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,23 +23,24 @@ import static org.junit.Assert.assertEqu
 
 import java.io.File;
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.outlet.java.ModifySourcenameOutlet;
+import org.apache.torque.generator.qname.QualifiedName;
 import org.junit.Before;
 import org.junit.Test;
 
-public class ModifySourcenameGeneratorTest
+public class ModifySourcenameOutletTest
 {
-    private ModifySourcenameGenerator generator;
+    private ModifySourcenameOutlet outlet;
 
     private ControllerState controllerState;
 
     @Before
     public void setUp()
     {
-        this.generator = new ModifySourcenameGenerator(new QualifiedName(
-                "org.apache.torque.gf.modifySourcenameGenerator"));
+        this.outlet = new ModifySourcenameOutlet(new QualifiedName(
+                "org.apache.torque.generator.modifySourcenameOutlet"));
         controllerState = new ControllerState();
         controllerState.setSourceFile(
                 new File("src/test/some-test-file-name.someTestExtension"));
@@ -48,43 +49,43 @@ public class ModifySourcenameGeneratorTe
     @Test
     public void testDefault() throws GeneratorException
     {
-        String result = generator.execute(controllerState);
+        String result = outlet.execute(controllerState);
         assertEquals("some-test-file-name.someTestExtension", result);
     }
 
     @Test
     public void testAll() throws GeneratorException
     {
-        generator.setDiscardFrom("Ext");
-        generator.setDiscardTo("me-");
-        generator.setPrefix("prefix-");
-        generator.setSuffix("-suffix");
-        String result = generator.execute(controllerState);
+        outlet.setDiscardFrom("Ext");
+        outlet.setDiscardTo("me-");
+        outlet.setPrefix("prefix-");
+        outlet.setSuffix("-suffix");
+        String result = outlet.execute(controllerState);
         assertEquals("prefix-test-file-name.someTest-suffix", result);
     }
 
     @Test
     public void testDiscardFrom() throws GeneratorException
     {
-        generator.setDiscardFrom("-");
-        String result = generator.execute(controllerState);
+        outlet.setDiscardFrom("-");
+        String result = outlet.execute(controllerState);
         assertEquals("some", result);
     }
 
     @Test
     public void testDiscardTo() throws GeneratorException
     {
-        generator.setDiscardTo("-");
-        String result = generator.execute(controllerState);
+        outlet.setDiscardTo("-");
+        String result = outlet.execute(controllerState);
         assertEquals("name.someTestExtension", result);
     }
 
     @Test
     public void testOverlappingFromAndTo() throws GeneratorException
     {
-        generator.setDiscardFrom("-");
-        generator.setDiscardTo("-");
-        String result = generator.execute(controllerState);
+        outlet.setDiscardFrom("-");
+        outlet.setDiscardTo("-");
+        String result = outlet.execute(controllerState);
         assertEquals("", result);
     }
 
@@ -92,7 +93,7 @@ public class ModifySourcenameGeneratorTe
     public void testSourceFilenameNull() throws GeneratorException
     {
         controllerState.setSourceFile(null);
-        String result = generator.execute(controllerState);
+        String result = outlet.execute(controllerState);
         assertEquals("", result);
     }
 }

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/NewlineOutletTest.java (from r916199, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/generator/java/NewlineGeneratorTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/NewlineOutletTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/NewlineOutletTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/generator/java/NewlineGeneratorTest.java&r1=916199&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/generator/java/NewlineGeneratorTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/NewlineOutletTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,53 +21,54 @@ package org.apache.torque.gf.generator.j
 
 import static org.junit.Assert.assertEquals;
 
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.outlet.java.NewlineOutlet;
+import org.apache.torque.generator.qname.QualifiedName;
 import org.junit.Before;
 import org.junit.Test;
 
-public class NewlineGeneratorTest
+public class NewlineOutletTest
 {
-    private NewlineGenerator newlineGenerator;
+    private NewlineOutlet newlineOutlet;
 
     @Before
     public void setUp()
     {
-        this.newlineGenerator = new NewlineGenerator(new QualifiedName(
-                "org.apache.torque.gf.newlineGenerator"));
+        this.newlineOutlet = new NewlineOutlet(new QualifiedName(
+                "org.apache.torque.generator.newlineOutlet"));
     }
 
     @Test
     public void testDefault() throws GeneratorException {
-        String result = newlineGenerator.execute(null);
+        String result = newlineOutlet.execute(null);
         assertEquals("\n", result);
     }
 
     @Test
     public void testWindowsStyle() throws GeneratorException {
-        newlineGenerator.setWindowsStyle(true);
-        String result = newlineGenerator.execute(null);
+        newlineOutlet.setWindowsStyle(true);
+        String result = newlineOutlet.execute(null);
         assertEquals("\r\n", result);
     }
 
     @Test()
     public void testCountZero() throws GeneratorException {
-        newlineGenerator.setCount(0);
-        String result = newlineGenerator.execute(null);
+        newlineOutlet.setCount(0);
+        String result = newlineOutlet.execute(null);
         assertEquals("", result);
     }
 
     @Test(expected = GeneratorException.class)
     public void testCountLessThanZero() throws GeneratorException {
-        newlineGenerator.setCount(-1);
-        String result = newlineGenerator.execute(null);
+        newlineOutlet.setCount(-1);
+        String result = newlineOutlet.execute(null);
         assertEquals("\n", result);
     }
 
     @Test()
     public void testCountFive() throws GeneratorException {
-        newlineGenerator.setCount(5);
-        String result = newlineGenerator.execute(null);
+        newlineOutlet.setCount(5);
+        String result = newlineOutlet.execute(null);
         assertEquals("\n\n\n\n\n", result);
     }
 }

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.processor.string;
+package org.apache.torque.generator.processor.string;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,7 @@ package org.apache.torque.gf.processor.s
 import static org.junit.Assert.assertEquals;
 
 
+import org.apache.torque.generator.processor.string.Camelbacker;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/ConstantNameCreatorTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/ConstantNameCreatorTest.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/ConstantNameCreatorTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/ConstantNameCreatorTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.processor.string;
+package org.apache.torque.generator.processor.string;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,7 @@ package org.apache.torque.gf.processor.s
 import static org.junit.Assert.assertEquals;
 
 
+import org.apache.torque.generator.processor.string.ConstantNameCreator;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.qname;
+package org.apache.torque.generator.qname;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,7 @@ package org.apache.torque.gf.qname;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.torque.generator.qname.Namespace;
 import org.junit.Test;
 
 public class NamespaceTest

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.qname;
+package org.apache.torque.generator.qname;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,8 @@ package org.apache.torque.gf.qname;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import org.apache.torque.generator.qname.QualifiedName;
+import org.apache.torque.generator.qname.QualifiedNameMap;
 import org.junit.Test;
 
 public class QualifiedNameMapTest

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.qname;
+package org.apache.torque.generator.qname;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,6 +26,8 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.torque.generator.qname.Namespace;
+import org.apache.torque.generator.qname.QualifiedName;
 import org.junit.Test;
 
 public class QualifiedNameTest

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/RichSourceElementImplTest.java (from r930722, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/RichSourceElementImplTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/RichSourceElementImplTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/RichSourceElementImplTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/RichSourceElementImplTest.java&r1=930722&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/RichSourceElementImplTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/RichSourceElementImplTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source;
+package org.apache.torque.generator.source;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -30,9 +30,12 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.torque.gf.configuration.paths.Maven2DirectoryProjectPaths;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.source.properties.PropertiesSourceType;
+import org.apache.torque.generator.configuration.paths.Maven2DirectoryProjectPaths;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.source.FileSource;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.TransformerDefinition;
+import org.apache.torque.generator.source.properties.PropertiesSourceType;
 import org.junit.Before;
 import org.junit.Test;
 

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/SourcePathTest.java (from r930722, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/SourcePathTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/SourcePathTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/SourcePathTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/SourcePathTest.java&r1=930722&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/SourcePathTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/SourcePathTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source;
+package org.apache.torque.generator.source;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,9 @@ import static org.junit.Assert.assertEqu
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.torque.gf.generator.GeneratorException;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.SourcePath;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/properties/PropertiesParserTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/properties/PropertiesParserTest.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/properties/PropertiesParserTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/properties/PropertiesParserTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.properties;
+package org.apache.torque.generator.source.properties;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,11 +24,12 @@ import static org.junit.Assert.assertEqu
 import java.io.File;
 import java.util.ArrayList;
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.source.FileSource;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourceException;
-import org.apache.torque.gf.source.TransformerDefinition;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.source.FileSource;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.SourceException;
+import org.apache.torque.generator.source.TransformerDefinition;
+import org.apache.torque.generator.source.properties.PropertiesSourceType;
 import org.junit.Test;
 
 public class PropertiesParserTest
@@ -38,7 +39,7 @@ public class PropertiesParserTest
             throws ConfigurationException, SourceException
     {
         File propertiesFile
-            = new File("src/test/resources/org/apache/torque/gf/source/properties/propertiesParserTest.properties");
+            = new File("src/test/resources/org/apache/torque/generator/source/properties/propertiesParserTest.properties");
         FileSource fileSource
                 = new FileSource(
                         new PropertiesSourceType(),

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/AttributeTransformerTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/AttributeTransformerTest.java?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/AttributeTransformerTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/AttributeTransformerTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.transform;
+package org.apache.torque.generator.source.transform;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,8 @@ import static org.junit.Assert.assertEqu
 import java.io.StringReader;
 import java.util.List;
 
+import org.apache.torque.generator.source.transform.AttributeTransformer;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.junit.Before;
 import org.junit.Test;
 

Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformerTest.java (from r930722, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/transform/BeanPropertyMethodNameTransformerTest.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformerTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformerTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/transform/BeanPropertyMethodNameTransformerTest.java&r1=930722&r2=944867&rev=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/transform/BeanPropertyMethodNameTransformerTest.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformerTest.java Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.transform;
+package org.apache.torque.generator.source.transform;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,9 @@ package org.apache.torque.gf.source.tran
 
 import static org.junit.Assert.assertEquals;
 
-import org.apache.torque.gf.source.SourceElement;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.transform.BeanPropertyMethodNameTransformer;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 import org.junit.Before;
 import org.junit.Test;
 



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