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 [4/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/outlet/OutletConfigurationXmlParser.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationXmlParser.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationXmlParser.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationXmlParser.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.generator;
+package org.apache.torque.generator.configuration.outlet;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -31,12 +31,12 @@ 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.mergepoint.MergepointMapping;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.generator.Generator;
+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.mergepoint.MergepointMapping;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.outlet.Outlet;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXNotRecognizedException;
@@ -44,19 +44,19 @@ import org.xml.sax.SAXNotSupportedExcept
 import org.xml.sax.SAXParseException;
 
 /**
- * Parses generator configuration files and creates a GeneratorConfiguration.
+ * Parses outlet configuration files and creates a OutletConfiguration.
  */
-public class GeneratorConfigurationXmlParser
+public class OutletConfigurationXmlParser
 {
     /**
      * The SaxParserFactory to create the sax parsers for reading in the
-     * generator configuration files.
+     * outlet configuration files.
      */
     private static SAXParserFactory saxFactory;
 
     /** The logger. */
     private static Log log
-            = LogFactory.getLog(GeneratorConfigurationXmlParser.class);
+            = LogFactory.getLog(OutletConfigurationXmlParser.class);
 
     static
     {
@@ -85,23 +85,23 @@ public class GeneratorConfigurationXmlPa
     }
 
     /**
-     * Reads all generator configuration files creates the generator
+     * Reads all outlet configuration files and creates the outlet
      * configuration from them.
-     * All the generator configuration files known to the provide are parsed.
-     * These are typically all XML files in the generator configuration
+     * All the outlet configuration files known to the provide are parsed.
+     * These are typically all XML files in the outletDefintiton configuration
      * directory and its subdirectories.
      *
      * @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 outletTypes the configured types of outlets, not null.
      *
-     * @return the generator configuration.
+     * @return the outlet configuration.
      *
      * @throws ConfigurationException if the Configuration cannot be read
-     *           or errors exists in the generator configuration files.
+     *         or errors exists in the outlet configuration files.
      */
-    public GeneratorConfiguration readGeneratorConfiguration(
+    public OutletConfiguration readOutletConfiguration(
             ConfigurationProvider configurationProvider,
             ProjectPaths projectPaths,
             ConfigurationHandlers configurationHandlers)
@@ -109,54 +109,54 @@ public class GeneratorConfigurationXmlPa
     {
         if (configurationHandlers == null)
         {
-            log.error("GeneratorConfiguration: "
+            log.error("OutletConfiguration: "
                     + " configurationHandlers is null");
-            throw new NullPointerException("generatorTypes is null");
+            throw new NullPointerException("configurationHandlers is null");
         }
         if (configurationProvider == null)
         {
-            log.error("GeneratorConfiguration: "
+            log.error("OutletConfiguration: "
                     + " configurationProvider is null");
             throw new NullPointerException("configurationProvider is null");
         }
         if (projectPaths == null)
         {
-            log.error("GeneratorConfiguration: "
+            log.error("OutletConfiguration: "
                     + " projectPaths is null");
             throw new NullPointerException("projectPaths is null");
         }
 
-        List<Generator> allGenerators = new ArrayList<Generator>();
+        List<Outlet> allOutlets = new ArrayList<Outlet>();
         List<MergepointMapping> allMergepointMappings
                 = new ArrayList<MergepointMapping>();
 
-        // Generators from all files
-        Collection<String> generatorConfigNames
-                = configurationProvider.getGeneratorConfigurationNames();
+        // Outlets from all files
+        Collection<String> outletConfigNames
+                = configurationProvider.getOutletConfigurationNames();
 
-        for (String generatorConfigName : generatorConfigNames)
+        for (String outletConfigName : outletConfigNames)
         {
             InputStream inputStream = null;
             try
             {
                 inputStream
-                        = configurationProvider.getGeneratorConfigurationInputStream(
-                            generatorConfigName);
-                GeneratorConfigFileContent fileContent
-                        = readGeneratorConfig(
+                        = configurationProvider.getOutletConfigurationInputStream(
+                            outletConfigName);
+                OutletConfigFileContent fileContent
+                        = readOutletConfig(
                                 inputStream,
                                 configurationProvider,
                                 projectPaths,
                                 configurationHandlers);
-                allGenerators.addAll(fileContent.getGenerators());
+                allOutlets.addAll(fileContent.getOutlets());
                 allMergepointMappings.addAll(
                         fileContent.getMergepointMappings());
             }
             catch (SAXParseException e)
             {
                 throw new ConfigurationException(
-                        "Error parsing generator configuration "
-                            + generatorConfigName
+                        "Error parsing outlet configuration "
+                            + outletConfigName
                             + " at line "
                             + e.getLineNumber()
                             + " column "
@@ -169,8 +169,8 @@ public class GeneratorConfigurationXmlPa
             catch (Exception e)
             {
                 throw new ConfigurationException(
-                        "Error parsing generator configuration "
-                            + generatorConfigName,
+                        "Error parsing outlet configuration "
+                            + outletConfigName,
                         e);
             }
             finally
@@ -184,29 +184,30 @@ public class GeneratorConfigurationXmlPa
                     catch (IOException e)
                     {
                         log.warn("Could not close "
-                                    + "generatorConfigurationInputStream "
-                                    + generatorConfigName,
+                                    + "outletConfigurationInputStream "
+                                    + outletConfigName,
                                 e);
                     }
                 }
             }
         }
-        return new GeneratorConfiguration(allGenerators, allMergepointMappings);
+        return new OutletConfiguration(allOutlets, allMergepointMappings);
     }
 
 
     /**
-     * Reads a generator configuration file and returns the generators
+     * Reads a outlet configuration file and returns the outlets
      * and isolated mergepoint mappings which are configured in this file.
      *
-     * @param generatorConfigurationInputStream the stream containing the
-     *        generator configuration.
+     * @param outletConfigurationInputStream the stream containing the
+     *        outlet configuration.
      * @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 configurationHandlers the handlers for reading the configuration,
+     *        not null.
      *
-     * @return All the generators and isolated mergepoint mappings
+     * @return All the outlets and isolated mergepoint mappings
      *         configured in the file.
      * @throws SAXException if an error occurs while parsing the configuration
      *         file.
@@ -214,36 +215,36 @@ public class GeneratorConfigurationXmlPa
      * @throws ParserConfigurationException if a serious parser configuration
      *         error occurs..
      */
-    private GeneratorConfigFileContent readGeneratorConfig(
-            InputStream generatorConfigurationInputStream,
+    private OutletConfigFileContent readOutletConfig(
+            InputStream outletConfigurationInputStream,
             ConfigurationProvider configurationProvider,
             ProjectPaths projectPaths,
             ConfigurationHandlers configurationHandlers)
         throws SAXException, IOException, ParserConfigurationException
     {
         SAXParser parser = saxFactory.newSAXParser();
-        GeneratorConfigurationSaxHandler saxHandler
-                = new GeneratorConfigurationSaxHandler(
+        OutletConfigurationSaxHandler saxHandler
+                = new OutletConfigurationSaxHandler(
                         configurationProvider,
                         projectPaths,
                         configurationHandlers);
-        InputSource is = new InputSource(generatorConfigurationInputStream);
+        InputSource is = new InputSource(outletConfigurationInputStream);
         parser.parse(is, saxHandler);
 
-        return new GeneratorConfigFileContent(
-                saxHandler.getGenerators(),
+        return new OutletConfigFileContent(
+                saxHandler.getOutlets(),
                 saxHandler.getMergepointMappings());
     }
 
     /**
-     * The parsed content of a generator definition file.
-     * Contains the parsed generators and the isolated
-     * (i.e. outside generator context) mergepoints.
+     * The parsed content of a outlet definition file.
+     * Contains the parsed outlets and the isolated
+     * (i.e. outside outlet context) mergepoints.
      */
-    private static final class GeneratorConfigFileContent
+    private static final class OutletConfigFileContent
     {
-        /** The parsed generators. */
-        private List<Generator> generators;
+        /** The parsed outlets. */
+        private List<Outlet> outlets;
 
         /** The parsed isolated mergepoint mappings. */
         private List<MergepointMapping> mergepointMappings;
@@ -251,25 +252,25 @@ public class GeneratorConfigurationXmlPa
         /**
          * Constructor.
          *
-         * @param generators the parsed generators.
+         * @param outlets the parsed outlets.
          * @param mergepointMappings the isolated mergepoint mappings.
          */
-        public GeneratorConfigFileContent(
-                List<Generator> generators,
+        public OutletConfigFileContent(
+                List<Outlet> outlets,
                 List<MergepointMapping> mergepointMappings)
         {
-            this.generators = generators;
+            this.outlets = outlets;
             this.mergepointMappings = mergepointMappings;
         }
 
         /**
-         * Returns the parsed generators.
+         * Returns the parsed outlets.
          *
-         * @return the parsed generators.
+         * @return the parsed outlets.
          */
-        public List<Generator> getGenerators()
+        public List<Outlet> getOutlets()
         {
-            return generators;
+            return outlets;
         }
 
         /**

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorSaxHandler.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorSaxHandler.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.generator;
+package org.apache.torque.generator.configuration.outlet;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,41 +19,41 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.INPUT_ELEMENT_NAME_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.INPUT_TAG;
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.MERGEPOINT_TAG;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.MERGEPOINT_TAG;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.INPUT_ELEMENT_NAME_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.INPUT_TAG;
 
 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.mergepoint.MergepointSaxHandler;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.generator.Generator;
-import org.apache.torque.gf.qname.QualifiedName;
+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.mergepoint.MergepointSaxHandler;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.outlet.Outlet;
+import org.apache.torque.generator.qname.QualifiedName;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
- * Handles a generator declaration within the generator configuration.
+ * Handles a outlet declaration within the outlet configuration.
  * Base class for more specific handlers.
  */
-public abstract class GeneratorSaxHandler extends DefaultHandler
+public abstract class OutletSaxHandler extends DefaultHandler
 {
     /** the logger for the class. */
-    private static Log log = LogFactory.getLog(GeneratorSaxHandler.class);
+    private static Log log = LogFactory.getLog(OutletSaxHandler.class);
 
     /**
-     * the name for the generator which configuration will be read in
+     * the name for the outlet which configuration will be read in
      *  by the generated SaxHandlerFactory, or null if the name
-     *  of the generator should be determined from the parsed XML.
+     *  of the outlet should be determined from the parsed XML.
      */
-    private QualifiedName generatorName;
+    private QualifiedName outletName;
 
-    /** the generator to be configured. */
-    private Generator generator;
+    /** the outlet to be configured. */
+    private Outlet outlet;
 
     /** The access object for the configuration files, not null. */
     private ConfigurationProvider configurationProvider;
@@ -70,20 +70,20 @@ public abstract class GeneratorSaxHandle
      */
     private MergepointSaxHandler mergepointSaxHandler;
 
-    /** whether we are past the end of the generator declaration. */
+    /** whether we are past the end of the outlet declaration. */
     private boolean finished = false;
 
     /**
-     * The raw name of the XML element which started the generator definition.
+     * The raw name of the XML element which started the outlet definition.
      */
     private String startTagRawName = null;
 
     /**
-     * Creates a GeneratorSaxHandler.
+     * Creates a OutletSaxHandler.
      *
-     * @param generatorName the name for the generator which configuration
+     * @param outletName the name for the outlet which configuration
      *        will be read in by the generated SaxHandlerFactory,
-     *        or null if the name of the generator should be determined from
+     *        or null if the name of the outlet should be determined from
      *        the parsed XML.
      * @param configurationProvider The access object for the configuration
      *        files, not null.
@@ -93,31 +93,31 @@ public abstract class GeneratorSaxHandle
      *
      * @throws NullPointerException if an argument is null.
      */
-    public GeneratorSaxHandler(
-            QualifiedName generatorName,
+    public OutletSaxHandler(
+            QualifiedName outletName,
             ConfigurationProvider configurationProvider,
             ProjectPaths projectPaths,
             ConfigurationHandlers configurationHandlers)
     {
         if (configurationProvider == null)
         {
-            log.error("GeneratorSaxHandler: "
+            log.error("OutletSaxHandler: "
                     + " configurationProvider is null");
             throw new NullPointerException("configurationProvider is null");
         }
         if (projectPaths == null)
         {
-            log.error("GeneratorSaxHandler: "
+            log.error("OutletSaxHandler: "
                     + " projectPaths is null");
             throw new NullPointerException("projectPaths is null");
         }
         if (configurationHandlers == null)
         {
-            log.error("GeneratorSaxHandler: "
+            log.error("OutletSaxHandler: "
                     + " configurationHandlers is null");
             throw new NullPointerException("configurationHandlers is null");
         }
-        this.generatorName = generatorName;
+        this.outletName = outletName;
         this.configurationProvider = configurationProvider;
         this.projectPaths = projectPaths;
         this.configurationHandlers = configurationHandlers;
@@ -137,8 +137,8 @@ public abstract class GeneratorSaxHandle
         if (startTagRawName == null)
         {
             startTagRawName = rawName;
-            generator = createGenerator(
-                    generatorName,
+            outlet = createOutlet(
+                    outletName,
                     uri,
                     localName,
                     rawName,
@@ -154,7 +154,7 @@ public abstract class GeneratorSaxHandle
                         + " must be set for the tag "
                         + INPUT_TAG);
             }
-            generator.setInputElementName(element);
+            outlet.setInputElementName(element);
         }
         else if (MERGEPOINT_TAG.equals(rawName))
         {
@@ -188,7 +188,7 @@ public abstract class GeneratorSaxHandle
             {
                 try
                 {
-                    generator.addMergepointMapping(
+                    outlet.addMergepointMapping(
                             mergepointSaxHandler.getMergepointMapping());
                 }
                 catch (ConfigurationException e)
@@ -208,9 +208,9 @@ public abstract class GeneratorSaxHandle
     }
 
     /**
-     * @param generatorName the name for the generator which configuration
+     * @param outletName the name for the outlet which configuration
      *        will be read in by the generated SaxHandlerFactory,
-     *        or null if the name of the generator should be determined from
+     *        or null if the name of the outlet should be determined from
      *        the parsed xml.
      * @param uri - The Namespace URI, or the empty string if the
      *        element has no Namespace URI or if Namespace processing is not
@@ -223,12 +223,12 @@ public abstract class GeneratorSaxHandle
      *          If there are no attributes, it shall be an empty Attributes
      *          object.
      *
-     * @return the generator, not null.
+     * @return the outlet, not null.
      *
-     * @throws  SAXException if the generator cannot be created.
+     * @throws  SAXException if the outlet cannot be created.
      */
-    protected abstract Generator createGenerator(
-            QualifiedName generatorName,
+    protected abstract Outlet createOutlet(
+            QualifiedName outletName,
             String uri,
             String localName,
             String rawName,
@@ -236,13 +236,13 @@ public abstract class GeneratorSaxHandle
         throws SAXException;
 
     /**
-     * Returns the generator being configured.
+     * Returns the outlet being configured.
      *
-     * @return the generator, not null.
+     * @return the outlet, not null.
      */
-    public Generator getGenerator()
+    public Outlet getOutlet()
     {
-        return generator;
+        return outlet;
     }
 
     /**
@@ -257,7 +257,7 @@ public abstract class GeneratorSaxHandle
     }
 
     /**
-     * Returns whether we are past the end of the generator configuration XML
+     * Returns whether we are past the end of the outlet configuration XML
      * snippet which we are parsing.
      *
      * @return true if the whole snippet has been processed, false otherwise.

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandlerFactory.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorSaxHandlerFactory.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandlerFactory.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandlerFactory.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorSaxHandlerFactory.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandlerFactory.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.generator;
+package org.apache.torque.generator.configuration.outlet;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,35 +19,35 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-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.qname.QualifiedName;
+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.qname.QualifiedName;
 import org.xml.sax.SAXException;
 
 /**
  * Classes implementing this interface are responsible for creating
- * <code>GeneratorSaxHandler</code>s for a specific generator type.
+ * <code>OutletSaxHandler</code>s for a specific outlet type.
  */
-public abstract interface GeneratorSaxHandlerFactory
+public abstract interface OutletSaxHandlerFactory
 {
     /**
-     * Returns the generator type handled by the GeneratorSaxHandlers which are
+     * Returns the outlet type handled by the OutletSaxHandlers which are
      * created by this factory.
      *
-     * @return the type of the generators, not null.
+     * @return the type of the outlets, not null.
      */
     String getType();
 
     /**
-     * Returns a GeneratorSaxHandler for reading in the configuration of
-     * a generator. The SAX Handler is used as a delegate handler
-     * whenever a generator element with the matching type
-     * is encountered in a generator configuration file.
+     * Returns a OutletSaxHandler for reading in the configuration of
+     * a outlet. The SAX Handler is used as a delegate handler
+     * whenever a outlet element with the matching type
+     * is encountered in a outlet configuration file.
      *
-     * @param generatorName the name for the generator which configuration
+     * @param outletName the name for the outlet which configuration
      *        will be read in by the generated SaxHandlerFactory,
-     *        or null if the name of the generator should be determined from
+     *        or null if the name of the outlet should be determined from
      *        the parsed xml.
      * @param configurationProvider The access object for the configuration
      *        files, not null.
@@ -57,11 +57,11 @@ public abstract interface GeneratorSaxHa
      *
      * @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.
      */
-    GeneratorSaxHandler getGeneratorSaxHandler(
-            QualifiedName generatorName,
+    OutletSaxHandler getOutletSaxHandler(
+            QualifiedName outletName,
             ConfigurationProvider configurationProvider,
             ProjectPaths projectPaths,
             ConfigurationHandlers configurationHandlers)

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/VelocityGeneratorSaxHandler.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/VelocityGeneratorSaxHandler.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/VelocityGeneratorSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.generator;
+package org.apache.torque.generator.configuration.outlet;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,35 +19,35 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.GENERATOR_ENCODING_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.GENERATOR_NAME_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.GENERATOR_OPTIONS_IN_CONTEXT_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.GENERATOR_PATH_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.GENERATOR_SOURCE_ATTRIBUTES_IN_CONTEXT_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.GENERATOR_VARIABLES_IN_CONTEXT_ATTRIBUTE;
-
-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.paths.ProjectPaths;
-import org.apache.torque.gf.qname.QualifiedName;
-import org.apache.torque.gf.template.velocity.VelocityGenerator;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.OUTLET_ENCODING_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.OUTLET_NAME_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.OUTLET_OPTIONS_IN_CONTEXT_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.OUTLET_PATH_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.OUTLET_SOURCE_ATTRIBUTES_IN_CONTEXT_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.OUTLET_VARIABLES_IN_CONTEXT_ATTRIBUTE;
+
+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.paths.ProjectPaths;
+import org.apache.torque.generator.qname.QualifiedName;
+import org.apache.torque.generator.template.velocity.VelocityOutlet;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
 /**
- * Handles a declaration of a velocity generator within a generator
+ * Handles a declaration of a velocity outlet within a outlet
  * configuration file.
  */
-class VelocityGeneratorSaxHandler extends GeneratorSaxHandler
+class VelocityOutletSaxHandler extends OutletSaxHandler
 {
     /**
      * Constructor.
      *
-     * @param generatorName the name for the generator which configuration
+     * @param outletName the name for the outlet which configuration
      *        will be read in by the generated SaxHandlerFactory,
-     *        or null if the name of the generator should be determined from
+     *        or null if the name of the outlet should be determined from
      *        the parsed XML.
      * @param configurationProvider The access object for the configuration
      *        files, not null.
@@ -55,27 +55,27 @@ class VelocityGeneratorSaxHandler extend
      * @param configurationHandlers the available configuration handlers,
      *        not null.
      *
-     * @throws SAXException if an error occurs during creation of the generator.
+     * @throws SAXException if an error occurs during creation of the outlet.
      */
-    public VelocityGeneratorSaxHandler(
-            QualifiedName generatorName,
+    public VelocityOutletSaxHandler(
+            QualifiedName outletName,
             ConfigurationProvider configurationProvider,
             ProjectPaths projectPaths,
             ConfigurationHandlers configurationHandlers)
        throws SAXException
     {
-        super(generatorName,
+        super(outletName,
                configurationProvider,
                projectPaths,
                configurationHandlers);
     }
 
     /**
-     * Instantiates and configures a velocity generator.
+     * Instantiates and configures a velocity outlet.
      *
-     * @param generatorName the name for the generator which configuration
+     * @param outletName the name for the outlet which configuration
      *        will be read in by the generated SaxHandlerFactory,
-     *        or null if the name of the generator should be determined from
+     *        or null if the name of the outlet should be determined from
      *        the parsed xml.
      * @param uri - The Namespace URI, or the empty string if the
      *        element has no Namespace URI or if Namespace processing is not
@@ -88,66 +88,66 @@ class VelocityGeneratorSaxHandler extend
      *          If there are no attributes, it shall be an empty Attributes
      *          object.
      *
-     * @return the created generator, not null.
+     * @return the created outlet, not null.
      *
      * @throws SAXException if an error occurs during creation.
      */
-    protected VelocityGenerator createGenerator(
-            QualifiedName generatorName,
+    protected VelocityOutlet createOutlet(
+            QualifiedName outletName,
             String uri,
             String localName,
             String rawName,
             Attributes attributes)
         throws SAXException
     {
-        if (generatorName == null)
+        if (outletName == null)
         {
             String nameAttribute
-                    = attributes.getValue(GENERATOR_NAME_ATTRIBUTE);
+                    = attributes.getValue(OUTLET_NAME_ATTRIBUTE);
             if (nameAttribute == null)
             {
                 throw new SAXException("The attribute "
-                        + GENERATOR_NAME_ATTRIBUTE
+                        + OUTLET_NAME_ATTRIBUTE
                         + " must be set on the element "
                         + rawName
-                        + " for Velocity Generators");
+                        + " for Velocity Outlets");
             }
-            generatorName = new QualifiedName(nameAttribute);
+            outletName = new QualifiedName(nameAttribute);
         }
 
-        String encoding = attributes.getValue(GENERATOR_ENCODING_ATTRIBUTE);
-        String path = attributes.getValue(GENERATOR_PATH_ATTRIBUTE);
+        String encoding = attributes.getValue(OUTLET_ENCODING_ATTRIBUTE);
+        String path = attributes.getValue(OUTLET_PATH_ATTRIBUTE);
 
         try
         {
-            VelocityGenerator result
-                    = new VelocityGenerator(
-                        generatorName,
+            VelocityOutlet result
+                    = new VelocityOutlet(
+                        outletName,
                         getConfigurationProvider(),
                         path,
                         encoding);
             Boolean optionsInContext = SaxHelper.getBooleanAttribute(
-                    GENERATOR_OPTIONS_IN_CONTEXT_ATTRIBUTE,
+                    OUTLET_OPTIONS_IN_CONTEXT_ATTRIBUTE,
                     attributes,
-                    "the velocityGenerator" + generatorName);
+                    "the velocityOutlet" + outletName);
             if (optionsInContext != null)
             {
                 result.setOptionsInContext(optionsInContext);
             }
             Boolean sourceElementAttributesInContext
                     = SaxHelper.getBooleanAttribute(
-                            GENERATOR_SOURCE_ATTRIBUTES_IN_CONTEXT_ATTRIBUTE,
+                            OUTLET_SOURCE_ATTRIBUTES_IN_CONTEXT_ATTRIBUTE,
                             attributes,
-                            "the velocityGenerator" + generatorName);
+                            "the velocityOutlet" + outletName);
             if (sourceElementAttributesInContext != null)
             {
                 result.setSourceAttributesInContext(
                         sourceElementAttributesInContext);
             }
             Boolean variablesInContext = SaxHelper.getBooleanAttribute(
-                    GENERATOR_VARIABLES_IN_CONTEXT_ATTRIBUTE,
+                    OUTLET_VARIABLES_IN_CONTEXT_ATTRIBUTE,
                     attributes,
-                    "the velocityGenerator" + generatorName);
+                    "the velocityOutlet" + outletName);
             if (variablesInContext != null)
             {
                 result.setVariablesInContext(variablesInContext);

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/VelocityGeneratorSaxHandlerFactory.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/VelocityGeneratorSaxHandlerFactory.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/VelocityGeneratorSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/VelocityOutletSaxHandlerFactory.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.generator;
+package org.apache.torque.generator.configuration.outlet;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,42 +19,43 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-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.qname.QualifiedName;
+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.qname.QualifiedName;
 import org.xml.sax.SAXException;
 
 /**
- * Creates Velocity generator SAX handlers.
+ * Creates Velocity outlet SAX handlers.
  */
-public class VelocityGeneratorSaxHandlerFactory
-        implements GeneratorSaxHandlerFactory
+public class VelocityOutletSaxHandlerFactory
+        implements OutletSaxHandlerFactory
 {
     /**
-     * The type of the generators which can be processed by the
-     * GeneratorSaxHandlers created by this factory.
+     * The type of the outlets which can be processed by the
+     * OutletSaxHandlers created by this factory.
      */
-    private static final String GENERATOR_TYPE = "velocityGenerator";
+    private static final String OUTLET_TYPE = "velocityOutlet";
 
     /**
-     * Returns the generator type which can be handled by the
-     * GeneratorSaxHandlers created by this factory.
-     * @return "velocityGenerator".
+     * Returns the outlet type which can be handled by the
+     * OutletSaxHandlers created by this factory.
+     *
+     * @return "velocityOutlet".
      */
     public String getType()
     {
-        return GENERATOR_TYPE;
+        return OUTLET_TYPE;
     }
 
     /**
-     * Returns a VelocityGeneratorSaxHandler for reading the configuration of
-     * Velocity generators. This implementation uses the provided name
-     * as generator name.
+     * Returns a VelocityOutletSaxHandler for reading the configuration of
+     * Velocity outlets. This implementation uses the provided name
+     * as outlet name.
      *
-     * @param generatorName the name for the generator which configuration
+     * @param outletName the name for the outlet which configuration
      *        will be read in by the generated SaxHandlerFactory,
-     *        or null if the name of the generator should be determined from
+     *        or null if the name of the outlet should be determined from
      *        the parsed xml.
      * @param configurationProvider The access object for the configuration
      *        files, not null.
@@ -62,17 +63,17 @@ public class VelocityGeneratorSaxHandler
      * @param configurationHandlers the available configuration handlers,
      *        not null.
      *
-     * @return a new VelocityGeneratorSaxHandler.
+     * @return a new VelocityOutletSaxHandler.
      */
-    public final GeneratorSaxHandler getGeneratorSaxHandler(
-            QualifiedName generatorName,
+    public final OutletSaxHandler getOutletSaxHandler(
+            QualifiedName outletName,
             ConfigurationProvider configurationProvider,
             ProjectPaths projectPaths,
             ConfigurationHandlers configurationHandlers)
          throws SAXException
     {
-        return new VelocityGeneratorSaxHandler(
-                generatorName,
+        return new VelocityOutletSaxHandler(
+                outletName,
                 configurationProvider,
                 projectPaths,
                 configurationHandlers);

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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/package.html (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/package.html)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/package.html?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/package.html&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/package.html&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/package.html Sun May 16 15:35:27 2010
@@ -15,11 +15,11 @@
 -->
 <html>
   <head>
-    <title>Configuring Torque-gf</title>
+    <title>Configuring the Torque generator</title>
   </head>
   <body>
     <p>
-      This package contains the classes for configuring Torque-gf.
+      This package contains the classes for configuring the Torque generator.
     </p>
   </body>
 </html>

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/CustomProjectPaths.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/CustomProjectPaths.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/CustomProjectPaths.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/CustomProjectPaths.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.paths;
+package org.apache.torque.generator.configuration.paths;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -69,9 +69,16 @@ public class CustomProjectPaths implemen
     /**
      * Constructor.
      * @param configurationDir the configuration directory for the Torque
-     *        generator files, or null.
+     *        generator configuration files, or null if the configuration files
+     *        are loaded from the classpath.
+     * @param configurationPackage the package containing the Torque
+     *        generator configuration files, or null if the configuration files
+     *        are loaded from the file system.
      * @param sourceDir the default directory for the source files, or null.
-     * @param targetDir the default directory for the generated files, or null.
+     * @param newFileTargetDir the default directory for the files
+     *        which are generated each time anew, or null for the default.
+     * @param modifiedFileTargetDir the default directory for the files
+     *        which are modified on generation., or null for the default.
      */
     public CustomProjectPaths(
             File configurationDir,
@@ -88,11 +95,12 @@ public class CustomProjectPaths implemen
     }
 
     /**
-     * Sets the root directory for the Torque generator files,
+     * Sets the root directory for the Torque generator configuration files,
      * absolute or relative to the project root.
      *
      * @param configurationDir the configuration directory for the Torque
-     *        generator files, null to invalidate the current setting.
+     *        generator configuration files, null to invalidate the current
+     *        setting.
      */
     public void setConfigurationDir(File configurationDir)
     {

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/paths/DefaultTorqueGfPaths.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/paths/DefaultTorqueGfPaths.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/paths/DefaultTorqueGfPaths.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/DefaultTorqueGeneratorPaths.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.paths;
+package org.apache.torque.generator.configuration.paths;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,15 +20,15 @@ package org.apache.torque.gf.configurati
  */
 
 /**
- * The default organization of the torque-gf directory.
+ * The default organization of the torque-generator directory.
  * This is:<br/>
- * - torque-gf root<br/>
+ * - torque-generator root<br/>
  * - - conf<br/>
  * - - - control.xml<br/>
- * - - generatorDefs<br/>
+ * - - outlets<br/>
  * - - templates<br/>
  */
-public class DefaultTorqueGfPaths implements TorqueGfPaths
+public class DefaultTorqueGeneratorPaths implements TorqueGeneratorPaths
 {
     /**
      * The path to the control configuration file, relative to the
@@ -38,22 +38,23 @@ public class DefaultTorqueGfPaths implem
         = "control.xml";
 
     /**
-     * The path to the template directory, relative to the torque-gf directory.
+     * The path to the template directory, relative to the torque-generator 
+     * root directory.
      */
     private static final String TEMPLATES_DIRECTORY = "templates";
 
     /**
      * The path to the configuration directory, relative to the
-     * torque-gf directory.
+     * torque-generator root directory.
      */
     private static final String CONFIGURATION_DIRECTORY = "conf";
 
     /**
-     * The path to the generator definitions directory, relative to the
+     * The path to the outlet definitions directory, relative to the
      * configuration root directory.
      */
-    private static final String GENERATOR_DEFS_DIRECTORY
-        = "generatorDefs";
+    private static final String OUTLET_DIRECTORY
+        = "outlets";
 
     public String getControlConfigurationFile()
     {
@@ -70,8 +71,8 @@ public class DefaultTorqueGfPaths implem
         return CONFIGURATION_DIRECTORY;
     }
 
-    public String getGeneratorDefDirectory()
+    public String getOutletDirectory()
     {
-        return GENERATOR_DEFS_DIRECTORY;
+        return OUTLET_DIRECTORY;
     }
 }

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

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.paths;
+package org.apache.torque.generator.configuration.paths;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Contains information of the default integration of the generator
+ * Contains information of the default integration of the Torque generator
  * into a maven 2 project.
  */
 public abstract class Maven2ProjectPaths implements ProjectPaths
@@ -38,7 +38,7 @@ public abstract class Maven2ProjectPaths
      * Default configuration root directory,
      * relative to the project root.
      */
-    protected static final String CONFIG_DIR = "src/main/torque-gf/";
+    protected static final String CONFIG_DIR = "src/main/torque-gen/";
 
     /**
      * Default generation source file directory,

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/ProjectPaths.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/ProjectPaths.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/ProjectPaths.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/ProjectPaths.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.paths;
+package org.apache.torque.generator.configuration.paths;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,30 +22,30 @@ package org.apache.torque.gf.configurati
 import java.io.File;
 
 /**
- * Provides the default paths which the code generator needs to interact with
+ * Provides the default paths which Torque generator needs to interact with
  * its surrounding project.
  * "Default" means that the settings can be overridden in a unit of generation.
- * NB: This object does not contain any information about how the code generator
+ * NB: This object does not contain any information about how the generator
  * configuration is organized internally.
  */
 public interface ProjectPaths
 {
     /**
-     * Returns the path to the generator configuration directory.
+     * Returns the path to the Torque generator configuration directory.
      * The path must either be absolute or relative to the current working
      * directory.
      *
-     * @return the path to the generator configuration; may (but must not)
-     *         be null if no configuration is contained in the surrounding
-     *         project; must be null if the configuration is read from the
-     *         class path.
+     * @return the path to the Torque generator configuration; 
+     *         may (but must not) be null if no configuration is contained
+     *         in the surrounding project; 
+     *         must be null if the configuration is read from the class path.
      */
     File getConfigurationPath();
 
     /**
-     * Returns the package of the generator configuration.
+     * Returns the package of the Torque generator configuration.
      *
-     * @return the package to the generator configuration. Must be null
+     * @return the package to the Torque generator configuration. Must be null
      *         if the configuration is read from the file system or from
      *         a jar file. Must not be null if the configuration is read
      *         from the class path.
@@ -53,12 +53,13 @@ public interface ProjectPaths
     String getConfigurationPackage();
 
     /**
-     * Returns the path to the default source directory for the generator.
+     * Returns the path to the default source directory for the 
+     * Torque generator.
      * The path must either be absolute or relative to the current working
      * directory.
-     * "Default" means that the setting
-     * can be overridden in a unit of generation. This usually points to a
-     * subdirectory where the sources are located.
+     * "Default" means that the setting can be overridden in a unit of 
+     * generation. This usually points to a subdirectory
+     * where the sources are located.
      *
      * @return the path for the source files, not null.
      */

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/TorqueGeneratorPaths.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/paths/TorqueGfPaths.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/TorqueGeneratorPaths.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/TorqueGeneratorPaths.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/paths/TorqueGfPaths.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/paths/TorqueGfPaths.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/TorqueGeneratorPaths.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.paths;
+package org.apache.torque.generator.configuration.paths;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package org.apache.torque.gf.configurati
 
 /**
  * The paths describing the internal organization (i.e. file paths)
- * of the orque-gf files.
+ * of the Torque generator files.
  */
-public interface TorqueGfPaths
+public interface TorqueGeneratorPaths
 {
     /**
      * Returns the path to the file containing the control configuration,
@@ -35,7 +35,7 @@ public interface TorqueGfPaths
 
     /**
      * Returns the path to the directory containing the templates,
-     * relative to the torque-gf directory.
+     * relative to the torque-gen directory.
      *
      * @return the path to the template directory. not null.
      */
@@ -43,18 +43,18 @@ public interface TorqueGfPaths
 
     /**
      * Returns the path to the directory containing the configuration,
-     * relative to the torque-gf directory.
+     * relative to the torque-gen directory.
      *
      * @return the path to the configuration directory. not null.
      */
     String getConfigurationDirectory();
 
     /**
-     * Returns the path to the directory containing the generator definitions,
-     * relative to the torque-gf directory.
+     * Returns the path to the directory containing the outlet definitions,
+     * relative to the Torque generator configuration directory.
      *
-     * @return the path to the generator definition directory. not null.
+     * @return the path to the outlet definition directory, not null.
      */
-    String getGeneratorDefDirectory();
+    String getOutletDirectory();
 
 }

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/package.html
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/package.html?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/package.html Sun May 16 15:35:27 2010
@@ -15,11 +15,11 @@
 -->
 <html>
   <head>
-    <title>Torque-gf configuration paths</title>
+    <title>Torque generator configuration paths</title>
   </head>
   <body>
     <p>
-      This package defines the directory structure of the Torque-gf
+      This package defines the directory structure of the Torque generator
       configuration and its surrounding project.
     </p>
   </body>

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java (from r930722, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/Controller.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/Controller.java&r1=930722&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/Controller.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control;
+package org.apache.torque.generator.control;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -29,24 +29,24 @@ import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.PropertyConfigurator;
-import org.apache.torque.gf.configuration.Configuration;
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.UnitConfiguration;
-import org.apache.torque.gf.configuration.UnitDescriptor;
-import org.apache.torque.gf.configuration.controller.GeneratorReference;
-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.generator.Generator;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.source.Source;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourceException;
-import org.apache.torque.gf.source.SourcePath;
-import org.apache.torque.gf.source.Sources;
-import org.apache.torque.gf.source.TransformerDefinition;
-import org.apache.torque.gf.source.transform.SourceTransformer;
-import org.apache.torque.gf.source.transform.SourceTransformerException;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.configuration.Configuration;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.UnitConfiguration;
+import org.apache.torque.generator.configuration.UnitDescriptor;
+import org.apache.torque.generator.configuration.controller.OutletReference;
+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.outlet.Outlet;
+import org.apache.torque.generator.source.Source;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.SourceException;
+import org.apache.torque.generator.source.SourcePath;
+import org.apache.torque.generator.source.Sources;
+import org.apache.torque.generator.source.TransformerDefinition;
+import org.apache.torque.generator.source.transform.SourceTransformer;
+import org.apache.torque.generator.source.transform.SourceTransformerException;
 
 /**
  * Reads the configuration and generates the output accordingly.
@@ -66,7 +66,7 @@ public class Controller
      *         processing.
      * @throws ConfigurationException if a ConfigurationException occurs during
      *         processing.
-     * @throws GeneratorException if a GeneratorException occurs during
+     * @throws GeneratorException if a OutletException occurs during
      *         processing.
      * @throws SourceException if a SourceException occurs during
      *         processing.
@@ -178,7 +178,7 @@ public class Controller
     {
         InputStream log4jStream
                 = Controller.class.getClassLoader().getResourceAsStream(
-                    "org/apache/torque/gf/log4j.properties");
+                    "org/apache/torque/generator/log4j.properties");
         Properties log4jProperties = new Properties();
         try
         {
@@ -201,7 +201,7 @@ public class Controller
      * @param output The output to  process, not null.
      *
      * @throws ConfigurationException if an incorrect configuration is
-     *         encountered, e.g. if neither filename nor filenameGenerator is
+     *         encountered, e.g. if neither filename nor filenameOutlet is
      *         set in output.
      * @throws GeneratorException if an error occurs during generation of
      *         the output filename.
@@ -211,12 +211,12 @@ public class Controller
                 ControllerState controllerState)
             throws GeneratorException
     {
-        if (output.getFilenameGenerator() == null)
+        if (output.getFilenameOutlet() == null)
         {
             if (output.getFilename() == null)
             {
                 throw new ConfigurationException(
-                    "neither filename nor filenameGenerator are set"
+                    "neither filename nor filenameOutlet are set"
                         + " on output" + output);
             }
         }
@@ -228,21 +228,21 @@ public class Controller
             }
             controllerState.setOutputFile(null);
 
-            Generator filenameGenerator
-                    = output.getFilenameGenerator();
-            GeneratorReference contentGeneratorReference
-                    = new GeneratorReference(
-                            filenameGenerator.getName());
-            controllerState.setRootGeneratorReference(
-                    contentGeneratorReference);
-            // use the namespace not of the filenameGenerator
-            // but of the real generator
+            Outlet filenameOutlet
+                    = output.getFilenameOutlet();
+            OutletReference contentOutletReference
+                    = new OutletReference(
+                            filenameOutlet.getName());
+            controllerState.setRootOutletReference(
+                    contentOutletReference);
+            // use the namespace not of the filenameOutlet
+            // but of the real outlet
             // TODO: is this a good idea ? make configurable ?
-            controllerState.setGeneratorNamespace(
-                    output.getContentGenerator().getNamespace());
-            filenameGenerator.beforeExecute(controllerState);
-            String filename = filenameGenerator.execute(controllerState);
-            filenameGenerator.afterExecute(controllerState);
+            controllerState.setOutletNamespace(
+                    output.getContentOutlet().getNamespace());
+            filenameOutlet.beforeExecute(controllerState);
+            String filename = filenameOutlet.execute(controllerState);
+            filenameOutlet.afterExecute(controllerState);
             if (log.isDebugEnabled())
             {
                 log.debug("End generation of Output File path, result is "
@@ -264,8 +264,8 @@ public class Controller
      * @param controllerState the current controller state, not null.
      *
      * @throws ControllerException if startElement is null or the configured
-     *         generator does not exist.
-     * @throws GeneratorException if the generator throws an exception
+     *         outlet does not exist.
+     * @throws GeneratorException if the outlet throws an exception
      *         during execution.
      * @throws IOException if the output directory cannot be created or the
      *         output file cannot be written.
@@ -316,24 +316,23 @@ public class Controller
                     + controllerState.getOutputFile());
         }
 
-        GeneratorReference contentGeneratorConfiguration
-                = output.getContentGenerator();
-        controllerState.setGeneratorNamespace(
-                contentGeneratorConfiguration.getNamespace());
-        controllerState.setRootGeneratorReference(
-                contentGeneratorConfiguration);
-
-        GeneratorConfiguration generatorConfiguration
-                = unitConfiguration.getGeneratorConfiguration();
-
-        Generator generator
-                = generatorConfiguration.getGenerator(
-                        contentGeneratorConfiguration.getName());
-        if (generator == null)
+        OutletReference contentOutletConfiguration
+                = output.getContentOutlet();
+        controllerState.setOutletNamespace(
+                contentOutletConfiguration.getNamespace());
+        controllerState.setRootOutletReference(
+                contentOutletConfiguration);
+
+        OutletConfiguration outletConfiguration
+                = unitConfiguration.getOutletConfiguration();
+
+        Outlet outlet = outletConfiguration.getOutlet(
+                contentOutletConfiguration.getName());
+        if (outlet == null)
         {
             throw new ControllerException(
-                    "No generator configured for generator name \""
-                        + contentGeneratorConfiguration.getName()
+                    "No outlet configured for outlet name \""
+                        + contentOutletConfiguration.getName()
                         + "\"");
         }
 
@@ -369,9 +368,9 @@ public class Controller
             }
         }
 
-        generator.beforeExecute(controllerState);
-        String result = generator.execute(controllerState);
-        generator.afterExecute(controllerState);
+        outlet.beforeExecute(controllerState);
+        String result = outlet.execute(controllerState);
+        outlet.afterExecute(controllerState);
 
         FileWriter fileWriter = null;
         try

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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/ControllerState.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/ControllerState.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/ControllerState.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/ControllerState.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control;
+package org.apache.torque.generator.control;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,17 +23,17 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.torque.gf.configuration.UnitConfiguration;
-import org.apache.torque.gf.configuration.controller.GeneratorReference;
-import org.apache.torque.gf.configuration.controller.Output;
-import org.apache.torque.gf.generator.Generator;
-import org.apache.torque.gf.option.Option;
-import org.apache.torque.gf.option.OptionName;
-import org.apache.torque.gf.option.Options;
-import org.apache.torque.gf.qname.Namespace;
-import org.apache.torque.gf.qname.QualifiedName;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.variable.VariableStore;
+import org.apache.torque.generator.configuration.UnitConfiguration;
+import org.apache.torque.generator.configuration.controller.OutletReference;
+import org.apache.torque.generator.configuration.controller.Output;
+import org.apache.torque.generator.option.Option;
+import org.apache.torque.generator.option.OptionName;
+import org.apache.torque.generator.option.Options;
+import org.apache.torque.generator.outlet.Outlet;
+import org.apache.torque.generator.qname.Namespace;
+import org.apache.torque.generator.qname.QualifiedName;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.variable.VariableStore;
 
 /**
  * The state of the controller.  Contains all stuff the controller needs to
@@ -47,9 +47,9 @@ public class ControllerState
     private Output output;
 
     /**
-     * The current stack of generators being executed.
+     * The current stack of outlets being executed.
      */
-    private List<Generator> generators = new ArrayList<Generator>();
+    private List<Outlet> outlets = new ArrayList<Outlet>();
 
     /**
      * The root element of the source graph.
@@ -67,10 +67,10 @@ public class ControllerState
     private UnitConfiguration unitConfiguration;
 
     /**
-     * The reference in the controller to the root generator.
-     * May override mergepoints in the generators.
+     * The reference in the controller to the root outlet.
+     * May override mergepoints in the outlets.
      */
-    private GeneratorReference rootGeneratorReference;
+    private OutletReference rootOutletReference;
 
     /**
      * The variable store.
@@ -92,9 +92,9 @@ public class ControllerState
     private File sourceFile;
 
     /**
-     * The name space in which the current generator operates.
+     * The name space in which the current outlet operates.
      */
-    private Namespace generatorNamespace;
+    private Namespace outletNamespace;
 
     /**
      * Returns the output declaration which is currently processed.
@@ -118,45 +118,45 @@ public class ControllerState
     }
 
     /**
-     * Returns the topmost generator in the stack of generators.
+     * Returns the topmost outlet in the stack of outlets.
      *
-     * @return the topmost generator in the stack of generators, or null
+     * @return the topmost outlet in the stack of outlets, or null
      *         if the stack is empty.
      */
-    public Generator getGenerator()
+    public Outlet getOutlet()
     {
-        if (generators.isEmpty())
+        if (outlets.isEmpty())
         {
             return null;
         }
-        return generators.get(generators.size() - 1);
+        return outlets.get(outlets.size() - 1);
     }
 
     /**
-     * Pushes a generator onto the stack of generators.
+     * Pushes a outlet onto the stack of outlets.
      *
-     * @param generator the generator to be added to the stack of generators,
+     * @param outlet the outlet to be added to the stack of outlets,
      *        not null.
      */
-    public void pushGenerator(Generator generator)
+    public void pushOutlet(Outlet outlet)
     {
-        if (generator == null)
+        if (outlet == null)
         {
-            throw new NullPointerException("generator must not be null");
+            throw new NullPointerException("outlet must not be null");
         }
-        this.generators.add(generator);
+        this.outlets.add(outlet);
     }
 
     /**
-     * Pops the topmost generators from the stack of generators.
+     * Pops the topmost outlets from the stack of outlets.
      *
-     * @return the removed generator, not null.
+     * @return the removed outlet, not null.
      *
      * @throws IndexOutOfBoundsException if the stack is empty.
      */
-    public Generator popGenerator()
+    public Outlet popOutlet()
     {
-        return generators.remove(generators.size() - 1);
+        return outlets.remove(outlets.size() - 1);
     }
 
     /**
@@ -204,55 +204,55 @@ public class ControllerState
     }
 
     /**
-     * Returns the reference to the current content generator.
+     * Returns the reference to the current outlet.
      *
-     * @return the reference to the current content generator, or null if no
-     *         content generator is currently active.
+     * @return the reference to the current outlet, or null if no
+     *         outlet is currently active.
      */
-    public GeneratorReference getRootGeneratorReference()
+    public OutletReference getRootOutletReference()
     {
-        return rootGeneratorReference;
+        return rootOutletReference;
     }
 
     /**
-     * Sets the reference to the current content generator.
+     * Sets the reference to the root outlet.
      *
-     * @param rootGeneratorReference the reference to the root generator
-     *        (i.e. the generator which produces the whole content),
+     * @param rootOutletReference the reference to the root outlet
+     *        (i.e. the outlet which produces the whole content),
      *        or null to remove the reference.
      */
-    void setRootGeneratorReference(GeneratorReference rootGeneratorReference)
+    void setRootOutletReference(OutletReference rootOutletReference)
     {
-        this.rootGeneratorReference = rootGeneratorReference;
+        this.rootOutletReference = rootOutletReference;
     }
 
 
     /**
-     * Sets the name space of the generator which is currently active.
+     * Sets the name space of the outlet which is currently active.
      *
-     * @param namespace the name space of the generator which is currently
+     * @param namespace the namespace of the outlet which is currently
      *        active, or null to remove the name space.
      */
-    void setGeneratorNamespace(Namespace namespace)
+    void setOutletNamespace(Namespace namespace)
     {
-        generatorNamespace = namespace;
+        outletNamespace = namespace;
     }
 
     /**
-     * Returns the name space of the generator which is currently active.
+     * Returns the namespace of the outlet which is currently active.
      *
-     * @return the name space of the active generator. May be null only
+     * @return the name space of the active outlet. May be null only
      *         if no generation is in progress.
      */
-    public Namespace getGeneratorNamespace()
+    public Namespace getOutletNamespace()
     {
-        return generatorNamespace;
+        return outletNamespace;
     }
 
     /**
-     * Calculates the value of an option in the current generator's context.
+     * Calculates the value of an option in the current outlet's context.
      * The default namespace which is used when no namespace is given in
-     * <code>name</code> is the namespace of the currently used generator.
+     * <code>name</code> is the namespace of the currently used outlet.
      *
      * @param name the name of the option, can contain a namespace.
      *
@@ -273,9 +273,9 @@ public class ControllerState
     }
 
     /**
-     * Calculates the value of an option in the current generator's context.
+     * Calculates the value of an option in the current outlet's context.
      * The default namespace which is used when no namespace is given in
-     * <code>name</code> is the namespace of the currently used generator.
+     * <code>name</code> is the namespace of the currently used outlet.
      *
      * @param name the object containing the name of the option,
      *        which can contain a namespace, not null.
@@ -292,7 +292,7 @@ public class ControllerState
 
     /**
      * Convenience method to return the value of an option as boolean.
-     * The option is evaluated in the current generator's context, see
+     * The option is evaluated in the current outlet's context, see
      * getOption(String). <br/>
      * Uses Boolean.paseBoolean() for String->Boolean conversion.
      * @param name the name of the option, can contain a namespace.
@@ -312,7 +312,7 @@ public class ControllerState
 
     /**
      * Convenience method to return the value of an option as boolean.
-     * The option is evaluated in the current generator's context, see
+     * The option is evaluated in the current outlet's context, see
      * getOption(String). <br/>
      * Uses Boolean.paseBoolean() for String->Boolean conversion.
      *
@@ -331,7 +331,7 @@ public class ControllerState
 
     /**
      * Convenience method to return the value of an option as String.
-     * The option is evaluated in the current generator's context, see
+     * The option is evaluated in the current outlet's context, see
      * getOption(String). <br/>
      *
      * @param name the name of the option, can contain a namespace.
@@ -351,7 +351,7 @@ public class ControllerState
 
     /**
      * Convenience method to return the value of an option as String.
-     * The option is evaluated in the current generator's context, see
+     * The option is evaluated in the current outlet's context, see
      * getOption(String). <br/>
      *
      * @param optionName the object containing the name of the option,
@@ -368,7 +368,7 @@ public class ControllerState
     }
 
     /**
-     * Returns all options which are visible from the current generator's
+     * Returns all options which are visible from the current outlet's
      * namespace.
      *
      * @return all visible options, not null.
@@ -376,7 +376,7 @@ public class ControllerState
     public Options getVisibleOptions()
     {
         return unitConfiguration.getOptions().getInHierarchy(
-                generatorNamespace);
+                outletNamespace);
     }
 
     /**
@@ -390,7 +390,7 @@ public class ControllerState
     }
 
     /**
-     * Converts a name to a QualifiedName, using the generator namespace as
+     * Converts a name to a QualifiedName, using the outlet namespace as
      * default namespace is fone is given.
      *
      * @param name the name to convert to a qualifiedName, not null.
@@ -403,7 +403,7 @@ public class ControllerState
     {
         QualifiedName qualifiedName = new QualifiedName(
                 name,
-                generatorNamespace);
+                outletNamespace);
         return qualifiedName;
     }
 
@@ -482,12 +482,12 @@ public class ControllerState
         StringBuffer result = new StringBuffer();
         result.append("output=").append(output)
                 .append("outputFilePath=").append(outputFile)
-                .append("\ngeneratorNamespace=").append(generatorNamespace)
-                .append("\ngenerators=").append(generators)
+                .append("\noutletNamespace=").append(outletNamespace)
+                .append("\noutlets=").append(outlets)
                 .append("\nrootElement=").append(rootElement)
                 .append("\nsourceElement").append(sourceElement)
-                .append("\nrootGeneratorReference=")
-                .append(rootGeneratorReference)
+                .append("\nrootOutletReference=")
+                .append(rootOutletReference)
                 .append("\nunitConfiguration=").append(unitConfiguration)
                 .append("\nvariableStore=").append(variableStore);
         return result.toString();

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/TokenReplacer.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/TokenReplacer.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/control/TokenReplacer.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/TokenReplacer.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control;
+package org.apache.torque.generator.control;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.torque.gf.control;
  * under the License.
  */
 
-import org.apache.torque.gf.processor.string.StringProcessor;
+import org.apache.torque.generator.processor.string.StringProcessor;
 
 /**
  * Replaces placeholder tokens like ${option:optionName} in a string by the



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