db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r944862 [1/6] - in /db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator: ./ configuration/ configuration/controller/ configuration/generator/ configuration/mergepoint/ configuration/option/ configuration/outle...
Date Sun, 16 May 2010 15:35:33 GMT
Author: tfischer
Date: Sun May 16 15:35:27 2010
New Revision: 944862

URL: http://svn.apache.org/viewvc?rev=944862&view=rev
Log:
Refactoring in the generator (Step 1):
"Generator" (interface name of output-producing class and config xml
element name) -> Outlet
"$torqueGf" (velocity variable name) -> "$torqueGen"
gf (package name) -> "generator"

Added:
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/GeneratorException.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/GeneratorException.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ClassHelper.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ClasspathConfigurationProvider.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/Configuration.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationEntityResolver.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationException.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationException.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationHandlers.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationProvider.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/DirectoryConfigurationProvider.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/JarConfigurationProvider.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/GeneratorTypes.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/SaxHelper.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java
      - copied, changed from r916202, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitConfiguration.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java
      - copied, changed from r916202, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitConfigurationReader.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java
      - copied, changed from r916202, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitDescriptor.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/XMLConstants.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/GeneratorReference.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/GeneratorReferenceSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/SourceSaxHandler.java
      - copied, changed from r916202, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/SourceSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/generator/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/mergepoint/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/option/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java
      - copied, changed from r931293, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/option/OptionsConfigurationBase.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/JavaGeneratorSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandlerFactory.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/JavaGeneratorSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java
      - copied, changed from r918869, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfiguration.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTags.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationTags.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationXmlParser.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandlerFactory.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/VelocityGeneratorSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/VelocityGeneratorSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/package.html
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/paths/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/paths/DefaultTorqueGfPaths.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/TorqueGeneratorPaths.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/paths/TorqueGfPaths.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java
      - copied, changed from r930722, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/Controller.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerException.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/ControllerException.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/ControllerState.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/TokenReplacer.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/action/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/package.html
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/file/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java
      - copied, changed from r930712, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/file/Fileset.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/option/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Mergepoint.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/Mergepoint.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Outlet.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/Generator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/GeneratorImpl.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java
      - copied, changed from r918870, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/CamelbackGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ConstantNameOutlet.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/ConstantNameGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavaFilenameOutlet.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/JavaFilenameGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutlet.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/ModifySourcenameGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/NewlineOutlet.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/NewlineGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletUtils.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/GeneratorUtils.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletWithoutMergepoints.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/GeneratorWithoutMergepoints.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/PackageToPathOutlet.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/PackageToPathGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/StringInputOutlet.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/StringInputGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/package.html
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/processor/string/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/qname/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/FileSource.java
      - copied, changed from r930713, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSource.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/FileSourcesImpl.java
      - copied, changed from r917533, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSourcesImpl.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SimpleSourcesImpl.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SimpleSourcesImpl.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/Source.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Source.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceAttributeName.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceAttributeName.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java
      - copied, changed from r930722, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceElement.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElementName.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceElementName.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceException.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceException.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceImpl.java
      - copied, changed from r930714, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceImpl.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceParser.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceParser.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourcePath.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceType.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceType.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/Sources.java
      - copied, changed from r917533, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Sources.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/TransformerDefinition.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/TransformerDefinition.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/filter/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/package.html
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/properties/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/PropertiesSourceParser.java
      - copied, changed from r930722, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/properties/PropertiesSourceParser.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/transform/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/xml/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceSaxHandler.java
      - copied, changed from r930722, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/xml/XmlSourceSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateFilter.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/TemplateFilter.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutlet.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/TemplateGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutletImpl.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/TemplateGeneratorImpl.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/package.html
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/TorqueGfVelocity.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/VelocityGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutletState.java
      - copied, changed from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/VelocityGeneratorState.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/
      - copied from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/variable/
