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 [2/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
Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java (from r916202, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitConfiguration.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitConfiguration.java&r1=916202&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfiguration.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
@@ -24,11 +24,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-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.file.Fileset;
-import org.apache.torque.gf.option.Options;
+import org.apache.torque.generator.configuration.controller.Loglevel;
+import org.apache.torque.generator.configuration.controller.Output;
+import org.apache.torque.generator.configuration.outlet.OutletConfiguration;
+import org.apache.torque.generator.file.Fileset;
+import org.apache.torque.generator.option.Options;
 
 /**
  * A container for the configuration for a generation unit.
@@ -52,9 +52,9 @@ public class UnitConfiguration
     private boolean overrideSourceFilesetInitialized = false;
 
     /**
-     * The configuration for the available generators.
+     * The configuration for the available outlets.
      */
-    private GeneratorConfiguration generatorConfiguration;
+    private OutletConfiguration outletConfiguration;
 
     /**
      * The root directory where the generated file which are generated
@@ -72,38 +72,38 @@ public class UnitConfiguration
     private Loglevel loglevel = Loglevel.INFO;
 
     /**
-     * Returns the configuration of the generators in this generation unit.
+     * Returns the configuration of the outlets in this generation unit.
      *
-     * @return the generator configuration, or null if not set.
+     * @return the outlet configuration, or null if not set.
      *
-     * @throws IllegalStateException if generatorConfiguration was not set.
+     * @throws IllegalStateException if outletConfiguration was not set.
      */
-    public GeneratorConfiguration getGeneratorConfiguration()
+    public OutletConfiguration getOutletConfiguration()
     {
-        if (generatorConfiguration == null)
+        if (outletConfiguration == null)
         {
             throw new IllegalStateException(
-                    "generatorConfiguration is not initialized");
+                    "outletConfiguration is not initialized");
         }
-        return generatorConfiguration;
+        return outletConfiguration;
     }
 
     /**
-     * Sets the generator configuration of the associated configuration unit.
+     * Sets the outlet configuration of the associated configuration unit.
      *
-     * @param generatorConfiguration the generator configuration, not null.
+     * @param outletConfiguration the outlet configuration, not null.
      *
-     * @throws NullPointerException if generatorConfiguration is null.
+     * @throws NullPointerException if outletConfiguration is null.
      */
-    public void setGeneratorConfiguration(
-            GeneratorConfiguration generatorConfiguration)
+    public void setOutletConfiguration(
+            OutletConfiguration outletConfiguration)
     {
-        if (generatorConfiguration == null)
+        if (outletConfiguration == null)
         {
             throw new NullPointerException(
-                    "generatorConfiguration cannot be null");
+                    "outletConfiguration cannot be null");
         }
-        this.generatorConfiguration = generatorConfiguration;
+        this.outletConfiguration = outletConfiguration;
     }
 
     /**
@@ -323,7 +323,7 @@ public class UnitConfiguration
     {
         if (outputFiles == null
             || options == null
-            || generatorConfiguration == null
+            || outletConfiguration == null
             || newFileTargetDirectory == null
             || modifiedFileTargetDirectory == null
             || loglevel == null
@@ -342,8 +342,8 @@ public class UnitConfiguration
                 .append(outputFiles.toString())
                 .append(", options=")
                 .append(options)
-                .append(", generatorConfiguration=")
-                .append(generatorConfiguration)
+                .append(", outletConfiguration=")
+                .append(outletConfiguration)
                 .append(", newFileTargetDirectory=")
                 .append(newFileTargetDirectory)
                 .append(", modifiedFileTargetDirectory=")

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java (from r916202, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitConfigurationReader.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitConfigurationReader.java&r1=916202&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitConfigurationReader.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.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
@@ -28,17 +28,17 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.UnitDescriptor.Packaging;
-import org.apache.torque.gf.configuration.controller.ControlConfiguration;
-import org.apache.torque.gf.configuration.controller.ControlConfigurationXmlParser;
-import org.apache.torque.gf.configuration.controller.Output;
-import org.apache.torque.gf.configuration.generator.GeneratorConfiguration;
-import org.apache.torque.gf.configuration.generator.GeneratorConfigurationXmlParser;
-import org.apache.torque.gf.configuration.option.OptionsConfiguration;
-import org.apache.torque.gf.generator.Generator;
-import org.apache.torque.gf.option.Option;
-import org.apache.torque.gf.option.Options;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.configuration.UnitDescriptor.Packaging;
+import org.apache.torque.generator.configuration.controller.ControlConfiguration;
+import org.apache.torque.generator.configuration.controller.ControlConfigurationXmlParser;
+import org.apache.torque.generator.configuration.controller.Output;
+import org.apache.torque.generator.configuration.option.OptionsConfiguration;
+import org.apache.torque.generator.configuration.outlet.OutletConfiguration;
+import org.apache.torque.generator.configuration.outlet.OutletConfigurationXmlParser;
+import org.apache.torque.generator.option.Option;
+import org.apache.torque.generator.option.Options;
+import org.apache.torque.generator.outlet.Outlet;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
  * Reads the configuration of a unit of generation.
@@ -58,11 +58,11 @@ class UnitConfigurationReader
      *
      * @return the configuration of the unit of generation.
      * @throws ConfigurationException if the configuration is incorrect
-     *          or cannot be read.
-     * @throws NullPointerException if the unitDescriptor or generatorTypes
-     *          is null.
+     *         or cannot be read.
+     * @throws NullPointerException if the unitDescriptor or
+     *         configurationHandlers is null.
      * @throws IllegalArgumentException if a reader is the wrong type of reader
-     *          for the given configuration type.
+     *         for the given configuration type.
      */
     public UnitConfiguration read(
             UnitDescriptor unitDescriptor,
@@ -104,15 +104,15 @@ class UnitConfigurationReader
         {
             if (log.isDebugEnabled())
             {
-                log.debug("Start reading generator configuration");
+                log.debug("Start reading outlet configuration");
             }
-            GeneratorConfiguration generatorConfiguration
-                    = new GeneratorConfigurationXmlParser()
-                        .readGeneratorConfiguration(
+            OutletConfiguration outletConfiguration
+                    = new OutletConfigurationXmlParser()
+                        .readOutletConfiguration(
                                 configurationProvider,
                                 unitDescriptor.getProjectPaths(),
                                 configurationHandlers);
-            unitConfiguration.setGeneratorConfiguration(generatorConfiguration);
+            unitConfiguration.setOutletConfiguration(outletConfiguration);
         }
 
         if (log.isDebugEnabled())
@@ -124,9 +124,9 @@ class UnitConfigurationReader
 
         if (unitDescriptor.getInheritsFrom() == null)
         {
-            GeneratorConfiguration generatorConfiguration
-                    = unitConfiguration.getGeneratorConfiguration();
-            generatorConfiguration.resolveMergepointMappings();
+            OutletConfiguration outletConfiguration
+                    = unitConfiguration.getOutletConfiguration();
+            outletConfiguration.resolveMergepointMappings();
             return unitConfiguration;
         }
         UnitConfiguration inherited = read(
@@ -137,7 +137,7 @@ class UnitConfigurationReader
         // Restore this loglevel.
         unitConfiguration.getLoglevel().apply();
 
-        mergeInheritedGeneratorConfiguration(unitConfiguration, inherited);
+        mergeInheritedOutletConfiguration(unitConfiguration, inherited);
         mergeInheritedOptionConfiguration(unitConfiguration, inherited);
         mergeInheritedOutputFiles(unitConfiguration, inherited);
         // target directory cannot be null and thus the current target directory
@@ -214,37 +214,37 @@ class UnitConfigurationReader
     }
 
     /**
-     * Merges an inherited generator configuration into the generator
+     * Merges an inherited outlet configuration into the outlet
      * configuration of the current unit configuration.
      *
      * @param unitConfiguration the current unit configuration
      * @param inheritedConfiguration the inherited unit configuration
-     *        which generators should be merged.
+     *        which outlets should be merged.
      *
      * @throws ConfigurationException will not normally happen.
      */
-    private void mergeInheritedGeneratorConfiguration(
+    private void mergeInheritedOutletConfiguration(
                 UnitConfiguration unitConfiguration,
                 UnitConfiguration inheritedConfiguration)
             throws ConfigurationException
     {
-        GeneratorConfiguration generatorConfiguration
-            = unitConfiguration.getGeneratorConfiguration();
+        OutletConfiguration outletConfiguration
+            = unitConfiguration.getOutletConfiguration();
 
-        GeneratorConfiguration inheritedGeneratorConfiguration
-            = inheritedConfiguration.getGeneratorConfiguration();
-        Map<QualifiedName, Generator> inheritedGenerators
-            = inheritedGeneratorConfiguration.getGenerators();
+        OutletConfiguration inheritedOutletConfiguration
+            = inheritedConfiguration.getOutletConfiguration();
+        Map<QualifiedName, Outlet> inheritedOutlets
+            = inheritedOutletConfiguration.getOutlets();
 
-        for (Map.Entry<QualifiedName, Generator> entry
-                : inheritedGenerators.entrySet())
+        for (Map.Entry<QualifiedName, Outlet> entry
+                : inheritedOutlets.entrySet())
         {
-            if (!generatorConfiguration.generatorExists(entry.getKey()))
+            if (!outletConfiguration.outletExists(entry.getKey()))
             {
-                generatorConfiguration.addGenerator(entry.getValue());
+                outletConfiguration.addOutlet(entry.getValue());
             }
         }
-        generatorConfiguration.resolveMergepointMappings();
+        outletConfiguration.resolveMergepointMappings();
     }
 
     /**

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java (from r916202, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitDescriptor.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitDescriptor.java&r1=916202&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/UnitDescriptor.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitDescriptor.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,11 +19,11 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import org.apache.torque.gf.configuration.controller.Loglevel;
-import org.apache.torque.gf.configuration.option.OptionsConfiguration;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.configuration.paths.TorqueGfPaths;
-import org.apache.torque.gf.file.Fileset;
+import org.apache.torque.generator.configuration.controller.Loglevel;
+import org.apache.torque.generator.configuration.option.OptionsConfiguration;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.paths.TorqueGeneratorPaths;
+import org.apache.torque.generator.file.Fileset;
 
 /**
  * Contains all necessary information about a generation unit.
@@ -49,14 +49,14 @@ public class UnitDescriptor
     private Packaging packaging;
 
    /**
-    * The paths the code generator must know about the surrounding project.
+    * The paths the Torque generator must know about the surrounding project.
     */
     private ProjectPaths projectPaths;
 
     /**
-     * How the code generator's configuration is organized internally.
+     * How the Torque generator's configuration is organized internally.
      */
-    private TorqueGfPaths configurationPaths;
+    private TorqueGeneratorPaths configurationPaths;
 
     /**
      * The parent of this generation unit, or null if it has no parent.
@@ -69,7 +69,10 @@ public class UnitDescriptor
     /** Options to override the settings in the project Directory. */
     private OptionsConfiguration overrideOptions;
 
-    /** The Loglevel to override the loglevel in the generator configuration. */
+    /** 
+     * The Loglevel to override the loglevel in the Torque 
+     * generator configuration.
+     */
     private Loglevel loglevel;
 
     /**
@@ -77,7 +80,7 @@ public class UnitDescriptor
      * and loglevel.
      *
      * @param packaging The packaging of the generation unit, not null.
-     * @param projectPaths The paths the code generator must know about
+     * @param projectPaths The paths the Torque generator must know about
      *        the surrounding project, not null.
      * @param configurationPaths The paths within the configuration
      *        of the configuration unit, not null.
@@ -85,7 +88,7 @@ public class UnitDescriptor
     public UnitDescriptor(
             Packaging packaging,
             ProjectPaths projectPaths,
-            TorqueGfPaths configurationPaths)
+            TorqueGeneratorPaths configurationPaths)
     {
         this(packaging,
                 projectPaths,
@@ -100,7 +103,7 @@ public class UnitDescriptor
      * Constructor.
      *
      * @param packaging The packaging of the generation unit, not null.
-     * @param projectPaths The paths the code generator must know about
+     * @param projectPaths The paths the Torque generator must know about
      *        the surrounding project, not null.
      * @param configurationPaths The paths within the configuration
      *        of the configuration unit, not null.
@@ -117,7 +120,7 @@ public class UnitDescriptor
     public UnitDescriptor(
             Packaging packaging,
             ProjectPaths projectPaths,
-            TorqueGfPaths configurationPaths,
+            TorqueGeneratorPaths configurationPaths,
             UnitDescriptor inheritsFrom,
             Fileset overrideSourceFileset,
             OptionsConfiguration overrideOptions,
@@ -158,7 +161,7 @@ public class UnitDescriptor
     }
 
     /**
-     * Returns the paths which the code generator must know about the
+     * Returns the paths which the Torque generator must know about the
      * surrounding project.
      *
      * @return the paths of the surrounding project, not null.
@@ -173,7 +176,7 @@ public class UnitDescriptor
      * @return the paths in the configuration of this generation unit,
      *          not null.
      */
-    public TorqueGfPaths getConfigurationPaths()
+    public TorqueGeneratorPaths getConfigurationPaths()
     {
         return configurationPaths;
     }

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/XMLConstants.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/XMLConstants.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/XMLConstants.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/XMLConstants.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
@@ -44,20 +44,13 @@ public final class XMLConstants
             = "http://www.w3.org/2001/XMLSchema-instance";
 
     /**
-     * The Torque GF configuration Namespace.
+     * The Torque generator configuration Namespace.
      */
-    public static final String GF_CONFIGURATION_NAMESPACE
-            = "http://db.apache.org/torque/gf/4.0/configuration";
-
-    /**
-     * The Torque GF generator Namespace.
-     */
-    public static final String GF_GENERATOR_NAMESPACE
-            = "http://db.apache.org/torque/gf/4.0/generator";
+    public static final String GENERATOR_CONFIGURATION_NAMESPACE
+            = "http://db.apache.org/torque/4.0/generator/configuration";
 
     /**
      * The name of the XSI type attribute.
      */
     public static final String XSI_TYPE_ATTRBUTE_NAME = "type";
-
 }

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfiguration.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -39,8 +39,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.option.OptionsConfiguration;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.option.OptionsConfiguration;
 
 
 /**

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,24 +19,24 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.controller.ControlConfigurationTags.CONTROL_LOGLEVEL_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.controller.ControlConfigurationTags.CONTROL_TAG;
-import static org.apache.torque.gf.configuration.controller.OutputConfigurationTags.OUTPUT_TAG;
-import static org.apache.torque.gf.configuration.option.OptionTags.OPTIONS_TAG;
+import static org.apache.torque.generator.configuration.controller.ControlConfigurationTags.CONTROL_LOGLEVEL_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.controller.ControlConfigurationTags.CONTROL_TAG;
+import static org.apache.torque.generator.configuration.controller.OutputConfigurationTags.OUTPUT_TAG;
+import static org.apache.torque.generator.configuration.option.OptionTags.OPTIONS_TAG;
 
 import java.io.IOException;
 
-import org.apache.torque.gf.configuration.ConfigurationEntityResolver;
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.ConfigurationHandlers;
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.SaxHelper;
-import org.apache.torque.gf.configuration.XMLConstants;
-import org.apache.torque.gf.configuration.mergepoint.OptionsSaxHandlerFactories;
-import org.apache.torque.gf.configuration.option.OptionsConfiguration;
-import org.apache.torque.gf.configuration.option.OptionsSaxHandler;
-import org.apache.torque.gf.configuration.option.OptionsSaxHandlerFactory;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.ConfigurationEntityResolver;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.ConfigurationHandlers;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.SaxHelper;
+import org.apache.torque.generator.configuration.XMLConstants;
+import org.apache.torque.generator.configuration.mergepoint.OptionsSaxHandlerFactories;
+import org.apache.torque.generator.configuration.option.OptionsConfiguration;
+import org.apache.torque.generator.configuration.option.OptionsSaxHandler;
+import org.apache.torque.generator.configuration.option.OptionsSaxHandlerFactory;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationTags.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationTags.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationTags.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationTags.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,10 +28,10 @@ import javax.xml.parsers.SAXParserFactor
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.ConfigurationHandlers;
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.ConfigurationHandlers;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXNotRecognizedException;
 import org.xml.sax.SAXNotSupportedException;
@@ -44,7 +44,7 @@ public class ControlConfigurationXmlPars
 {
     /**
      * The SaxParserFactory to create the SAX parsers for reading in the
-     * generator configuration files.
+     * configuration files.
      */
     private static SAXParserFactory saxFactory;
 

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Loglevel.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/GeneratorReference.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/GeneratorReference.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/GeneratorReference.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReference.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,31 +19,31 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import org.apache.torque.gf.qname.Namespace;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.qname.Namespace;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
- * Represents a reference to a generator.
+ * Represents a reference to a outlet.
  *
  * @version $Id: XmlToAppData.java 239626 2005-08-24 12:19:51Z henning $
  */
-public class GeneratorReference
+public class OutletReference
 {
-    /** The name of the referenced generator. */
+    /** The name of the referenced outlet. */
     private QualifiedName name;
 
     /**
-     * The namespace under which the generator should execute.
-     * Defaults to the namespace in the generator's name.
+     * The namespace under which the outlet should execute.
+     * Defaults to the namespace in the outlet's name.
      */
     private Namespace namespace;
 
     /**
      * Constructor.
      *
-     * @param name the name of the referenced generator, not null.
+     * @param name the name of the referenced outlet, not null.
      */
-    public GeneratorReference(String name)
+    public OutletReference(String name)
     {
         if (name == null)
         {
@@ -56,9 +56,9 @@ public class GeneratorReference
     /**
      * Constructor.
      *
-     * @param name the name of the referenced generator, not null.
+     * @param name the name of the referenced outlet, not null.
      */
-    public GeneratorReference(QualifiedName name)
+    public OutletReference(QualifiedName name)
     {
         if (name == null)
         {
@@ -69,9 +69,9 @@ public class GeneratorReference
     }
 
     /**
-     * Returns the qualified name of the generator.
+     * Returns the qualified name of the outlet.
      *
-     * @return the qualified name of the generator, not null.
+     * @return the qualified name of the outlet, not null.
      */
     public QualifiedName getName()
     {
@@ -79,9 +79,9 @@ public class GeneratorReference
     }
 
     /**
-     * Returns the namespace under which the generator executes.
+     * Returns the namespace under which the outlet executes.
      *
-     * @return the namespace under which the generator executes.
+     * @return the namespace under which the outlet executes.
      */
     public Namespace getNamespace()
     {

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/GeneratorReferenceSaxHandler.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/GeneratorReferenceSaxHandler.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/GeneratorReferenceSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutletReferenceSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,23 +19,23 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.controller.OutputConfigurationTags.GENERATOR_TAG;
+import static org.apache.torque.generator.configuration.controller.OutputConfigurationTags.OUTLET_TAG;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
- * Reads a Generator reference file from the controller
+ * Reads a Outlet reference file from the controller
  * configuration file.
  */
-public class GeneratorReferenceSaxHandler extends DefaultHandler
+public class OutletReferenceSaxHandler extends DefaultHandler
 {
     /**
-     * The generator reference which is currently populated,
-     * or null if no generator reference is currently populated.
+     * The outlet reference which is currently populated,
+     * or null if no outlet reference is currently populated.
      */
-    private GeneratorReference generatorReference;
+    private OutletReference outletReference;
 
     /**
      * Whether the complete XML snippet which should be parsed by this
@@ -51,11 +51,10 @@ public class GeneratorReferenceSaxHandle
                              Attributes attributes)
             throws SAXException
     {
-        if (GENERATOR_TAG.equals(rawName))
+        if (OUTLET_TAG.equals(rawName))
         {
             String name = attributes.getValue("name");
-            generatorReference
-                    = new GeneratorReference(name);
+            outletReference = new OutletReference(name);
         }
         else
         {
@@ -70,21 +69,21 @@ public class GeneratorReferenceSaxHandle
     public void endElement(String uri, String localName, String rawName)
         throws SAXException
     {
-        if (GENERATOR_TAG.equals(rawName))
+        if (OUTLET_TAG.equals(rawName))
         {
             finished = true;
         }
     }
 
     /**
-     * Returns the generator reference which was filled by this handler.
+     * Returns the outlet reference which was filled by this handler.
      *
-     * @return the generator reference which was filled by this handler,
+     * @return the outlet reference which was filled by this handler,
      *         not null.
      */
-    public GeneratorReference getGeneratorReference()
+    public OutletReference getOutletReference()
     {
-        return generatorReference;
+        return outletReference;
     }
 
     /**

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Output.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +19,9 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import org.apache.torque.gf.generator.Generator;
-import org.apache.torque.gf.qname.QualifiedName;
-import org.apache.torque.gf.source.Sources;
+import org.apache.torque.generator.outlet.Outlet;
+import org.apache.torque.generator.qname.QualifiedName;
+import org.apache.torque.generator.source.Sources;
 
 /**
  * The configuration for an output (typically one or more files).
@@ -39,21 +39,21 @@ public class Output
     private Sources sources;
 
     /**
-     * The generator which generates the content.
+     * The outlet which generates the content.
      */
-    private GeneratorReference contentGenerator;
+    private OutletReference contentOutlet;
 
     /**
-     * The generator which generates the filename, or null if the
+     * The outlet which generates the filename, or null if the
      * path to the generated file is explicitly given in <code>path</code>.
      */
-    private Generator filenameGenerator;
+    private Outlet filenameOutlet;
 
     /**
      * The filename of the generated file, or null if the filename must
-     * still be generated using a filenameGenerator.
+     * still be generated using a filenameOutlet.
      * This attribute is also used to store the generated filename
-     * if it was generated using the filenameGenerator.
+     * if it was generated using the filenameOutlet.
      */
     private String filename;
 
@@ -107,7 +107,7 @@ public class Output
     /**
      * Sets the name of the file to generate.
      * This is also used to store the generated filename
-     * if it was generated using the filenameGenerator.
+     * if it was generated using the filenameOutlet.
      *
      * @param filename the name of the file to generate.
      */
@@ -118,7 +118,7 @@ public class Output
 
     /**
      * Returns the name of the file to generate. Either this name was
-     * given explicitly or it was set using the filenameGenerator.
+     * given explicitly or it was set using the filenameOutlet.
      *
      * @return the name of the file to generate.
      */
@@ -128,50 +128,50 @@ public class Output
     }
 
     /**
-     * Returns the reference to the generator which should produce the content.
+     * Returns the reference to the outlet which should produce the content.
      *
-     * @return the reference to the generator responsible for producing the
+     * @return the reference to the outlet responsible for producing the
      *         content.
      */
-    public GeneratorReference getContentGenerator()
+    public OutletReference getContentOutlet()
     {
-        return contentGenerator;
+        return contentOutlet;
     }
 
     /**
-     * Sets the reference to the generator which should produce the content.
+     * Sets the reference to the outlet which should produce the content.
      *
-     * @param contentGenerator the reference to the generator responsible
+     * @param contentOutlet the reference to the outlet responsible
      *        for producing the content.
      */
-    public void setContentGenerator(GeneratorReference contentGenerator)
+    public void setContentOutlet(OutletReference contentOutlet)
     {
-        this.contentGenerator = contentGenerator;
+        this.contentOutlet = contentOutlet;
     }
 
     /**
-     * Returns the reference to the generator which should produce
+     * Returns the reference to the outlet which should produce
      * the file name. If this attribute is set, it takes precedence over a
      * set filename.
      *
-     * @return the reference to the generator responsible for producing the
+     * @return the reference to the outlet responsible for producing the
      *         file name, or null if the file name is explicitly given.
      */
-    public Generator getFilenameGenerator()
+    public Outlet getFilenameOutlet()
     {
-        return filenameGenerator;
+        return filenameOutlet;
     }
 
     /**
-     * Sets the reference to the generator which should produce
+     * Sets the reference to the outlet which should produce
      * the file name.
      *
-     * @param filenameGenerator the reference to the generator responsible
+     * @param filenameOutlet the reference to the outlet responsible
      *        for producing the file name.
      */
-    public void setFilenameGenerator(Generator filenameGenerator)
+    public void setFilenameOutlet(Outlet filenameOutlet)
     {
-        this.filenameGenerator = filenameGenerator;
+        this.filenameOutlet = filenameOutlet;
     }
 
     /**
@@ -217,10 +217,10 @@ public class Output
         StringBuffer result = new StringBuffer();
         result.append("(OutputFile: sources=").append(sources)
                 .append(",skipIfExists=").append(skipIfExists)
-                .append(",filenameGenerator=")
-                .append(filenameGenerator)
-                .append(",contentGenerator=")
-                .append(contentGenerator).append(")");
+                .append(",filenameOutlet=")
+                .append(filenameOutlet)
+                .append(",contentOutlet=")
+                .append(contentOutlet).append(")");
         return result.toString();
     }
 }

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputConfigurationTags.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -43,9 +43,9 @@ public final class OutputConfigurationTa
     /** Attribute name for the "file" attribute. */
     public static final String FILE_ATTRIBUTE = "file";
 
-    /** Tag name for the "generator" tag. */
-    public static final String GENERATOR_TAG = "generator";
+    /** Tag name for the "outlet" tag. */
+    public static final String OUTLET_TAG = "outlet";
 
-    /** Tag name for the "filenameGenerator" tag. */
-    public static final String FILENAME_GENERATOR_TAG = "filenameGenerator";
+    /** Tag name for the "filenameOutlet" tag. */
+    public static final String FILENAME_GENERATOR_TAG = "filenameOutlet";
 }

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/OutputSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,21 +19,21 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.controller.OutputConfigurationTags.FILENAME_GENERATOR_TAG;
-import static org.apache.torque.gf.configuration.controller.OutputConfigurationTags.FILE_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.controller.OutputConfigurationTags.GENERATOR_TAG;
-import static org.apache.torque.gf.configuration.controller.OutputConfigurationTags.NAME_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.controller.OutputConfigurationTags.OUTPUT_TAG;
-import static org.apache.torque.gf.configuration.controller.OutputConfigurationTags.SKIP_IF_EXISTS_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.SOURCE_TAG;
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.INPUT_TAG;
-
-import org.apache.torque.gf.configuration.ConfigurationHandlers;
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.generator.GeneratorConfigurationSaxHandler;
-import org.apache.torque.gf.configuration.generator.GeneratorSaxHandler;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.qname.QualifiedName;
+import static org.apache.torque.generator.configuration.controller.OutputConfigurationTags.FILENAME_GENERATOR_TAG;
+import static org.apache.torque.generator.configuration.controller.OutputConfigurationTags.FILE_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.controller.OutputConfigurationTags.NAME_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.controller.OutputConfigurationTags.OUTLET_TAG;
+import static org.apache.torque.generator.configuration.controller.OutputConfigurationTags.OUTPUT_TAG;
+import static org.apache.torque.generator.configuration.controller.OutputConfigurationTags.SKIP_IF_EXISTS_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.SOURCE_TAG;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.INPUT_TAG;
+
+import org.apache.torque.generator.configuration.ConfigurationHandlers;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.outlet.OutletConfigurationSaxHandler;
+import org.apache.torque.generator.configuration.outlet.OutletSaxHandler;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.qname.QualifiedName;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -43,10 +43,10 @@ import org.xml.sax.helpers.DefaultHandle
  */
 public class OutputSaxHandler extends DefaultHandler
 {
-    /** The qualified name for the filename generator. */
-    private static final QualifiedName FILENAME_GENERATOR_NAME
+    /** The qualified name for the filename outlet. */
+    private static final QualifiedName FILENAME_OUTLET_NAME
             = new QualifiedName(
-                "org.apache.torque.gf.configuration.filenameGenerator");
+                "org.apache.torque.generator.configuration.filenameOutlet");
 
     /** The access object for the configuration files, not null. */
     private ConfigurationProvider configurationProvider;
@@ -61,10 +61,10 @@ public class OutputSaxHandler extends De
     private Output output;
 
     /**
-     * The SAX handler which handles the reference to the content generator,
-     * or null if no content generator is currently processed.
+     * The SAX handler which handles the reference to the content outlet,
+     * or null if no content outlet is currently processed.
      */
-    private GeneratorReferenceSaxHandler contentGeneratorSaxHandler;
+    private OutletReferenceSaxHandler contentOutletSaxHandler;
 
     /**
      * The SAX handler which handles source tags, or null if source tags
@@ -73,11 +73,11 @@ public class OutputSaxHandler extends De
     private SourceSaxHandler sourceSaxHandler;
 
     /**
-     * The SAX handler which handles the filename generator configuration,
-     * or null if filename generator tags need not be handled
+     * The SAX handler which handles the filename outlet configuration,
+     * or null if filename outlet tags need not be handled
      * in the current context.
      */
-    private GeneratorSaxHandler filenameGeneratorSaxHandler;
+    private OutletSaxHandler filenameOutletSaxHandler;
 
     /**
      * Constructor.
@@ -85,8 +85,7 @@ public class OutputSaxHandler extends De
      * @param configurationProvider The access object for the configuration
      *        files, not null.
      * @param projectPaths The paths of the surrounding project, not null.
-     * @param generatorTypes the configured types of generators, not null.
-     * @param sourceTypes All known source types, not null.
+     * @param configurationHandlers handlers for reading the configuration.
      *
      * @throws NullPointerException if an argument is null.
      */
@@ -137,17 +136,17 @@ public class OutputSaxHandler extends De
             Attributes attributes)
         throws SAXException
     {
-        if (contentGeneratorSaxHandler != null)
+        if (contentOutletSaxHandler != null)
         {
-            contentGeneratorSaxHandler.startElement(
+            contentOutletSaxHandler.startElement(
                     uri,
                     localName,
                     rawName,
                     attributes);
         }
-        else if (filenameGeneratorSaxHandler != null)
+        else if (filenameOutletSaxHandler != null)
         {
-            filenameGeneratorSaxHandler.startElement(
+            filenameOutletSaxHandler.startElement(
                     uri,
                     localName,
                     rawName,
@@ -192,11 +191,11 @@ public class OutputSaxHandler extends De
                     configurationHandlers);
             sourceSaxHandler.startElement(uri, localName, rawName, attributes);
         }
-        else if (GENERATOR_TAG.equals(rawName))
+        else if (OUTLET_TAG.equals(rawName))
         {
-            contentGeneratorSaxHandler
-                    = new GeneratorReferenceSaxHandler();
-            contentGeneratorSaxHandler.startElement(
+            contentOutletSaxHandler
+                    = new OutletReferenceSaxHandler();
+            contentOutletSaxHandler.startElement(
                     uri,
                     localName,
                     rawName,
@@ -204,19 +203,19 @@ public class OutputSaxHandler extends De
         }
         else if (FILENAME_GENERATOR_TAG.equals(rawName))
         {
-            GeneratorConfigurationSaxHandler generatorConfigurationSaxHandler
-                    = new GeneratorConfigurationSaxHandler(
+            OutletConfigurationSaxHandler outletConfigurationSaxHandler
+                    = new OutletConfigurationSaxHandler(
                             configurationProvider,
                             projectPaths,
                             configurationHandlers);
-            String generatorType
-                    = GeneratorConfigurationSaxHandler.getGeneratorType(
+            String outletType
+                    = OutletConfigurationSaxHandler.getOutletType(
                             attributes);
-            filenameGeneratorSaxHandler
-                    = generatorConfigurationSaxHandler.getGeneratorHandler(
-                            FILENAME_GENERATOR_NAME,
-                            generatorType);
-            filenameGeneratorSaxHandler.startElement(
+            filenameOutletSaxHandler
+                    = outletConfigurationSaxHandler.getOutletHandler(
+                            FILENAME_OUTLET_NAME,
+                            outletType);
+            filenameOutletSaxHandler.startElement(
                     uri,
                     localName,
                     rawName,
@@ -235,18 +234,18 @@ public class OutputSaxHandler extends De
     public void endElement(String uri, String localName, String rawName)
         throws SAXException
     {
-        if (contentGeneratorSaxHandler != null)
+        if (contentOutletSaxHandler != null)
         {
-            contentGeneratorSaxHandler.endElement(
+            contentOutletSaxHandler.endElement(
                     uri,
                     localName,
                     rawName);
-            if (contentGeneratorSaxHandler.isFinished())
+            if (contentOutletSaxHandler.isFinished())
             {
-                output.setContentGenerator(
-                        contentGeneratorSaxHandler
-                            .getGeneratorReference());
-                contentGeneratorSaxHandler = null;
+                output.setContentOutlet(
+                        contentOutletSaxHandler
+                            .getOutletReference());
+                contentOutletSaxHandler = null;
             }
         }
         else if (sourceSaxHandler != null)
@@ -258,15 +257,15 @@ public class OutputSaxHandler extends De
                 sourceSaxHandler = null;
             }
         }
-        else if (filenameGeneratorSaxHandler != null)
+        else if (filenameOutletSaxHandler != null)
         {
-            filenameGeneratorSaxHandler.endElement(uri, localName, rawName);
-            if (filenameGeneratorSaxHandler.isFinished())
+            filenameOutletSaxHandler.endElement(uri, localName, rawName);
+            if (filenameOutletSaxHandler.isFinished())
             {
-                output.setFilenameGenerator(
-                        filenameGeneratorSaxHandler
-                            .getGenerator());
-                filenameGeneratorSaxHandler = null;
+                output.setFilenameOutlet(
+                        filenameOutletSaxHandler
+                            .getOutlet());
+                filenameOutletSaxHandler = null;
             }
         }
     }
@@ -278,18 +277,18 @@ public class OutputSaxHandler extends De
     public void characters(char[] ch, int start, int length)
             throws SAXException
     {
-        if (contentGeneratorSaxHandler != null)
+        if (contentOutletSaxHandler != null)
         {
-            contentGeneratorSaxHandler.characters(
+            contentOutletSaxHandler.characters(
                     ch, start, length);
         }
         else if (sourceSaxHandler != null)
         {
             sourceSaxHandler.characters(ch, start, length);
         }
-        else if (filenameGeneratorSaxHandler != null)
+        else if (filenameOutletSaxHandler != null)
         {
-            filenameGeneratorSaxHandler.characters(ch, start, length);
+            filenameOutletSaxHandler.characters(ch, start, length);
         }
     }
 }

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/SourceConfigurationTags.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/SourceConfigurationTags.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/SourceConfigurationTags.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/SourceConfigurationTags.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/SourceSaxHandler.java (from r916202, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/SourceSaxHandler.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/SourceSaxHandler.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/SourceSaxHandler.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/SourceSaxHandler.java&r1=916202&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/controller/SourceSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/SourceSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,28 +19,28 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.ELEMENTS_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.SOURCE_FILTER_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.SOURCE_TAG;
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.TRANSFORMER_TAG;
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.TYPE_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.INCLUDE_TAG;
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.EXCLUDE_TAG;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.ELEMENTS_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.EXCLUDE_TAG;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.INCLUDE_TAG;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.SOURCE_FILTER_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.SOURCE_TAG;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.TRANSFORMER_TAG;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.TYPE_ATTRIBUTE;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.ConfigurationHandlers;
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.file.Fileset;
-import org.apache.torque.gf.source.FileSourcesImpl;
-import org.apache.torque.gf.source.SourceType;
-import org.apache.torque.gf.source.Sources;
-import org.apache.torque.gf.source.TransformerDefinition;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.ConfigurationHandlers;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.file.Fileset;
+import org.apache.torque.generator.source.FileSourcesImpl;
+import org.apache.torque.generator.source.SourceType;
+import org.apache.torque.generator.source.Sources;
+import org.apache.torque.generator.source.TransformerDefinition;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/TransformerSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/TransformerSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/TransformerSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/TransformerSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.controller;
+package org.apache.torque.generator.configuration.controller;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +19,9 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.ELEMENTS_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.TRANSFORMER_CLASS_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.controller.SourceConfigurationTags.TRANSFORMER_TAG;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.ELEMENTS_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.TRANSFORMER_CLASS_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.controller.SourceConfigurationTags.TRANSFORMER_TAG;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -30,9 +30,9 @@ import org.apache.commons.beanutils.Bean
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.source.transform.SourceTransformer;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.source.transform.SourceTransformer;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -159,7 +159,7 @@ public class TransformerSaxHandler exten
             {
                 throw new SAXException("error while setting Property "
                         + propertyName
-                        + " for java generator "
+                        + " for java transformer "
                         + sourceTransformer.getClass().getName()
                         + " with value "
                         + propertyValue.toString(),
@@ -169,7 +169,7 @@ public class TransformerSaxHandler exten
             {
                 throw new SAXException("error while setting Property "
                         + propertyName
-                        + " for java generator "
+                        + " for java transformer "
                         + sourceTransformer.getClass().getName()
                         + " with value "
                         + propertyValue.toString(),

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/package.html
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/package.html?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/package.html Sun May 16 15:35:27 2010
@@ -15,12 +15,12 @@
 -->
 <html>
   <head>
-    <title>Accessing Torque-gf control configuration</title>
+    <title>Accessing the Torque generator control configuration</title>
   </head>
   <body>
     <p>
-      This package contains the classes for reading control configuration of
-      Torque-gf units of generation.
+      This package contains the classes for reading the control configuration of
+      the Torque generator units of generation.
     </p>
   </body>
 </html>

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.mergepoint;
+package org.apache.torque.generator.configuration.mergepoint;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package org.apache.torque.gf.configurati
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.control.action.MergepointAction;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.control.action.MergepointAction;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.mergepoint;
+package org.apache.torque.generator.configuration.mergepoint;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.ConfigurationException;
 
 /**
  * A registry of ActionSaxHandlerFactories.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactory.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.mergepoint;
+package org.apache.torque.generator.configuration.mergepoint;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -64,7 +64,7 @@ public abstract interface ActionSaxHandl
      *
      * @return a SAX delegate handler for parsing the configuration with the
      *           given type.
-     * @throws SAXException if the SAX Handler for the generator can
+     * @throws SAXException if the SAX Handler for the outlet can
      *           not be created from the given XML element.
      */
     ActionSaxHandler getActionSaxHandler(

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.mergepoint;
+package org.apache.torque.generator.configuration.mergepoint;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,15 +19,15 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.ACTION_GENERATOR_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.ACTION_ELEMENT_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.ACTION_ACCEPT_NOT_SET_ATTRIBUTE;
-
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.SaxHelper;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.control.action.ApplyAction;
-import org.apache.torque.gf.control.action.MergepointAction;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_ACCEPT_NOT_SET_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_ELEMENT_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_OUTLET_ATTRIBUTE;
+
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.SaxHelper;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.control.action.ApplyAction;
+import org.apache.torque.generator.control.action.MergepointAction;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -82,13 +82,13 @@ public class ApplyActionSaxHandler exten
     private static MergepointAction createAction(Attributes attributes)
             throws SAXException
     {
-        String generator = attributes.getValue(ACTION_GENERATOR_ATTRIBUTE);
+        String outlet = attributes.getValue(ACTION_OUTLET_ATTRIBUTE);
         String element = attributes.getValue(ACTION_ELEMENT_ATTRIBUTE);
         Boolean acceptNotSet = SaxHelper.getBooleanAttribute(
                 ACTION_ACCEPT_NOT_SET_ATTRIBUTE,
                 attributes,
                 "the element " + element);
-        ApplyAction action = new ApplyAction(element, generator, acceptNotSet);
+        ApplyAction action = new ApplyAction(element, outlet, acceptNotSet);
         return action;
     }
 

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ApplyActionSaxHandlerFactory.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.mergepoint;
+package org.apache.torque.generator.configuration.mergepoint;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -31,14 +31,14 @@ public class ApplyActionSaxHandlerFactor
         implements ActionSaxHandlerFactory
 {
     /**
-     * The type of the generators which can be processed by the
+     * The type of the actions which can be processed by the
      * ActionSaxHandlers created by this factory.
      */
     private static final String ACTION_TYPE = "applyAction";
 
     /**
-     * Returns the generator type which can be handled by the
-     * GeneratorSaxHandlers created by this factory.
+     * Returns the action type which can be handled by the
+     * ActionSaxHandlers created by this factory.
      * @return "applyAction".
      */
     public String getType()
@@ -82,5 +82,4 @@ public class ApplyActionSaxHandlerFactor
                 configurationProvider,
                 projectPaths);
     }
-
 }

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointConfigurationTags.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointConfigurationTags.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointConfigurationTags.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointConfigurationTags.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.mergepoint;
+package org.apache.torque.generator.configuration.mergepoint;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -43,8 +43,8 @@ public final class MergepointConfigurati
     /** Attribute name for the "type" attribute of the "action" tag. */
     public static final String ACTION_TYPE_ATTRIBUTE = "type";
 
-    /** Attribute name for the "generator" attribute of the "action" tag. */
-    public static final String ACTION_GENERATOR_ATTRIBUTE = "generator";
+    /** Attribute name for the "outlet" attribute of the "action" tag. */
+    public static final String ACTION_OUTLET_ATTRIBUTE = "outlet";
 
     /** Attribute name for the "attribute" attribute of the "action" tag. */
     public static final String ACTION_ATTRIBUTE_ATTRIBUTE = "attribute";

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointMapping.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.mergepoint;
+package org.apache.torque.generator.configuration.mergepoint;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package org.apache.torque.gf.configurati
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.torque.gf.control.action.MergepointAction;
+import org.apache.torque.generator.control.action.MergepointAction;
 
 /**
  * A mapping between the name of an mergepoint and and the action which should

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/MergepointSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.mergepoint;
+package org.apache.torque.generator.configuration.mergepoint;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,19 +19,19 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.ACTION_TAG;
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.MERGEPOINT_NAME_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.MERGEPOINT_TAG;
-
-import org.apache.torque.gf.configuration.ConfigurationHandlers;
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.XMLConstants;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_TAG;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.MERGEPOINT_NAME_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.MERGEPOINT_TAG;
+
+import org.apache.torque.generator.configuration.ConfigurationHandlers;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.XMLConstants;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
 /**
- * A SAX Handler which processes a mergepoint configuration in a generator.
+ * A SAX Handler which processes a mergepoint configuration in an outlet.
  */
 public class MergepointSaxHandler
 {
@@ -125,7 +125,7 @@ public class MergepointSaxHandler
      * Callback method which is called by the SAX parser if an XML element is
      * started.
      * If a known element is encountered, its settings are read and applied to
-     * the generator; if an unknown element is encountered, a SaxException is
+     * the mergepoint; if an unknown element is encountered, a SaxException is
      * thrown.
      *
      * @param uri The namespace URI of the started element,

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.mergepoint;
+package org.apache.torque.generator.configuration.mergepoint;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,13 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.ACTION_ACCEPT_NOT_SET_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.ACTION_OPTION_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_ACCEPT_NOT_SET_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_OPTION_ATTRIBUTE;
 
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.SaxHelper;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.control.action.OptionAction;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.SaxHelper;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.control.action.OptionAction;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionActionSaxHandlerFactory.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.mergepoint;
+package org.apache.torque.generator.configuration.mergepoint;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -31,14 +31,14 @@ public class OptionActionSaxHandlerFacto
         implements ActionSaxHandlerFactory
 {
     /**
-     * The type of the generators which can be processed by the
+     * The type of the actions which can be processed by the
      * ActionSaxHandlers created by this factory.
      */
     private static final String ACTION_TYPE = "optionAction";
 
     /**
-     * Returns the generator type which can be handled by the
-     * GeneratorSaxHandlers created by this factory.
+     * Returns the action type which can be handled by the
+     * ActionSaxHandlers created by this factory.
      * @return "optionAction".
      */
     public String getType()



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