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 [3/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
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.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,10 +24,10 @@ 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.gf.configuration.option.OptionsSaxHandlerFactory;
-import org.apache.torque.gf.configuration.option.PropertiesOptionsSaxHandlerFactory;
-import org.apache.torque.gf.configuration.option.XmlOptionsSaxHandlerFactory;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.option.OptionsSaxHandlerFactory;
+import org.apache.torque.generator.configuration.option.PropertiesOptionsSaxHandlerFactory;
+import org.apache.torque.generator.configuration.option.XmlOptionsSaxHandlerFactory;
 
 /**
  * A registry of OptionsSaxHandlerFactories.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandler.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,11 +19,11 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.ACTION_VALUE_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_VALUE_ATTRIBUTE;
 
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.configuration.paths.ProjectPaths;
-import org.apache.torque.gf.control.action.OutputAction;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.configuration.paths.ProjectPaths;
+import org.apache.torque.generator.control.action.OutputAction;
 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/OutputActionSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandlerFactory.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OutputActionSaxHandlerFactory.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,15 @@ public class OutputActionSaxHandlerFacto
         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 = "outputAction";
 
     /**
-     * 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
+     * OutletSaxHandlers created by this factory.
+     *
      * @return "outputAction".
      */
     public String getType()

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandler.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,14 +19,14 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.ACTION_ATTRIBUTE_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.SourceElementAttributeAction;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_ACCEPT_NOT_SET_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_ATTRIBUTE_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_ELEMENT_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.SourceElementAttributeAction;
 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/SourceElementAttributeActionSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandlerFactory.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/SourceElementAttributeActionSaxHandlerFactory.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 SourceElementAttributeActio
         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 = "sourceElementAttributeAction";
 
     /**
-     * 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 "sourceElementAction".
      */
     public String getType()

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandler.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_ACCEPT_EMPTY_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.ACTION_ELEMENT_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.ACTION_GENERATOR_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.MergepointAction;
-import org.apache.torque.gf.control.action.TraverseAllAction;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.ACTION_ACCEPT_EMPTY_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.MergepointAction;
+import org.apache.torque.generator.control.action.TraverseAllAction;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -82,14 +82,14 @@ public class TraverseAllActionSaxHandler
             throws SAXException
     {
         String element = attributes.getValue(ACTION_ELEMENT_ATTRIBUTE);
-        String generator = attributes.getValue(ACTION_GENERATOR_ATTRIBUTE);
+        String outlet = attributes.getValue(ACTION_OUTLET_ATTRIBUTE);
         Boolean acceptEmpty = SaxHelper.getBooleanAttribute(
                 ACTION_ACCEPT_EMPTY_ATTRIBUTE,
                 attributes,
                 "the element " + element);
         TraverseAllAction action = new TraverseAllAction(
                 element,
-                generator,
+                outlet,
                 acceptEmpty);
         return action;
     }

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandlerFactory.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/TraverseAllActionSaxHandlerFactory.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,15 @@ public class TraverseAllActionSaxHandler
         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 = "traverseAllAction";
 
     /**
-     * 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 "traverseAllAction".
      */
     public String getType()

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

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/FileOptionsSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.option;
+package org.apache.torque.generator.configuration.option;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,10 +19,10 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.option.OptionTags.OPTIONS_PATH_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.option.OptionTags.OPTIONS_TAG;
+import static org.apache.torque.generator.configuration.option.OptionTags.OPTIONS_PATH_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.option.OptionTags.OPTIONS_TAG;
 
-import org.apache.torque.gf.configuration.SaxHelper;
+import org.apache.torque.generator.configuration.SaxHelper;
 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/option/MapOptionsConfiguration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/MapOptionsConfiguration.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.option;
+package org.apache.torque.generator.configuration.option;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,9 +23,9 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.option.Option;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.option.Option;
 
 /**
  * An option configuration in which the options are provided inside a java map.

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfiguration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfiguration.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfiguration.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.option;
+package org.apache.torque.generator.configuration.option;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package org.apache.torque.gf.configurati
 
 import java.util.Collection;
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-import org.apache.torque.gf.option.Option;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.option.Option;
 
 /**
  * The part of the configuration which provides information to set options.

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java (from r931293, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/option/OptionsConfigurationBase.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/option/OptionsConfigurationBase.java&r1=931293&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/option/OptionsConfigurationBase.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.option;
+package org.apache.torque.generator.configuration.option;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,8 +27,8 @@ import java.util.Map.Entry;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.option.Option;
-import org.apache.torque.gf.option.OptionImpl;
+import org.apache.torque.generator.option.Option;
+import org.apache.torque.generator.option.OptionImpl;
 
 /**
  * Base class with common functionality for all option configurations.

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsSaxHandlerFactory.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.option;
+package org.apache.torque.generator.configuration.option;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -47,9 +47,9 @@ public abstract interface OptionsSaxHand
      * is encountered in a configuration file.
      *
      * @return a SAX delegate handler for parsing the configuration with the
-     *           given type.
-     * @throws SAXException if the SAX Handler for the generator can
-     *           not be created from the given XML element.
+     *         given type.
+     * @throws SAXException if the SAX Handler for the options can
+     *         not be created from the given XML element.
      */
     OptionsSaxHandler getOptionsSaxHandler()
         throws SAXException;

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/PropertiesOptionConfiguration.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.option;
+package org.apache.torque.generator.configuration.option;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,9 +26,9 @@ import java.util.Properties;
 
 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.ConfigurationProvider;
-import org.apache.torque.gf.option.Option;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.option.Option;
 
 /**
  * An option configuration which reads the options from a properties file.

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionConfiguration.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionConfiguration.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/XmlOptionConfiguration.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.configuration.option;
+package org.apache.torque.generator.configuration.option;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,9 +26,9 @@ import java.util.Properties;
 
 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.ConfigurationProvider;
-import org.apache.torque.gf.option.Option;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+import org.apache.torque.generator.option.Option;
 
 /**
  * An option configuration which reads the options from a XML file.

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

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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/JavaGeneratorSaxHandler.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/JavaGeneratorSaxHandler.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/JavaGeneratorSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.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,10 +19,10 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.GENERATOR_CLASS_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.GENERATOR_NAME_ATTRIBUTE;
-import static org.apache.torque.gf.configuration.mergepoint.MergepointConfigurationTags.MERGEPOINT_TAG;
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.INPUT_TAG;
+import static org.apache.torque.generator.configuration.mergepoint.MergepointConfigurationTags.MERGEPOINT_TAG;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.INPUT_TAG;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.OUTLET_CLASS_ATTRIBUTE;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.OUTLET_NAME_ATTRIBUTE;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -31,22 +31,22 @@ 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.ConfigurationHandlers;
-import org.apache.torque.gf.configuration.ConfigurationProvider;
-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.ConfigurationHandlers;
+import org.apache.torque.generator.configuration.ConfigurationProvider;
+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;
 
 /**
- * Handles a declaration of a java generator within a generator configuration
+ * Handles a declaration of a java outlet within a outlet configuration
  * file.
  */
-class JavaGeneratorSaxHandler extends GeneratorSaxHandler
+class JavaOutletSaxHandler extends OutletSaxHandler
 {
     /** The logger of the class. */
-    private static Log log = LogFactory.getLog(JavaGeneratorSaxHandler.class);
+    private static Log log = LogFactory.getLog(JavaOutletSaxHandler.class);
 
     /** the name of the property which is currently processed. */
     private String propertyName;
@@ -60,9 +60,9 @@ class JavaGeneratorSaxHandler extends Ge
     /**
      * 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.
@@ -70,27 +70,27 @@ class JavaGeneratorSaxHandler extends Ge
      * @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 JavaGeneratorSaxHandler(
-            QualifiedName generatorName,
+    public JavaOutletSaxHandler(
+            QualifiedName outletName,
             ConfigurationProvider configurationProvider,
             ProjectPaths projectPaths,
             ConfigurationHandlers configurationHandlers)
         throws SAXException
     {
-        super(generatorName,
+        super(outletName,
                 configurationProvider,
                 projectPaths,
                 configurationHandlers);
     }
 
     /**
-     * Instantiates a java generator.
+     * Instantiates a java 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
@@ -103,64 +103,64 @@ class JavaGeneratorSaxHandler extends Ge
      *          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 Generator createGenerator(
-            QualifiedName generatorName,
+    protected Outlet 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 Java Generators");
+                        + " for Java Outlets");
             }
-            generatorName = new QualifiedName(nameAttribute);
+            outletName = new QualifiedName(nameAttribute);
         }
 
 
         String className;
         {
-            className = attributes.getValue(GENERATOR_CLASS_ATTRIBUTE);
+            className = attributes.getValue(OUTLET_CLASS_ATTRIBUTE);
             if (className == null)
             {
                 throw new SAXException("The attribute "
-                        + GENERATOR_CLASS_ATTRIBUTE
+                        + OUTLET_CLASS_ATTRIBUTE
                         + " must be set on the element "
                         + rawName
-                        + " for java Generators");
+                        + " for java Outlets");
             }
         }
 
-        Class<?> generatorClass;
+        Class<?> outletClass;
         try
         {
-            generatorClass = Class.forName(className);
+            outletClass = Class.forName(className);
         }
         catch (ClassNotFoundException e)
         {
             throw new SAXException(
-                    "Error  while initializing the java generator "
-                    + generatorName
+                    "Error  while initializing the java outlet "
+                    + outletName
                     + " : Could not load class " + className, e);
         }
         catch (ExceptionInInitializerError e)
         {
             log.error(
-                    "Error  while initializing the java generator "
-                    + generatorName
+                    "Error  while initializing the java outlet "
+                    + outletName
                     + " : Could not initialize class " + className
                     + " : " + e.getMessage());
             throw e;
@@ -168,25 +168,25 @@ class JavaGeneratorSaxHandler extends Ge
         catch (LinkageError e)
         {
             log.error(
-                    "Error  while initializing the java generator "
-                    + generatorName
+                    "Error  while initializing the java outlet "
+                    + outletName
                     + " : Could not link class " + className
                     + " : " + e.getMessage());
             throw e;
         }
 
-        Generator result;
+        Outlet result;
         try
         {
             Constructor<?> constructor
-                    = generatorClass.getConstructor(QualifiedName.class);
-            result = (Generator) constructor.newInstance(generatorName);
+                    = outletClass.getConstructor(QualifiedName.class);
+            result = (Outlet) constructor.newInstance(outletName);
         }
         catch (NoSuchMethodException e)
         {
             throw new SAXException(
-                    "Error  while instantiating the java generator "
-                    + generatorName
+                    "Error  while instantiating the java outlet "
+                    + outletName
                     + " : The class " + className
                     + " has no constructor which takes a qualified name",
                 e);
@@ -194,18 +194,18 @@ class JavaGeneratorSaxHandler extends Ge
         catch (ClassCastException e)
         {
             throw new SAXException(
-                    "Error  while instantiating the java generator "
-                    + generatorName
+                    "Error  while instantiating the java outlet "
+                    + outletName
                     + " : The class " + className
                     + " is not an instance of "
-                    + Generator.class.getName(),
+                    + Outlet.class.getName(),
                 e);
         }
         catch (IllegalAccessException e)
         {
             throw new SAXException(
-                    "Error  while instantiating the java generator "
-                    + generatorName
+                    "Error  while instantiating the java outlet "
+                    + outletName
                     + " : The constructor of class "
                     + className + " could not be accessed",
                 e);
@@ -213,8 +213,8 @@ class JavaGeneratorSaxHandler extends Ge
         catch (InvocationTargetException e)
         {
             throw new SAXException(
-                    "Error  while instantiating the java generator "
-                    + generatorName
+                    "Error  while instantiating the java outlet "
+                    + outletName
                     + " : The constructor of class "
                     + className + " could not be called",
                 e);
@@ -222,8 +222,8 @@ class JavaGeneratorSaxHandler extends Ge
         catch (InstantiationException e)
         {
             throw new SAXException(
-                    "Error  while instantiating the java generator "
-                    + generatorName
+                    "Error  while instantiating the java outlet "
+                    + outletName
                     + " : The class " + className
                     + " represents an abstract class, "
                     + "an interface, an array class, a primitive type, "
@@ -234,8 +234,8 @@ class JavaGeneratorSaxHandler extends Ge
         catch (SecurityException e)
         {
             throw new SAXException(
-                    "Error  while instantiating the java generator "
-                    + generatorName
+                    "Error  while instantiating the java outlet "
+                    + outletName
                     + " : The security manager denies instantiation",
                 e);
         }
@@ -285,24 +285,24 @@ class JavaGeneratorSaxHandler extends Ge
         level--;
         if (propertyName != null)
         {
-            if (!PropertyUtils.isWriteable(getGenerator(), propertyName))
+            if (!PropertyUtils.isWriteable(getOutlet(), propertyName))
             {
                 throw new SAXException("No setter found for property "
                         + propertyName
                         + " in class "
-                        + getGenerator().getClass().getName());
+                        + getOutlet().getClass().getName());
             }
             try
             {
                 BeanUtils.copyProperty(
-                        getGenerator(), propertyName, propertyValue.toString());
+                        getOutlet(), propertyName, propertyValue.toString());
             }
             catch (InvocationTargetException e)
             {
                 throw new SAXException("error while setting Property "
                         + propertyName
-                        + " for java generator "
-                        + getGenerator().getName()
+                        + " for java outlet "
+                        + getOutlet().getName()
                         + " with value "
                         + propertyValue.toString(),
                     e);
@@ -311,8 +311,8 @@ class JavaGeneratorSaxHandler extends Ge
             {
                 throw new SAXException("error while setting Property "
                         + propertyName
-                        + " for java generator "
-                        + getGenerator().getName()
+                        + " for java outlet "
+                        + getOutlet().getName()
                         + " with value "
                         + propertyValue.toString(),
                     e);

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandlerFactory.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/JavaGeneratorSaxHandlerFactory.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandlerFactory.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandlerFactory.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/JavaGeneratorSaxHandlerFactory.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/JavaGeneratorSaxHandlerFactory.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandlerFactory.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,42 @@ 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 Java generator SAX handlers.
+ * Creates Java outlet SAX handlers.
  */
-public class JavaGeneratorSaxHandlerFactory
-        implements GeneratorSaxHandlerFactory
+public class JavaOutletSaxHandlerFactory
+        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 = "javaGenerator";
+    private static final String OUTLET_TYPE = "javaOutlet";
 
     /**
-     * Returns the generator type which can be handled by the
-     * GeneratorSaxHandlers created by this factory.
-     * @return "javaGenerator".
+     * Returns the outlet type which can be handled by the
+     * OutletSaxHandlers created by this factory.
+     * @return "javaOutlet".
      */
     public String getType()
     {
-        return GENERATOR_TYPE;
+        return OUTLET_TYPE;
     }
 
     /**
-     * Returns a JavaGeneratorSaxHandler for reading the configuration of
-     * Java generators. This implementation uses the provided name
-     * as generator name.
+     * Returns a JavaOutletSaxHandler for reading the configuration of
+     * Java 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 +62,17 @@ public class JavaGeneratorSaxHandlerFact
      * @param configurationHandlers the available configuration handlers,
      *        not null.
      *
-     * @return a new JavaGeneratorSaxHandler.
+     * @return a new JavaOutletSaxHandler.
      */
-    public final GeneratorSaxHandler getGeneratorSaxHandler(
-            QualifiedName generatorName,
+    public final OutletSaxHandler getOutletSaxHandler(
+            QualifiedName outletName,
             ConfigurationProvider configurationProvider,
             ProjectPaths projectPaths,
             ConfigurationHandlers configurationHandlers)
          throws SAXException
     {
-        return new JavaGeneratorSaxHandler(
-                generatorName,
+        return new JavaOutletSaxHandler(
+                outletName,
                 configurationProvider,
                 projectPaths,
                 configurationHandlers);

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java (from r918869, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfiguration.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfiguration.java&r1=918869&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfiguration.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfiguration.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
@@ -24,19 +24,19 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.mergepoint.MergepointMapping;
-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.mergepoint.MergepointMapping;
+import org.apache.torque.generator.outlet.Outlet;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
- * Administers the available Generators.
+ * Administers the available Outlets.
  */
-public class GeneratorConfiguration
+public class OutletConfiguration
 {
-    /** A map containing all generators, keyed by their name. */
-    private Map<QualifiedName, Generator> generators
-            = new HashMap<QualifiedName, Generator>();
+    /** A map containing all outlets, keyed by their name. */
+    private Map<QualifiedName, Outlet> outlets
+            = new HashMap<QualifiedName, Outlet>();
 
     /** A map containing all isolated mergepoint mappings,
      *  keyed by their name. */
@@ -45,35 +45,35 @@ public class GeneratorConfiguration
 
     /**
      * Whether the mergepoint mappings have been resolved and added to
-     * the respective generators.
+     * the respective outlets.
      */
     private boolean mergepointMappingsResolved = false;
 
     /**
-     * Creates a GeneratorConfiguration containing a list of Generators.
+     * Creates a OutletConfiguration containing a list of Outlets.
      *
-     * @param generators the list of generators, not null.
+     * @param outlets the list of outlets, not null.
      *
-     * @throws ConfigurationException if generators contains
-     *         two generators with the same name.
-     * @throws NullPointerException if generatorList is null.
+     * @throws ConfigurationException if outlets contains
+     *         two outlets with the same name.
+     * @throws NullPointerException if outlets is null.
      */
-    public GeneratorConfiguration(Collection<Generator> generators,
+    public OutletConfiguration(Collection<Outlet> outlets,
                 Collection<MergepointMapping> mergepointMappings)
             throws ConfigurationException
     {
-        if (generators == null)
+        if (outlets == null)
         {
-            throw new NullPointerException("generators must not be null");
+            throw new NullPointerException("outlets must not be null");
         }
         if (mergepointMappings == null)
         {
             throw new NullPointerException(
                     "mergepointMappings must not be null");
         }
-        for (Generator generator : generators)
+        for (Outlet outlet : outlets)
         {
-            addGenerator(generator);
+            addOutlet(outlet);
         }
         for (MergepointMapping mergepointMapping : mergepointMappings)
         {
@@ -85,7 +85,7 @@ public class GeneratorConfiguration
 
     /**
      * Resolves the isolated mergepoint mappings and adds them to
-     * the relevant generators.
+     * the relevant outlets.
      * @throws ConfigurationException
      */
     public void resolveMergepointMappings() throws ConfigurationException
@@ -98,20 +98,20 @@ public class GeneratorConfiguration
                 = new QualifiedName(name);
             if (qualifiedMergepointName.getNamespace().isRoot())
             {
-                // generator name is missing
+                // outlet name is missing
                 throw new ConfigurationException(
                         "The isolated mergepoint mapping with the name "
                         + name
-                        + " needs to be qualified with the generator name");
+                        + " needs to be qualified with the outlet name");
             }
-            QualifiedName generatorName = new QualifiedName(
+            QualifiedName outletName = new QualifiedName(
                     qualifiedMergepointName.getNamespace().toString());
-            Generator generator = generators.get(generatorName);
-            if (generator == null)
+            Outlet outlet = outlets.get(outletName);
+            if (outlet == null)
             {
                 throw new ConfigurationException(
-                        "No generator with name "
-                        + generatorName
+                        "No outlet with name "
+                        + outletName
                         + "exists (required by the isolated mergepoint mapping"
                         + " with the name "
                         + name
@@ -122,80 +122,80 @@ public class GeneratorConfiguration
                     = new MergepointMapping(
                             qualifiedMergepointName.getName(),
                             originalMergepointMapping.getActions());
-            generator.setMergepointMapping(resolvedMergepointMapping);
+            outlet.setMergepointMapping(resolvedMergepointMapping);
         }
         mergepointMappingsResolved = true;
         mergepointMappings.clear();
     }
 
     /**
-     * Returns a map containing all the configured generators, keyed by their
+     * Returns a map containing all the configured outlets, keyed by their
      * name.
      *
-     * @return all generators, not null.
+     * @return all outlets, not null.
      *
      * @throws IllegalStateException if the mergepoint mappings have not
      *         yet been resolved.
      */
-    public Map<QualifiedName, Generator> getGenerators()
+    public Map<QualifiedName, Outlet> getOutlets()
     {
         if (!mergepointMappingsResolved)
         {
             throw new IllegalStateException(
                     "Mergepoint mappings must be resoved first");
         }
-        return Collections.unmodifiableMap(generators);
+        return Collections.unmodifiableMap(outlets);
     }
 
     /**
-     * Returns the generator with the name <code>name</code>.
+     * Returns the outlet with the name <code>name</code>.
      *
-     * @param name the name of the generator to be returned.
+     * @param name the name of the outlet to be returned.
      *
-     * @return The generator with the given name, or null if it does not
+     * @return The outlet with the given name, or null if it does not
      *         exist.
      *
      * @throws IllegalStateException if the mergepoint mappings have not
      *         yet been resolved.
      */
-    public Generator getGenerator(QualifiedName name)
+    public Outlet getOutlet(QualifiedName name)
     {
         if (!mergepointMappingsResolved)
         {
             throw new IllegalStateException(
                     "Mergepoint mappings must be resoved first");
         }
-        return generators.get(name);
+        return outlets.get(name);
     }
 
     /**
-     * Adds a generator.
+     * Adds a outlet.
      *
-     * @param generator the generator to be added, not null.
+     * @param outlet the outlet to be added, not null.
      *
-     * @throws ConfigurationException if a generator with the generator's name
+     * @throws ConfigurationException if a outlet with the outlet's name
      *         already exists in the configuration.
-     * @throws NullPointerException if generator is null.
+     * @throws NullPointerException if outlet is null.
      */
-    public void addGenerator(Generator generator)
+    public void addOutlet(Outlet outlet)
         throws ConfigurationException
     {
-        if (generator == null)
+        if (outlet == null)
         {
-            throw new NullPointerException("generator must not be null");
+            throw new NullPointerException("outlet must not be null");
         }
-        Generator existingGenerator = generators.get(generator.getName());
-        if (existingGenerator != null)
+        Outlet existingOutlet = outlets.get(outlet.getName());
+        if (existingOutlet != null)
         {
-            throw new ConfigurationException("Trying to add the generator "
-                    + generator.getName()
+            throw new ConfigurationException("Trying to add the outlet "
+                    + outlet.getName()
                     + " and class "
-                    + generator.getClass().getName()
-                    + " : A generator with the same name "
+                    + outlet.getClass().getName()
+                    + " : A outlet with the same name "
                     + " already exists, it has the class "
-                    + existingGenerator.getClass().getName());
+                    + existingOutlet.getClass().getName());
         }
-        generators.put(generator.getName(), generator);
+        outlets.put(outlet.getName(), outlet);
     }
 
     /**
@@ -208,22 +208,22 @@ public class GeneratorConfiguration
     @Override
     public String toString()
     {
-        StringBuffer result = new StringBuffer("(generators=[")
-                .append(generators)
+        StringBuffer result = new StringBuffer("(outlets=[")
+                .append(outlets)
                 .append(")");
         return result.toString();
     }
 
     /**
-     * returns whether a generator for the given name exists.
+     * Returns whether a outlet for the given name exists.
      * Name and namespace must match exactly.
      *
-     * @param qualifiedName the name of the generator.
+     * @param qualifiedName the name of the outlet.
      *
-     * @return true if a generator with the name exists, false otherwise.
+     * @return true if a outlet with the name exists, false otherwise.
      */
-    public boolean generatorExists(QualifiedName qualifiedName)
+    public boolean outletExists(QualifiedName qualifiedName)
     {
-        return generators.containsKey(qualifiedName);
+        return outlets.containsKey(qualifiedName);
     }
 }

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationSaxHandler.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationSaxHandler.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.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,9 +19,9 @@ package org.apache.torque.gf.configurati
  * under the License.
  */
 
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.GENERATORS_TAG;
-import static org.apache.torque.gf.configuration.generator.GeneratorConfigurationTags.GENERATOR_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.OUTLETSS_TAG;
+import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.OUTLET_TAG;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,16 +29,16 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.ConfigurationEntityResolver;
-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.MergepointMapping;
-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.ConfigurationEntityResolver;
+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.MergepointMapping;
+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.InputSource;
 import org.xml.sax.SAXException;
@@ -46,11 +46,11 @@ import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
- * A SAX handler which parses Generator configuration files.
+ * A SAX handler which parses Outlet configuration files.
  * Relies on delegate handlers for parsing the configuration for
- * the different generator types.
+ * the different outlet types.
  */
-public class GeneratorConfigurationSaxHandler extends DefaultHandler
+public class OutletConfigurationSaxHandler extends DefaultHandler
 {
     /** The access object for the configuration files, not null. */
     private ConfigurationProvider configurationProvider;
@@ -58,11 +58,11 @@ public class GeneratorConfigurationSaxHa
     /** The paths of the surrounding project, not null. */
     private ProjectPaths projectPaths;
 
-    /** The list of generators which configuration was already parsed. */
-    private List<Generator> generators = new ArrayList<Generator>();
+    /** The list of outlets which configuration was already parsed. */
+    private List<Outlet> outlets = new ArrayList<Outlet>();
 
     /**
-     * The list of separate mergepoint mappings (outside the generators)
+     * The list of separate mergepoint mappings (outside the outlets)
      * which configuration was already parsed.
      */
     private List<MergepointMapping> mergepointMappings
@@ -72,10 +72,10 @@ public class GeneratorConfigurationSaxHa
     private ConfigurationHandlers configurationHandlers;
 
     /**
-     * The current delegate handler for parsing the current generator's
-     * configuration. Is null if no generator is currently parsed.
+     * The current delegate handler for parsing the current outlet's
+     * configuration. Is null if no outlet is currently parsed.
      */
-    private GeneratorSaxHandler generatorHandler;
+    private OutletSaxHandler outletHandler;
 
     /**
      * The current delegate handler for parsing the current mergepoint's
@@ -84,7 +84,7 @@ public class GeneratorConfigurationSaxHa
     private MergepointSaxHandler mergepointHandler;
 
     /** The log. */
-    private static Log log = LogFactory.getLog(GeneratorSaxHandler.class);
+    private static Log log = LogFactory.getLog(OutletSaxHandler.class);
 
     /**
      * Constructor.
@@ -97,26 +97,26 @@ public class GeneratorConfigurationSaxHa
      *
      * @throws NullPointerException if an argument is null.
      */
-    public GeneratorConfigurationSaxHandler(
+    public OutletConfigurationSaxHandler(
             ConfigurationProvider configurationProvider,
             ProjectPaths projectPaths,
             ConfigurationHandlers configurationHandlers)
     {
         if (configurationProvider == null)
         {
-            log.error("GeneratorConfigurationSaxHandler: "
+            log.error("OutletConfigurationSaxHandler: "
                     + " configurationProvider is null");
             throw new NullPointerException("configurationProvider is null");
         }
         if (projectPaths == null)
         {
-            log.error("GeneratorConfigurationSaxHandler: "
+            log.error("OutletConfigurationSaxHandler: "
                     + " projectPaths is null");
             throw new NullPointerException("projectPaths is null");
         }
         if (configurationHandlers == null)
         {
-            log.error("GeneratorConfigurationSaxHandler: "
+            log.error("OutletConfigurationSaxHandler: "
                     + " configurationHandlers is null");
             throw new NullPointerException("configurationHandlers is null");
         }
@@ -126,19 +126,19 @@ public class GeneratorConfigurationSaxHa
     }
 
     /**
-     * Returns all generators which were configured in the parsed generator
+     * Returns all outlets which were configured in the parsed outlet
      * configuration file.
      *
-     * @return all created generators, not null.
+     * @return all created outlets, not null.
      */
-    public List<Generator> getGenerators()
+    public List<Outlet> getOutlets()
     {
-        return generators;
+        return outlets;
     }
 
     /**
      * Returns all mergepoint mappings which were configured
-     * outside the generators in the parsed generator configuration file.
+     * outside the outlets in the parsed outlet configuration file.
      *
      * @return all created mergepoint mappings, not null.
      */
@@ -156,9 +156,9 @@ public class GeneratorConfigurationSaxHa
             throws SAXException
     {
         String unqualifiedName = SaxHelper.getUnqualifiedName(localName, qName);
-        if (generatorHandler != null)
+        if (outletHandler != null)
         {
-            generatorHandler.startElement(
+            outletHandler.startElement(
                     uri, localName, qName, attributes);
         }
         else if (mergepointHandler != null)
@@ -166,13 +166,13 @@ public class GeneratorConfigurationSaxHa
             mergepointHandler.startElement(
                     uri, localName, qName, attributes);
         }
-        else if (GENERATOR_TAG.equals(unqualifiedName))
+        else if (OUTLET_TAG.equals(unqualifiedName))
         {
-            String generatorType = getGeneratorType(attributes);
-            generatorHandler = getGeneratorHandler(
+            String outletType = getOutletType(attributes);
+            outletHandler = getOutletHandler(
                     null,
-                    generatorType);
-            generatorHandler.startElement(
+                    outletType);
+            outletHandler.startElement(
                     uri, localName, qName, attributes);
         }
         else if (MERGEPOINT_TAG.equals(unqualifiedName))
@@ -184,14 +184,14 @@ public class GeneratorConfigurationSaxHa
             mergepointHandler.startElement(
                     uri, localName, qName, attributes);
         }
-        else if (!GENERATORS_TAG.equals(unqualifiedName))
+        else if (!OUTLETSS_TAG.equals(unqualifiedName))
         {
             throw new SAXException(
                     "Unknown element : " + unqualifiedName
                     + ". First element must be "
-                    + GENERATORS_TAG
+                    + OUTLETSS_TAG
                     + " or "
-                    + GENERATOR_TAG);
+                    + OUTLET_TAG);
         }
     }
 
@@ -202,19 +202,19 @@ public class GeneratorConfigurationSaxHa
     public void endElement(String uri, String localName, String rawName)
             throws SAXException
     {
-        if (generatorHandler != null)
+        if (outletHandler != null)
         {
-            generatorHandler.endElement(uri, localName, rawName);
-            if (generatorHandler.isFinished())
+            outletHandler.endElement(uri, localName, rawName);
+            if (outletHandler.isFinished())
             {
-                Generator generator = generatorHandler.getGenerator();
-                generators.add(generator);
+                Outlet outlet = outletHandler.getOutlet();
+                outlets.add(outlet);
                 if (log.isDebugEnabled())
                 {
-                    log.debug("Parsed configuration for the generator "
-                            + generator.getName());
+                    log.debug("Parsed configuration for the outlet "
+                            + outlet.getName());
                 }
-                generatorHandler = null;
+                outletHandler = null;
             }
         }
         else if (mergepointHandler != null)
@@ -242,78 +242,78 @@ public class GeneratorConfigurationSaxHa
     public void characters (char[] ch, int start, int length)
             throws SAXException
     {
-        if (generatorHandler != null)
+        if (outletHandler != null)
         {
-            generatorHandler.characters(ch, start, length);
+            outletHandler.characters(ch, start, length);
         }
     }
 
     /**
-     * Returns the correct handler for a generator tag.
+     * Returns the correct handler for a outlet tag.
      * The method uses the type attribute to determine which handler is needed.
-     * I.e. it looks up the handler factory type in the generator types,
+     * I.e. it looks up the handler factory type in the outlet types,
      * and asks the factory for a handler.
      *
-     * @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 generatorType the type of the generator, not null.
+     * @param outletType the type of the outlet, not null.
      *
      * @return the handler for the tag, not null.
      *
      * @throws SAXException if no matching handler can be identified,
      *         or if an error occurs while creating the handler.
      */
-    public GeneratorSaxHandler getGeneratorHandler(
-            QualifiedName generatorName,
-            String generatorType)
+    public OutletSaxHandler getOutletHandler(
+            QualifiedName outletName,
+            String outletType)
         throws SAXException
     {
-        GeneratorSaxHandlerFactory delegateHandlerFactory
-                = configurationHandlers.getGeneratorTypes()
-                    .getGeneratorHandlerFactories()
-                    .get(generatorType);
+        OutletSaxHandlerFactory delegateHandlerFactory
+                = configurationHandlers.getOutletTypes()
+                    .getOutletHandlerFactories()
+                    .get(outletType);
         if (delegateHandlerFactory == null)
         {
             throw new SAXException(
-                    "Unknown generator type: "
-                        + generatorType);
+                    "Unknown outlet type: "
+                        + outletType);
         }
-        GeneratorSaxHandler generatorSaxHandler
-                = delegateHandlerFactory.getGeneratorSaxHandler(
-                        generatorName,
+        OutletSaxHandler outletSaxHandler
+                = delegateHandlerFactory.getOutletSaxHandler(
+                        outletName,
                         configurationProvider,
                         projectPaths,
                         configurationHandlers);
-        return generatorSaxHandler;
+        return outletSaxHandler;
     }
 
     /**
-     * Reads the generator type from the attributes of the generator XML tag.
+     * Reads the outlet type from the attributes of the outlet XML tag.
      *
      * @param attributes the attributes of the XML tag, not null.
      *
-     * @return the generator type, not null.
+     * @return the outlet type, not null.
      *
      * @throws SAXException if the xsi:type attribute is not set.
      */
-    public static String getGeneratorType(Attributes attributes)
+    public static String getOutletType(Attributes attributes)
             throws SAXException
     {
-        String generatorType
+        String outletType
                 = attributes.getValue(
                         XMLConstants.XSI_NAMESPACE,
                         XMLConstants.XSI_TYPE_ATTRBUTE_NAME);
-        if (generatorType == null)
+        if (outletType == null)
         {
-            throw new SAXException("The tag " + GENERATOR_TAG
+            throw new SAXException("The tag " + OUTLET_TAG
                     + " requires the attribute "
                     + XMLConstants.XSI_NAMESPACE
                     + ":"
                     + XMLConstants.XSI_TYPE_ATTRBUTE_NAME);
         }
-        return generatorType;
+        return outletType;
     }
 
     /**

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTags.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationTags.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTags.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTags.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationTags.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationTags.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTags.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
@@ -20,58 +20,58 @@ package org.apache.torque.gf.configurati
  */
 
 /**
- * Tag names for the generator configuration files.
+ * Tag names for the outlet configuration files.
  */
-public final class GeneratorConfigurationTags
+public final class OutletConfigurationTags
 {
     /**
      * private constructor for utility class.
      */
-    private GeneratorConfigurationTags()
+    private OutletConfigurationTags()
     {
     }
 
-    /** Tag name for the "generators" tag. */
-    public static final String GENERATORS_TAG = "generators";
+    /** Tag name for the "outlets" tag. */
+    public static final String OUTLETSS_TAG = "outlets";
 
-    /** 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";
 
-    /** Attribute name for the attribute "name" of the "generator" tag. */
-    public static final String GENERATOR_NAME_ATTRIBUTE = "name";
+    /** Attribute name for the attribute "name" of the "outlet" tag. */
+    public static final String OUTLET_NAME_ATTRIBUTE = "name";
 
-    /** Attribute name for the attribute "type" of the "generator" tag. */
-    public static final String GENERATOR_TYPE_ATTRIBUTE = "type";
+    /** Attribute name for the attribute "type" of the "outlet" tag. */
+    public static final String OUTLET_TYPE_ATTRIBUTE = "type";
 
-    /** Attribute name for the attribute "path" of the "generator" tag. */
-    public static final String GENERATOR_PATH_ATTRIBUTE = "path";
+    /** Attribute name for the attribute "path" of the "outlet" tag. */
+    public static final String OUTLET_PATH_ATTRIBUTE = "path";
 
-    /** Attribute name for the attribute "encoding" of the "generator" tag. */
-    public static final String GENERATOR_ENCODING_ATTRIBUTE = "encoding";
+    /** Attribute name for the attribute "encoding" of the "outlet" tag. */
+    public static final String OUTLET_ENCODING_ATTRIBUTE = "encoding";
 
-    /** Attribute name for the attribute "class" of the "generator" tag. */
-    public static final String GENERATOR_CLASS_ATTRIBUTE = "class";
+    /** Attribute name for the attribute "class" of the "outlet" tag. */
+    public static final String OUTLET_CLASS_ATTRIBUTE = "class";
 
     /**
      * Attribute name for the attribute "optionsInContext"
-     * of the "generator" tag.
+     * of the "outlet" tag.
      */
-    public static final String GENERATOR_OPTIONS_IN_CONTEXT_ATTRIBUTE
+    public static final String OUTLET_OPTIONS_IN_CONTEXT_ATTRIBUTE
             = "optionsInContext";
 
     /**
      * Attribute name for the attribute "sourceAttributesInContext"
-     * of the "generator" tag.
+     * of the "outlet" tag.
      */
     public static final String
-            GENERATOR_SOURCE_ATTRIBUTES_IN_CONTEXT_ATTRIBUTE
+            OUTLET_SOURCE_ATTRIBUTES_IN_CONTEXT_ATTRIBUTE
                     = "sourceAttributesInContext";
 
     /**
      * Attribute name for the attribute "variablesInContext"
-     * of the "generator" tag.
+     * of the "outlet" tag.
      */
-    public static final String GENERATOR_VARIABLES_IN_CONTEXT_ATTRIBUTE
+    public static final String OUTLET_VARIABLES_IN_CONTEXT_ATTRIBUTE
             = "variablesInContext";
 
     /** Tag name for the "input" tag. */



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