Removed:
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/GeneratorReference.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/GeneratorReferenceSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GeneratorConfiguration.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GeneratorConfigurationSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GeneratorConfigurationTags.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GeneratorConfigurationXmlParser.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GeneratorSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/GeneratorSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaGeneratorSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaGeneratorSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityGeneratorSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityGeneratorSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGfPaths.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/TorqueGfPaths.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ConstantNameGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/GeneratorUtils.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/GeneratorWithoutMergepoints.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavaFilenameGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/NewlineGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/PackageToPathGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/StringInputGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGfVelocity.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityGenerator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityGeneratorState.java
Modified:
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationTags.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/SourceConfigurationTags.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/TransformerSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointConfigurationTags.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsConfiguration.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionTags.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfiguration.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandler.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionsSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionConfiguration.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionsSaxHandlerFactory.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/CustomProjectPaths.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2DirectoryProjectPaths.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2JarProjectPaths.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/ProjectPaths.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/ApplyAction.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/MergepointAction.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OptionAction.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OutputAction.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/SourceElementAttributeAction.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Option.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionName.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/UnsupportedOptionException.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/Camelbacker.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/CharReplacer.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/ConstantNameCreator.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/StringProcessor.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/WrapReservedJavaWords.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/Namespace.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedNameMap.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/SourceFilter.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/StopGenerationSourceFilter.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/PropertiesSourceType.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformer.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/CopyAttributeTransformer.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/GetterSetterNameTransformer.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTargetAttributeTransformer.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTransformer.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTransformerException.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/SourceToXml.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceParser.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceType.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/package.html
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java
    db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/package.html

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/GeneratorException.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/GeneratorException.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/GeneratorException.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/GeneratorException.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/GeneratorException.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/GeneratorException.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/GeneratorException.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator;
+package org.apache.torque.generator;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -33,7 +33,7 @@ public class GeneratorException extends 
     private static final long serialVersionUID = 1L;
 
     /**
-     * Constructs a GeneratorException without error message.
+     * Constructs a OutletException without error message.
      */
     public GeneratorException()
     {

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ClassHelper.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ClassHelper.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ClassHelper.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClassHelper.java Sun May 16 15:35:27 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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ClasspathConfigurationProvider.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ClasspathConfigurationProvider.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ClasspathConfigurationProvider.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java Sun May 16 15:35:27 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
@@ -31,8 +31,8 @@ import java.util.jar.JarFile;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.paths.TorqueGfPaths;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.paths.TorqueGeneratorPaths;
 
 /**
  * Provides InputStreams to read a configuration of a unit of generation from a
@@ -50,10 +50,10 @@ public class ClasspathConfigurationProvi
     private ProjectPaths projectPaths;
 
     /**
-     * The internal directory structure of the generator configuration files,
-     * not null.
+     * The internal directory structure of the Torque generator 
+     * configuration files, not null.
      */
-    private TorqueGfPaths configurationPaths;
+    private TorqueGeneratorPaths configurationPaths;
 
     /** The prefix if an url points to a file. */
     private static final String FILE_URL_PREFIX = "file:";
@@ -61,16 +61,16 @@ public class ClasspathConfigurationProvi
     /**
      * Constructor.
      * @param projectPaths the paths needed to interact with the enclosing
-     *         project, not null.
+     *        project, not null.
      * @param configurationPaths The internal directory structure of the
-     *         generator configuration files, not null.
+     *        Torque generator configuration files, not null.
      *
      * @throws NullPointerException if projectPaths or configurationPaths
-     *          are null.
+     *         are null.
      */
     public ClasspathConfigurationProvider(
             ProjectPaths projectPaths,
-            TorqueGfPaths configurationPaths)
+            TorqueGeneratorPaths configurationPaths)
     {
         if (projectPaths == null)
         {
@@ -143,50 +143,58 @@ public class ClasspathConfigurationProvi
         return bis;
     }
 
-    public InputStream getGeneratorConfigurationInputStream(String name)
+    public InputStream getOutletConfigurationInputStream(String name)
         throws ConfigurationException
     {
-        String generatorConfigFileName
+        String outletConfigFileName
                 = getConfigResourceBase()
                     + "/"
-                    + configurationPaths.getGeneratorDefDirectory()
+                    + configurationPaths.getOutletDirectory()
                     + "/"
                     + name;
 
         InputStream inputStream
                 = getClass().getClassLoader().getResourceAsStream(
-                        generatorConfigFileName);
+                        outletConfigFileName);
 
         if (inputStream == null)
         {
             throw new ConfigurationException(
-                    "Could not read generator configuration file "
-                        + generatorConfigFileName
+                    "Could not read outlet configuration file "
+                        + outletConfigFileName
                         + " in classpath");
         }
         BufferedInputStream bis = new BufferedInputStream(inputStream);
         if (log.isInfoEnabled())
         {
-            log.info("Reading generator configuration file: '"
-                    + generatorConfigFileName
+            log.info("Reading outlet configuration file: '"
+                    + outletConfigFileName
                     + "' in classpath");
         }
         return bis;
    }
 
-    public Collection<String> getGeneratorConfigurationNames()
+    public Collection<String> getOutletConfigurationNames()
         throws ConfigurationException
     {
-        String generatorConfigurationSubdir
+        String outletConfigurationSubdir
                 = getConfigResourceBase()
                     + "/"
-                    + configurationPaths.getGeneratorDefDirectory();
-        generatorConfigurationSubdir
-                = generatorConfigurationSubdir.replace('\\', '/');
+                    + configurationPaths.getOutletDirectory();
+        outletConfigurationSubdir
+                = outletConfigurationSubdir.replace('\\', '/');
 
 
         URL dirUrl = getClass().getClassLoader().getResource(
-                    generatorConfigurationSubdir);
+                    outletConfigurationSubdir);
+        if (dirUrl == null)
+        {
+            log.error("Could not open Directory "
+                    + outletConfigurationSubdir
+                    + " in classpath");
+            throw new ConfigurationException(
+                    "outletConfigurationSubdir not found");
+        }
         String dirUrlString = dirUrl.toExternalForm();
         if (dirUrlString.startsWith("jar"))
         {
@@ -198,7 +206,7 @@ public class ClasspathConfigurationProvi
             jarFilePath = jarFilePath.substring(0, jarFilePath.indexOf("!"));
             if (log.isDebugEnabled())
             {
-                log.debug("generator config located in jar file"
+                log.debug("outlet configuration located in jar file"
                         + jarFilePath);
             }
             JarFile jarFile;
@@ -213,23 +221,23 @@ public class ClasspathConfigurationProvi
                 throw new ConfigurationException(e);
             }
 
-            String generatorConfigurationDirectory
+            String outletConfigurationDirectory
                     = dirUrlString.substring(dirUrlString.lastIndexOf("!") + 1);
-            if (generatorConfigurationDirectory.startsWith("/"))
+            if (outletConfigurationDirectory.startsWith("/"))
             {
-                generatorConfigurationDirectory
-                        = generatorConfigurationDirectory.substring(1);
+                outletConfigurationDirectory
+                        = outletConfigurationDirectory.substring(1);
             }
-            return JarConfigurationProvider.getGeneratorConfigurationNames(
+            return JarConfigurationProvider.getOutletConfigurationNames(
                     jarFile,
-                    generatorConfigurationDirectory);
+                    outletConfigurationDirectory);
         }
         File directory = new File(dirUrl.getFile());
         if (!directory.exists())
         {
             throw new ConfigurationException(
-                    "Could not read generator directory "
-                        + generatorConfigurationSubdir
+                    "Could not read outlet directory "
+                        + outletConfigurationSubdir
                         + " in classpath; directory URL is "
                         + dirUrl
                         + " file is "

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/Configuration.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/Configuration.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/Configuration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/Configuration.java Sun May 16 15:35:27 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
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.torque.gf.configuration.controller.Loglevel;
+import org.apache.torque.generator.configuration.controller.Loglevel;
 
 /**
  * The configuration class keeps the complete configuration needed for the

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationEntityResolver.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationEntityResolver.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationEntityResolver.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java Sun May 16 15:35:27 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
@@ -56,11 +56,11 @@ public class ConfigurationEntityResolver
 {
    /** The SystemId of the configuration schema. */
     public static final String CONFIGURATION_SCHEMA_SYSTEMID
-            = XMLConstants.GF_CONFIGURATION_NAMESPACE + ".xsd";
+            = XMLConstants.GENERATOR_CONFIGURATION_NAMESPACE + ".xsd";
 
     /** The SystemId of the configuration schema. */
-    public static final String GENERATOR_SCHEMA_SYSTEMID
-            = XMLConstants.GF_GENERATOR_NAMESPACE + ".xsd";
+    public static final String OUTLET_SCHEMA_SYSTEMID
+            = "http://db.apache.org/torque/4.0/generator/outlet.xsd";
 
     /** Logging class from commons.logging */
     private static Log log
@@ -89,9 +89,9 @@ public class ConfigurationEntityResolver
         {
             return readFromClasspath("configuration.xsd");
         }
-        else if (GENERATOR_SCHEMA_SYSTEMID.equals(systemId))
+        else if (OUTLET_SCHEMA_SYSTEMID.equals(systemId))
         {
-            return readFromClasspath("generator.xsd");
+            return readFromClasspath("outlet.xsd");
         }
         else
         {

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationException.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationException.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationException.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationException.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationException.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationException.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationException.java Sun May 16 15:35:27 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
@@ -19,7 +19,7 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import org.apache.torque.gf.generator.GeneratorException;
+import org.apache.torque.generator.GeneratorException;
 
 /**
  * This exception is thrown if the Torque generator cannot access its

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationHandlers.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationHandlers.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationHandlers.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationHandlers.java Sun May 16 15:35:27 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
@@ -22,11 +22,11 @@ package org.apache.torque.gf.configurati
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.torque.gf.configuration.mergepoint.ActionSaxHandlerFactories;
-import org.apache.torque.gf.configuration.mergepoint.OptionsSaxHandlerFactories;
-import org.apache.torque.gf.source.SourceType;
-import org.apache.torque.gf.source.properties.PropertiesSourceType;
-import org.apache.torque.gf.source.xml.XmlSourceType;
+import org.apache.torque.generator.configuration.mergepoint.ActionSaxHandlerFactories;
+import org.apache.torque.generator.configuration.mergepoint.OptionsSaxHandlerFactories;
+import org.apache.torque.generator.source.SourceType;
+import org.apache.torque.generator.source.properties.PropertiesSourceType;
+import org.apache.torque.generator.source.xml.XmlSourceType;
 
 /**
  * Contains the required handlers for reading the configuration.
@@ -36,9 +36,9 @@ import org.apache.torque.gf.source.xml.X
 public class ConfigurationHandlers
 {
     /**
-     * The known types of generators and how to read their configuration.
+     * The known types of outlets and how to read their configuration.
      */
-    private GeneratorTypes generatorTypes = new GeneratorTypes();
+    private OutletTypes outletTypes = new OutletTypes();
 
     /**
      * The known types of source types.
@@ -67,13 +67,13 @@ public class ConfigurationHandlers
     }
 
     /**
-     * Returns the known generator types.
+     * Returns the known outlet types.
      *
-     * @return the known generator types.
+     * @return the known outlet types.
      */
-    public GeneratorTypes getGeneratorTypes()
+    public OutletTypes getOutletTypes()
     {
-        return generatorTypes;
+        return outletTypes;
     }
 
     /**

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationProvider.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationProvider.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/ConfigurationProvider.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationProvider.java Sun May 16 15:35:27 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
@@ -53,27 +53,27 @@ public interface ConfigurationProvider
         throws ConfigurationException;
 
     /**
-     * Returns a list of all found generator configuration files in the
+     * Returns a list of all found outlet configuration files in the
      * generation unit.
      *
      * @return a list with the generation configuration files, not null.
      *
      * @throws ConfigurationException if the configuration can not be read.
      */
-    Collection<String> getGeneratorConfigurationNames()
+    Collection<String> getOutletConfigurationNames()
         throws ConfigurationException;
 
     /**
-     * Creates a reader to access the configuration for one generator..
+     * Creates a reader to access the configuration for one outlet.
      * It is the callers responsibility to close the reader after use.
      *
-     * @param name the name (==path to) of the generator configuration.
+     * @param name the name (==path to) of the outlet configuration.
      *
-     * @return a reader to access the generator configuration, never null.
+     * @return a reader to access the outlet configuration, never null.
      *
      * @throws ConfigurationException if the reader can not be created.
      */
-    InputStream getGeneratorConfigurationInputStream(String name)
+    InputStream getOutletConfigurationInputStream(String name)
         throws ConfigurationException;
 
     /**

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/DirectoryConfigurationProvider.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/DirectoryConfigurationProvider.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/DirectoryConfigurationProvider.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java Sun May 16 15:35:27 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
@@ -30,8 +30,8 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.paths.TorqueGfPaths;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.paths.TorqueGeneratorPaths;
 
 /**
  * Provides InputStreams to read the configuration from a directory.
@@ -48,25 +48,25 @@ public class DirectoryConfigurationProvi
     private ProjectPaths projectPaths;
 
     /**
-     * The internal directory structure of the generator configuration files,
-     * not null.
+     * The internal directory structure of the Torque generator configuration
+     * files, not null.
      */
-    private TorqueGfPaths configurationPaths;
+    private TorqueGeneratorPaths configurationPaths;
 
     /**
      * Constructor.
      *
      * @param projectPaths the paths needed to interact with the enclosing
-     *         project, not null.
+     *        project, not null.
      * @param configurationPaths The internal directory structure of the
-     *         generator configuration files, not null.
+     *        generator files, not null.
      *
      * @throws NullPointerException if projectPaths or configurationPaths
-     *          are null.
+     *         are null.
      */
     public DirectoryConfigurationProvider(
             ProjectPaths projectPaths,
-            TorqueGfPaths configurationPaths)
+            TorqueGeneratorPaths configurationPaths)
     {
         if (projectPaths == null)
         {
@@ -146,56 +146,56 @@ public class DirectoryConfigurationProvi
         return bis;
     }
 
-    public InputStream getGeneratorConfigurationInputStream(String name)
+    public InputStream getOutletConfigurationInputStream(String name)
         throws ConfigurationException
     {
-        File generatorConfigFile;
+        File outletConfigFile;
         {
-            File generatorConfigDir =  new File(
+            File outletConfigDir =  new File(
                     projectPaths.getConfigurationPath(),
-                    configurationPaths.getGeneratorDefDirectory());
+                    configurationPaths.getOutletDirectory());
 
-            generatorConfigFile = new File(generatorConfigDir, name);
+            outletConfigFile = new File(outletConfigDir, name);
         }
 
         InputStream inputStream = null;
         try
         {
-            inputStream = new FileInputStream(generatorConfigFile);
+            inputStream = new FileInputStream(outletConfigFile);
         }
         catch (FileNotFoundException e)
         {
-            throw new ConfigurationException("Generator configuration file "
-                    + generatorConfigFile.getAbsolutePath()
+            throw new ConfigurationException("Outlet configuration file "
+                    + outletConfigFile.getAbsolutePath()
                     + " not found");
         }
         BufferedInputStream bis = new BufferedInputStream(inputStream);
         if (log.isInfoEnabled())
         {
-            log.info("Reading Generator configuration file: '"
-                    + generatorConfigFile.getAbsolutePath() + "'");
+            log.info("Reading Outlet configuration file: '"
+                    + outletConfigFile.getAbsolutePath() + "'");
         }
         return bis;
 
     }
 
-    public Collection<String> getGeneratorConfigurationNames()
+    public Collection<String> getOutletConfigurationNames()
         throws ConfigurationException
     {
-        File generatorConfigDir =  new File(
+        File outletConfigDir =  new File(
                 projectPaths.getConfigurationPath(),
-                configurationPaths.getGeneratorDefDirectory());
+                configurationPaths.getOutletDirectory());
 
         List<String> result = new ArrayList<String>();
-        if (!generatorConfigDir.isDirectory())
+        if (!outletConfigDir.isDirectory())
         {
             throw new ConfigurationException(
-                    "GeneratorsConfigDirectory "
-                        + generatorConfigDir.getAbsolutePath()
+                    "OutletsConfigDirectory "
+                        + outletConfigDir.getAbsolutePath()
                         + "must be a directory");
         }
 
-        File[] sourceFiles = generatorConfigDir.listFiles();
+        File[] sourceFiles = outletConfigDir.listFiles();
         for (int fileNr = 0; fileNr < sourceFiles.length; ++fileNr)
         {
             if (!sourceFiles[fileNr].isDirectory()

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/JarConfigurationProvider.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/JarConfigurationProvider.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/JarConfigurationProvider.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java Sun May 16 15:35:27 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
@@ -31,8 +31,8 @@ import java.util.jar.JarFile;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.paths.TorqueGfPaths;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.paths.TorqueGeneratorPaths;
 
 /**
  * Provides InputStreams to read a configuration of a unit of generation from a
@@ -53,7 +53,7 @@ public class JarConfigurationProvider im
      * The internal directory structure of the generator configuration files,
      * not null.
      */
-    private TorqueGfPaths configurationPaths;
+    private TorqueGeneratorPaths configurationPaths;
 
     /**
      * The jar file from which the configuration should be read, not null.
@@ -73,7 +73,7 @@ public class JarConfigurationProvider im
      */
     public JarConfigurationProvider(
             ProjectPaths projectPaths,
-            TorqueGfPaths configurationPaths)
+            TorqueGeneratorPaths configurationPaths)
         throws ConfigurationException
     {
         if (projectPaths == null)
@@ -173,25 +173,25 @@ public class JarConfigurationProvider im
         return bis;
     }
 
-    public InputStream getGeneratorConfigurationInputStream(String name)
+    public InputStream getOutletConfigurationInputStream(String name)
         throws ConfigurationException
     {
-        String generatorConfigFileName
-                = configurationPaths.getGeneratorDefDirectory()
+        String outletConfigFileName
+                = configurationPaths.getOutletDirectory()
                     + "/"
                     + name;
 
         InputStream inputStream = null;
         try
         {
-            JarEntry jarEntry = jarFile.getJarEntry(generatorConfigFileName);
+            JarEntry jarEntry = jarFile.getJarEntry(outletConfigFileName);
             inputStream = jarFile.getInputStream(jarEntry);
         }
         catch (IOException e)
         {
             throw new ConfigurationException(
-                    "Could not read generator configuration file "
-                        + generatorConfigFileName
+                    "Could not read outlet configuration file "
+                        + outletConfigFileName
                         + " in jar file "
                         + projectPaths.getConfigurationPath(),
                     e);
@@ -199,7 +199,7 @@ public class JarConfigurationProvider im
         BufferedInputStream bis = new BufferedInputStream(inputStream);
         if (log.isInfoEnabled())
         {
-            log.info("Reading generator configuration file: '"
+            log.info("Reading outlet configuration file: '"
                     + projectPaths.getConfigurationPath()
                     + "' in jar file "
                     + projectPaths.getConfigurationPath());
@@ -207,33 +207,33 @@ public class JarConfigurationProvider im
         return bis;
    }
 
-    public Collection<String> getGeneratorConfigurationNames()
+    public Collection<String> getOutletConfigurationNames()
         throws ConfigurationException
     {
-        return getGeneratorConfigurationNames(
+        return getOutletConfigurationNames(
                 jarFile,
-                configurationPaths.getGeneratorDefDirectory());
+                configurationPaths.getOutletDirectory());
     }
 
     /**
-     * Extracts the generator configuration files from a jar file.
+     * Extracts the outlet configuration files from a jar file.
      * @param jarFile the jar file to process, not null.
-     * @param generatorConfigurationDirectory the name of the directory
-     *        which contains the generator configuration files. Cannot be
+     * @param outletConfigurationDirectory the name of the directory
+     *        which contains the outlet configuration files. Cannot be
      *        a composite path like parent/child.
-     * @return a set with the names of all generator configuration files
+     * @return a set with the names of all outlet configuration files
      *         contained in the jar file.
      * @throws NullPointerException if jarFile
-     *         or generatorConfigurationDirectory is null
+     *         or outletConfigurationDirectory is null
      */
-    static Collection<String> getGeneratorConfigurationNames(
+    static Collection<String> getOutletConfigurationNames(
             JarFile jarFile,
-            String generatorConfigurationDirectory)
+            String outletConfigurationDirectory)
     {
         if (log.isDebugEnabled())
         {
             log.debug("Analyzing jar file " + jarFile.getName()
-                    +  " seeking Directory " + generatorConfigurationDirectory);
+                    +  " seeking Directory " + outletConfigurationDirectory);
         }
 
         List<String> result = new ArrayList<String>();
@@ -247,28 +247,28 @@ public class JarConfigurationProvider im
                 continue;
             }
             String rawName = jarEntry.getName();
-            if (!rawName.startsWith(generatorConfigurationDirectory))
+            if (!rawName.startsWith(outletConfigurationDirectory))
             {
                 continue;
             }
             String name = rawName.substring(rawName.lastIndexOf('/') + 1);
 
             int expectedRawNameLength
-                    = generatorConfigurationDirectory.length()
+                    = outletConfigurationDirectory.length()
                         + name.length()
                         + 1;
             if (rawName.length() != expectedRawNameLength)
             {
-                // file is in a subdirectory of generatorConfigurationSubdir,
+                // file is in a subdirectory of outletConfigurationSubdir,
                 // we only consider files directly in
-                // generatorConfigurationSubdir
+                // outletConfigurationSubdir
                 continue;
             }
             result.add(name);
         }
         if (log.isDebugEnabled())
         {
-            log.debug("Found the following generator configuration files "
+            log.debug("Found the following outlet configuration files "
                     + result);
         }
         return result;

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/GeneratorTypes.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/GeneratorTypes.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/GeneratorTypes.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/OutletTypes.java Sun May 16 15:35:27 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
@@ -23,37 +23,37 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.torque.gf.configuration.generator.GeneratorSaxHandlerFactory;
-import org.apache.torque.gf.configuration.generator.JavaGeneratorSaxHandlerFactory;
-import org.apache.torque.gf.configuration.generator.VelocityGeneratorSaxHandlerFactory;
+import org.apache.torque.generator.configuration.outlet.JavaOutletSaxHandlerFactory;
+import org.apache.torque.generator.configuration.outlet.OutletSaxHandlerFactory;
+import org.apache.torque.generator.configuration.outlet.VelocityOutletSaxHandlerFactory;
 
 /**
- * Manages the types of known Generators. This include information
- * about how to read the configuration of each generator type.
+ * Manages the types of known Outlets. This include information
+ * about how to read the configuration of each outlet type.
  */
-public class GeneratorTypes
+public class OutletTypes
 {
     /**
-     * A map containing all known GeneratorSaxHandlerFactories,
-     * keyed by the type of the generator.
+     * A map containing all known OutletSaxHandlerFactories,
+     * keyed by the type of the outlet.
      */
-    private Map<String, GeneratorSaxHandlerFactory>
-        generatorHandlerFactories
-            = new HashMap<String, GeneratorSaxHandlerFactory>();
+    private Map<String, OutletSaxHandlerFactory>
+        outletHandlerFactories
+            = new HashMap<String, OutletSaxHandlerFactory>();
 
     /**
      * Constructor. Creates a new instance containing the mappings to the
-     * default generator types.
+     * default outlet types.
      */
-    public GeneratorTypes()
+    public OutletTypes()
     {
-        // register default generator types
+        // register default outlet types
         try
         {
-            registerGeneratorHandlerFactory(
-                    new VelocityGeneratorSaxHandlerFactory());
-            registerGeneratorHandlerFactory(
-                    new JavaGeneratorSaxHandlerFactory());
+            registerOutletHandlerFactory(
+                    new VelocityOutletSaxHandlerFactory());
+            registerOutletHandlerFactory(
+                    new JavaOutletSaxHandlerFactory());
         }
         catch (ConfigurationException e)
         {
@@ -63,29 +63,29 @@ public class GeneratorTypes
     }
 
     /**
-     * Registers a handler for a new type of generators.
+     * Registers a handler for a new type of outlets.
      *
-     * @param factory the factory which handles the generators of the
+     * @param factory the factory which handles the outlets of the
      *         given type.
      *
      * @throws NullPointerException if factory is null.
      * @throws ConfigurationException if a factory already exists
-     *          for the type of the generator.
+     *          for the type of the outlet.
      */
-    public void registerGeneratorHandlerFactory(
-            GeneratorSaxHandlerFactory factory)
+    public void registerOutletHandlerFactory(
+            OutletSaxHandlerFactory factory)
         throws ConfigurationException
     {
         if (factory == null)
         {
             throw new NullPointerException("factory must not be null");
         }
-        GeneratorSaxHandlerFactory oldFactory
-            = generatorHandlerFactories.get(factory.getType());
+        OutletSaxHandlerFactory oldFactory
+            = outletHandlerFactories.get(factory.getType());
         if (oldFactory != null)
         {
             throw new ConfigurationException(
-                    "Attempted to register a GeneratorSaxHandlerFactory "
+                    "Attempted to register a OutletSaxHandlerFactory "
                         + "of type "
                         + factory.getType()
                         + " and class "
@@ -94,18 +94,18 @@ public class GeneratorTypes
                         + " it has the class "
                         + oldFactory.getClass().getName());
         }
-        generatorHandlerFactories.put(factory.getType(), factory);
+        outletHandlerFactories.put(factory.getType(), factory);
     }
 
     /**
-     * Returns an unmodifiable  map containing all the generator handler
+     * Returns an unmodifiable  map containing all the outlet handler
      * factories, keyed by their type.
      *
-     * @return all generator handler factories, not null.
+     * @return all outlet handler factories, not null.
      */
-    public Map<String, GeneratorSaxHandlerFactory>
-        getGeneratorHandlerFactories()
+    public Map<String, OutletSaxHandlerFactory>
+        getOutletHandlerFactories()
     {
-        return Collections.unmodifiableMap(generatorHandlerFactories);
+        return Collections.unmodifiableMap(outletHandlerFactories);
     }
 }

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/SaxHelper.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/SaxHelper.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/SaxHelper.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/SaxHelper.java Sun May 16 15:35:27 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



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