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 [5/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/control/action/ApplyAction.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/ApplyAction.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/ApplyAction.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/ApplyAction.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control.action;
+package org.apache.torque.generator.control.action;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,18 +21,18 @@ package org.apache.torque.gf.control.act
 
 import java.util.List;
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.control.TokenReplacer;
-import org.apache.torque.gf.generator.Generator;
-import org.apache.torque.gf.generator.GeneratorException;
-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.source.SourcePath;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.control.TokenReplacer;
+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.source.SourcePath;
 
 /**
- * Applies a generator to the matching element.
- * The output of the generator is appended to the output.
+ * Applies an outlet to the matching element.
+ * The output of the outlet is appended to the output.
  */
 public class ApplyAction implements MergepointAction
 {
@@ -42,9 +42,9 @@ public class ApplyAction implements Merg
     private String path;
 
     /**
-     * The name of the generator to be invoked on the element, not null.
+     * The name of the outlet to be invoked on the element, not null.
      */
-    private String generatorName;
+    private String outletName;
 
     /**
      * Whether it is correct to have no element to apply.
@@ -56,12 +56,12 @@ public class ApplyAction implements Merg
      *
      * @param path The path to the source element to be processed.
      *        <code>null</code> means ".".
-     * @param generatorName the name of the generator to apply.
+     * @param outletName the name of the outlet to apply.
      * @param acceptNotSet true if no error should be thrown if no element
      *        matches the given path, true if an error should be thrown in
      *        such a case. null means true.
      */
-    public ApplyAction(String path, String generatorName, Boolean acceptNotSet)
+    public ApplyAction(String path, String outletName, Boolean acceptNotSet)
     {
         if (path == null)
         {
@@ -72,12 +72,12 @@ public class ApplyAction implements Merg
             this.path = path;
         }
 
-        if (generatorName == null)
+        if (outletName == null)
         {
             throw new IllegalArgumentException(
-                    "ApplyAction: generatorName must not be null");
+                    "ApplyAction: outletName must not be null");
         }
-        this.generatorName = generatorName;
+        this.outletName = outletName;
         if (acceptNotSet != null)
         {
             this.acceptNotSet = acceptNotSet.booleanValue();
@@ -85,26 +85,25 @@ public class ApplyAction implements Merg
     }
 
     /**
-     * Applies a generator to the matching element.
-     * The output of the generator is appended to the output.
-     * ${...} Tokens are replaced within generatorName and path.
+     * Applies an outlet to the matching element.
+     * The output of the outlet is appended to the output.
+     * ${...} Tokens are replaced within outletName and path.
      */
     public String execute(ControllerState controllerState)
         throws GeneratorException
     {
         TokenReplacer tokenReplacer = new TokenReplacer(controllerState);
-        String detokenizedGeneratorName = tokenReplacer.process(generatorName);
-        QualifiedName qualifiedGeneratorName = new QualifiedName(
-                detokenizedGeneratorName,
+        String detokenizedOutletName = tokenReplacer.process(outletName);
+        QualifiedName qualifiedOutletName = new QualifiedName(
+                detokenizedOutletName,
                 Namespace.ROOT_NAMESPACE);
-        Generator generator
-                = controllerState.getUnitConfiguration()
-                    .getGeneratorConfiguration()
-                    .getGenerator(qualifiedGeneratorName);
-        if (generator == null)
+        Outlet outlet = controllerState.getUnitConfiguration()
+                .getOutletConfiguration()
+                .getOutlet(qualifiedOutletName);
+        if (outlet == null)
         {
-            throw new GeneratorException("ApplyAction : The generator "
-                    + generatorName
+            throw new GeneratorException("ApplyAction : The outlet "
+                    + outletName
                     + " does not exist");
         }
 
@@ -134,9 +133,9 @@ public class ApplyAction implements Merg
         for (SourceElement sourceElement : selectedElements)
         {
             controllerState.setSourceElement(sourceElement);
-            generator.beforeExecute(controllerState);
-            result.append(generator.execute(controllerState));
-            generator.afterExecute(controllerState);
+            outlet.beforeExecute(controllerState);
+            result.append(outlet.execute(controllerState));
+            outlet.afterExecute(controllerState);
         }
         controllerState.setSourceElement(currentElement);
         return result.toString();
@@ -147,8 +146,8 @@ public class ApplyAction implements Merg
     {
         return "(ApplyAction: path = "
                 + path
-                + ", generator = "
-                + generatorName
+                + ", outlet = "
+                + outletName
                 + ", acceptNotSet = "
                 + acceptNotSet
                 + ")";
@@ -163,7 +162,7 @@ public class ApplyAction implements Merg
         int result = 1;
         result = prime * result + (acceptNotSet ? secondPrime : thirdPrime);
         result = prime * result + path.hashCode();
-        result = prime * result + generatorName.hashCode();
+        result = prime * result + outletName.hashCode();
         return result;
     }
 
@@ -191,7 +190,7 @@ public class ApplyAction implements Merg
         {
             return false;
         }
-        if (!generatorName.equals(other.generatorName))
+        if (!outletName.equals(other.outletName))
         {
             return false;
         }

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/MergepointAction.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/MergepointAction.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/MergepointAction.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/MergepointAction.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control.action;
+package org.apache.torque.generator.control.action;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.torque.gf.control.act
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
 
 /**
  * An action which can be executed in a mergepoint.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OptionAction.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OptionAction.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OptionAction.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OptionAction.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control.action;
+package org.apache.torque.generator.control.action;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.torque.gf.control.act
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
 
 /**
  * Inserts the value of an option into a mergepoint.
@@ -42,7 +42,7 @@ public class OptionAction implements Mer
      *
      * @param option the name of the option. May or may not be prefixed
      *        with a namespace (if no namespace is used, the namespace of the
-     *        current generator is used).
+     *        current outlet is used).
      * @param acceptNotSet true if it is acceptable that the option is not set,
      *        false if it is an error that the option is not set.
      *        null means true.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OutputAction.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OutputAction.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OutputAction.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/OutputAction.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control.action;
+package org.apache.torque.generator.control.action;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +19,9 @@ package org.apache.torque.gf.control.act
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.control.TokenReplacer;
-import org.apache.torque.gf.generator.GeneratorException;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.control.TokenReplacer;
 
 /**
  * Inserts a fixed String into a mergepoint.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/SourceElementAttributeAction.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/SourceElementAttributeAction.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/SourceElementAttributeAction.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/SourceElementAttributeAction.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control.action;
+package org.apache.torque.generator.control.action;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,14 +19,14 @@ package org.apache.torque.gf.control.act
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.control.TokenReplacer;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourcePath;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.control.TokenReplacer;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.SourcePath;
 
 /**
- * Applies an generator to a given source element.
+ * Applies an outlet to a given source element.
  */
 public class SourceElementAttributeAction implements MergepointAction
 {

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/TraverseAllAction.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.control.action;
+package org.apache.torque.generator.control.action;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,19 +21,19 @@ package org.apache.torque.gf.control.act
 
 import java.util.List;
 
-import org.apache.torque.gf.configuration.generator.GeneratorConfiguration;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.control.TokenReplacer;
-import org.apache.torque.gf.generator.Generator;
-import org.apache.torque.gf.generator.GeneratorException;
-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.source.SourcePath;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.configuration.outlet.OutletConfiguration;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.control.TokenReplacer;
+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.source.SourcePath;
 
 /**
- * Traverses all matching elements, and applies a generator to each matching
- * element. The output of each generator is appended to the output.
+ * Traverses all matching elements, and applies a outlet to each matching
+ * element. The output of each outlet is appended to the output.
  */
 public class TraverseAllAction implements MergepointAction
 {
@@ -43,9 +43,9 @@ public class TraverseAllAction implement
     private String elementsToTraverseName;
 
     /**
-     * The name of the generator to be invoked for each element, not null.
+     * The name of the outlet to be invoked for each element, not null.
      */
-    private String generatorName;
+    private String outletName;
 
     /**
      * Whether it is correct to have no element to traverse.
@@ -56,7 +56,7 @@ public class TraverseAllAction implement
      * Constructor.
      *
      * @param elementsToTraverseName the elements to traverse, not null.
-     * @param generatorName the name of the generator to be invoked for each
+     * @param outletName the name of the outlet to be invoked for each
      *        element, not null.
      * @param acceptEmpty true if it is correct if no matching elements are
      *        found, false to throw an error if no matching elements are found,
@@ -64,7 +64,7 @@ public class TraverseAllAction implement
      */
     public TraverseAllAction(
             String elementsToTraverseName,
-            String generatorName,
+            String outletName,
             Boolean acceptEmpty)
     {
         if (elementsToTraverseName == null)
@@ -74,12 +74,12 @@ public class TraverseAllAction implement
         }
         this.elementsToTraverseName = elementsToTraverseName;
 
-        if (generatorName == null)
+        if (outletName == null)
         {
             throw new IllegalArgumentException(
-                    "generatorName must not be null");
+                    "outletName must not be null");
         }
-        this.generatorName = generatorName;
+        this.outletName = outletName;
         if (acceptEmpty != null)
         {
             this.acceptEmpty = acceptEmpty.booleanValue();
@@ -87,9 +87,9 @@ public class TraverseAllAction implement
     }
 
     /**
-     * Traverses all matching elements, and applies a generator to each matching
-     * element. The output of each generator is appended to the output.
-     * ${...} Tokens are replaced within generatorName and
+     * Traverses all matching elements, and applies an outlet to each matching
+     * element. The output of each outlet is appended to the output.
+     * ${...} Tokens are replaced within outletName and
      * elementsToTraverseName.
      */
     public String execute(ControllerState controllerState)
@@ -97,22 +97,22 @@ public class TraverseAllAction implement
     {
         TokenReplacer tokenReplacer = new TokenReplacer(controllerState);
 
-        Generator generator;
+        Outlet outlet;
         {
-            GeneratorConfiguration generatorConfiguration
+            OutletConfiguration outletConfiguration
                     = controllerState.getUnitConfiguration()
-                        .getGeneratorConfiguration();
-            String detokenizedGeneratorName
-                    = tokenReplacer.process(generatorName);
-            QualifiedName generatorQName = new QualifiedName(
-                    detokenizedGeneratorName,
+                        .getOutletConfiguration();
+            String detokenizedOutletName
+                    = tokenReplacer.process(outletName);
+            QualifiedName outletQName = new QualifiedName(
+                    detokenizedOutletName,
                     Namespace.ROOT_NAMESPACE);
 
-            generator = generatorConfiguration.getGenerator(generatorQName);
-            if (generator == null)
+            outlet = outletConfiguration.getOutlet(outletQName);
+            if (outlet == null)
             {
-                throw new GeneratorException("TraverseAllAction : The generator "
-                        + generatorName
+                throw new GeneratorException("TraverseAllAction : The outlet "
+                        + outletName
                         + " does not exist");
             }
         }
@@ -137,9 +137,9 @@ public class TraverseAllAction implement
         for (SourceElement sourceElement : selectedElements)
         {
             controllerState.setSourceElement(sourceElement);
-            generator.beforeExecute(controllerState);
-            result.append(generator.execute(controllerState));
-            generator.afterExecute(controllerState);
+            outlet.beforeExecute(controllerState);
+            result.append(outlet.execute(controllerState));
+            outlet.afterExecute(controllerState);
         }
         controllerState.setSourceElement(currentElement);
         return result.toString();
@@ -150,8 +150,8 @@ public class TraverseAllAction implement
     {
         return "(TraverseAllAction: element = "
                 + elementsToTraverseName
-                + ", generator = "
-                + generatorName
+                + ", outlet = "
+                + outletName
                 + ", acceptEmpty = "
                 + acceptEmpty
                 + ")";
@@ -166,7 +166,7 @@ public class TraverseAllAction implement
         int result = 1;
         result = prime * result + (acceptEmpty ? secondPrime : thirdPrime);
         result = prime * result + elementsToTraverseName.hashCode();
-        result = prime * result + generatorName.hashCode();
+        result = prime * result + outletName.hashCode();
         return result;
     }
 
@@ -195,7 +195,7 @@ public class TraverseAllAction implement
         {
             return false;
         }
-        if (!generatorName.equals(other.generatorName))
+        if (!outletName.equals(other.outletName))
         {
             return false;
         }

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/package.html
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/package.html?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/action/package.html Sun May 16 15:35:27 2010
@@ -15,7 +15,7 @@
 -->
 <html>
   <head>
-    <title>Torque-gf actions</title>
+    <title>Torque generator mergepoint actions</title>
   </head>
   <body>
     <p>

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

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/WildcardFilter.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.file;
+package org.apache.torque.generator.file;
 
 import java.io.File;
 import java.io.FileFilter;

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Option.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Option.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Option.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Option.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.option;
+package org.apache.torque.generator.option;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.torque.gf.option;
  * under the License.
  */
 
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
  * An option used in the code generation process.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/OptionImpl.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.option;
+package org.apache.torque.generator.option;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.torque.gf.option;
  * under the License.
  */
 
-import org.apache.torque.gf.qname.Namespace;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.qname.Namespace;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
  * The default implementation of the option Interface. This class is immutable.

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/option/Options.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.option;
+package org.apache.torque.generator.option;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,9 +26,9 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.torque.gf.qname.Namespace;
-import org.apache.torque.gf.qname.QualifiedName;
-import org.apache.torque.gf.qname.QualifiedNameMap;
+import org.apache.torque.generator.qname.Namespace;
+import org.apache.torque.generator.qname.QualifiedName;
+import org.apache.torque.generator.qname.QualifiedNameMap;
 
 /**
  * A Store for all options.
@@ -123,8 +123,6 @@ public class Options
 
     /**
      * Returns all options in a Collection.
-     * If options with the same name are present in the result,
-     * options with generator scope override those with global scope.
      *
      * @return a Collection containing all options, not null.
      *         The collection is unmodifiable.
@@ -137,10 +135,6 @@ public class Options
         {
             result.put(globalOption.getQualifiedName(), globalOption);
         }
-        for (Option generatorOption : globalScope.values())
-        {
-            result.put(generatorOption.getQualifiedName(), generatorOption);
-        }
         return Collections.unmodifiableCollection(result.values());
     }
 

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

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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Mergepoint.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/Mergepoint.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Mergepoint.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Mergepoint.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/Mergepoint.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/Mergepoint.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Mergepoint.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator;
+package org.apache.torque.generator.outlet;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,8 @@ package org.apache.torque.gf.generator;
  */
 
 /**
- * An merge point where the output of another generator can be merged
- * into the text generated by a generator.
+ * An merge point where the output of another outlet can be merged
+ * into the text generated by a outlet.
  */
 public class Mergepoint
 {

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Outlet.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/Generator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Outlet.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Outlet.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/Generator.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/Generator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/Outlet.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator;
+package org.apache.torque.generator.outlet;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,15 +21,16 @@ package org.apache.torque.gf.generator;
 
 import java.util.Map;
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.mergepoint.MergepointMapping;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.mergepoint.MergepointMapping;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
  * Generates String output from the AST.
  */
-public interface Generator
+public interface Outlet
 {
     /**
      * Returns the name of the Template. The namespace part of the name defines
@@ -40,7 +41,7 @@ public interface Generator
     QualifiedName getName();
 
     /**
-     * Adds an mergepoint mapping to the generator. No mergepoint
+     * Adds an mergepoint mapping to the outlet. No mergepoint
      * mappings must exist with the given name.
      *
      * @param mergepointMapping the mergepointMapping to add, not null.
@@ -53,7 +54,7 @@ public interface Generator
         throws ConfigurationException;
 
     /**
-     * Sets an mergepoint mapping in the generator. If a mergepoint
+     * Sets an mergepoint mapping in the outlet. If a mergepoint
      * mapping with the given name already exists, it is replaced.
      *
      * @param mergepointMapping the mergepointMapping to add, not null.
@@ -82,7 +83,7 @@ public interface Generator
     Map<String, MergepointMapping> getMergepointMappings();
 
     /**
-     * Sets the name of the input root element. If set, the generator must
+     * Sets the name of the input root element. If set, the outlet must
      * check if the name of the input root element corresponds to the set
      * element name and throw an exception if the names do not match.
      *
@@ -92,7 +93,7 @@ public interface Generator
     void setInputElementName(String inputName);
 
     /**
-     * Returns the name of the input root element. If not null, the generator
+     * Returns the name of the input root element. If not null, the outlet
      * checks if the name of the input root element corresponds to the set
      * element name and throw an exception if the names do not match.
      *
@@ -126,7 +127,7 @@ public interface Generator
      *
      * @param controllerState the current controller state, not null.
      *
-     * @return the output of the Generator.
+     * @return the output of the Outlet.
      *
      * @throws GeneratorException if generation fails.
      */

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/GeneratorImpl.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/GeneratorImpl.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/GeneratorImpl.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator;
+package org.apache.torque.generator.outlet;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,34 +26,35 @@ 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.mergepoint.MergepointMapping;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.control.action.MergepointAction;
-import org.apache.torque.gf.qname.QualifiedName;
-import org.apache.torque.gf.source.SourcePath;
-import org.apache.torque.gf.variable.Variable;
-import org.apache.torque.gf.variable.VariableStore;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.mergepoint.MergepointMapping;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.control.action.MergepointAction;
+import org.apache.torque.generator.qname.QualifiedName;
+import org.apache.torque.generator.source.SourcePath;
+import org.apache.torque.generator.variable.Variable;
+import org.apache.torque.generator.variable.VariableStore;
 
 /**
- * Implementation of the features in the <code>Generator<code> interface
- * which do not depend on type of Generator.
+ * Implementation of the features in the <code>Outlet<code> interface
+ * which do not depend on type of Outlet.
  */
-public abstract class GeneratorImpl implements Generator
+public abstract class OutletImpl implements Outlet
 {
     /**
      * The log.
      */
-    private static Log log = LogFactory.getLog(GeneratorImpl.class);
+    private static Log log = LogFactory.getLog(OutletImpl.class);
 
     /**
-     * The mergepoint mappings configured for this generator.
+     * The mergepoint mappings configured for this outlet.
      */
     private Map<String, MergepointMapping> mergepointMappings
             = new HashMap<String, MergepointMapping>();
 
     /**
-     * The name of the generator. Is immutable.
+     * The name of the outlet. Is immutable.
      */
     private QualifiedName name;
 
@@ -64,13 +65,13 @@ public abstract class GeneratorImpl impl
     private String inputElementName;
 
     /**
-     * Constructs a GeneratorImpl with the given name.
+     * Constructs a OutletImpl with the given name.
      *
-     * @param name the name of this generator, not null.
+     * @param name the name of this outlet, not null.
      *
      * @throws NullPointerException if name is null.
      */
-    public GeneratorImpl(QualifiedName name)
+    public OutletImpl(QualifiedName name)
     {
         if (name == null)
         {
@@ -95,7 +96,7 @@ public abstract class GeneratorImpl impl
     }
 
     /**
-     * Adds an mergepoint mapping to the generator. No mergepoint
+     * Adds an mergepoint mapping to the outlet. No mergepoint
      * mappings must exist with the given name.
      *
      * @param mergepointMapping the mergepointMapping to add, not null.
@@ -123,7 +124,7 @@ public abstract class GeneratorImpl impl
     }
 
     /**
-     * Sets an mergepoint mapping in the generator. If a mergepoint
+     * Sets an mergepoint mapping in the outlet. If a mergepoint
      * mapping with the given name already exists, it is replaced.
      *
      * @param mergepointMapping the mergepointMapping to add, not null.
@@ -157,10 +158,10 @@ public abstract class GeneratorImpl impl
     public void beforeExecute(ControllerState controllerState)
         throws GeneratorException
     {
-        controllerState.pushGenerator(this);
+        controllerState.pushOutlet(this);
         if (log.isDebugEnabled())
         {
-            log.debug("Executing generator "
+            log.debug("Executing outlet "
                     + getName()
                     + " on element "
                     + SourcePath.getPathAsString(
@@ -170,7 +171,7 @@ public abstract class GeneratorImpl impl
 
     public void afterExecute(ControllerState controllerState)
     {
-        controllerState.popGenerator();
+        controllerState.popOutlet();
     }
 
     public abstract String execute(ControllerState controllerState)
@@ -189,7 +190,7 @@ public abstract class GeneratorImpl impl
     /**
      * Sets a variable. The key can be given with or without namespace;
      * in the latter case, the variable is set in the namespace of this
-     * generator. the Scope of the variable is this generator and its children.
+     * outlet. The scope of the variable is this outlet and its children.
      *
      * @param key the name of the variable, not null
      * @param value the value of the variable, may be null.
@@ -209,7 +210,7 @@ public abstract class GeneratorImpl impl
     /**
      * Sets a variable. The key can be given with or without namespace;
      * in the latter case, the variable is set in the namespace of this
-     * generator.
+     * outlet.
      *
      * @param key the name of the variable, not null.
      * @param value the value of the variable, may be null.
@@ -238,7 +239,7 @@ public abstract class GeneratorImpl impl
     /**
      * Returns the variable with the given key. The key can either be a name
      * prefixed with a namespace, or a name without namespace, in which case
-     * the namespace of the generator is used.
+     * the namespace of the outlet is used.
      *
      * In the case that the variable is not set in this namespace, the parent
      * namespaces are searched recursively.  If the variable is not set in any
@@ -287,7 +288,7 @@ public abstract class GeneratorImpl impl
             log.debug("mergepoint() : Start for mergepoint " + mergepointName);
         }
         MergepointMapping mergepointMapping
-                = controllerState.getGenerator().getMergepointMapping(
+                = controllerState.getOutlet().getMergepointMapping(
                             mergepointName);
         if (mergepointMapping == null)
         {
@@ -295,7 +296,7 @@ public abstract class GeneratorImpl impl
             {
                 log.info("mergepoint() : End. Mapping "
                         + mergepointName
-                        + " not found in generator "
+                        + " not found in outlet "
                         + getName()
                         + ", returning the empty String");
             }
@@ -306,8 +307,8 @@ public abstract class GeneratorImpl impl
         {
             log.debug("No actions specified for action mapping with name "
                     + mergepointName
-                    + " in generator "
-                    + controllerState.getGenerator().getName()
+                    + " in outlet "
+                    + controllerState.getOutlet().getName()
                     + " while generating to "
                     + controllerState.getOutputFile()
                     + " Returning the empty String.");

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java (from r918870, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/CamelbackGenerator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/CamelbackGenerator.java&r1=918870&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/CamelbackGenerator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/CamelbackOutlet.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,11 +19,11 @@ package org.apache.torque.gf.generator.j
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.processor.string.Camelbacker;
-import org.apache.torque.gf.processor.string.WrapReservedJavaWords;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.processor.string.Camelbacker;
+import org.apache.torque.generator.processor.string.WrapReservedJavaWords;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
  * Transform a String to its camelback version. This is typically
@@ -37,7 +37,7 @@ import org.apache.torque.gf.qname.Qualif
  * an underscore if the result of the transwormation would be a reserved word
  * within the java syntax (e.g. int, for etc...)
  */
-public class CamelbackGenerator extends StringInputGenerator
+public class CamelbackOutlet extends StringInputOutlet
 {
     /**
      * The processor which does the camelback processing.
@@ -56,9 +56,9 @@ public class CamelbackGenerator extends 
     /**
      * Constructor.
      *
-     * @param qualifiedName the unique name of the generator, not null.
+     * @param qualifiedName the unique name of the outlet, not null.
      */
-    public CamelbackGenerator(QualifiedName qualifiedName)
+    public CamelbackOutlet(QualifiedName qualifiedName)
     {
         super(qualifiedName);
     }

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ConstantNameOutlet.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/ConstantNameGenerator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ConstantNameOutlet.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ConstantNameOutlet.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/ConstantNameGenerator.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/ConstantNameGenerator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ConstantNameOutlet.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,16 +19,16 @@ package org.apache.torque.gf.generator.j
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.processor.string.ConstantNameCreator;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.processor.string.ConstantNameCreator;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
  * Creates the name of a constant from a string. All letters in the String are
  * capitalized, and underscores (_) are used as separators per default.
  */
-public class ConstantNameGenerator extends StringInputGenerator
+public class ConstantNameOutlet extends StringInputOutlet
 {
     /**
      * The processor which does the character replacement.
@@ -38,9 +38,9 @@ public class ConstantNameGenerator exten
     /**
      * Constructor.
      *
-     * @param qualifiedName the unique name of the generator, not null.
+     * @param qualifiedName the unique name of the outlet, not null.
      */
-    public ConstantNameGenerator(QualifiedName qualifiedName)
+    public ConstantNameOutlet(QualifiedName qualifiedName)
     {
         super(qualifiedName);
     }

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavaFilenameOutlet.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/JavaFilenameGenerator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavaFilenameOutlet.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavaFilenameOutlet.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/JavaFilenameGenerator.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/JavaFilenameGenerator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/JavaFilenameOutlet.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,16 +19,16 @@ package org.apache.torque.gf.generator.j
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.generator.GeneratorImpl;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.outlet.OutletImpl;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
  * Takes a class name and a package name as input and generates a
  * filename(including path for package) for a java file from it.
  */
-public class JavaFilenameGenerator extends GeneratorImpl
+public class JavaFilenameOutlet extends OutletImpl
 {
     /**
      * The name of the merge point which provides the class name.
@@ -44,9 +44,9 @@ public class JavaFilenameGenerator exten
     /**
      * Constructor.
      *
-     * @param qualifiedName the qualified name of the generator, not null.
+     * @param qualifiedName the qualified name of the outlet, not null.
      */
-    public JavaFilenameGenerator(QualifiedName qualifiedName)
+    public JavaFilenameOutlet(QualifiedName qualifiedName)
     {
         super(qualifiedName);
     }

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutlet.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/ModifySourcenameGenerator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutlet.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutlet.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/ModifySourcenameGenerator.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/ModifySourcenameGenerator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutlet.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,15 +24,15 @@ import java.io.File;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.generator.GeneratorImpl;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.outlet.OutletImpl;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
  * Creates a target filename from a source filename.
  */
-public class ModifySourcenameGenerator extends GeneratorImpl
+public class ModifySourcenameOutlet extends OutletImpl
 {
     /**
      * The prefix which should be added at the beginning of the target filename.
@@ -58,14 +58,14 @@ public class ModifySourcenameGenerator e
 
     /** The logger of the class. */
     private static Logger logger
-            = Logger.getLogger(ModifySourcenameGenerator.class);
+            = Logger.getLogger(ModifySourcenameOutlet.class);
 
     /**
      * Constructor.
      *
-     * @param qualifiedName the qualified name of the generator, not null.
+     * @param qualifiedName the qualified name of the outlet, not null.
      */
-    public ModifySourcenameGenerator(QualifiedName qualifiedName)
+    public ModifySourcenameOutlet(QualifiedName qualifiedName)
     {
         super(qualifiedName);
     }

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/NewlineOutlet.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/NewlineGenerator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/NewlineOutlet.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/NewlineOutlet.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/NewlineGenerator.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/NewlineGenerator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/NewlineOutlet.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,14 +19,14 @@ package org.apache.torque.gf.generator.j
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
  * Creates new lines (\n or \r\n).
  */
-public class NewlineGenerator extends GeneratorWithoutMergepoints
+public class NewlineOutlet extends OutletWithoutMergepoints
 {
     /** The carriage return char '\r'. */
     public static final char CARRIAGE_RETURN = '\r';
@@ -43,9 +43,9 @@ public class NewlineGenerator extends Ge
     /**
      * Constructor.
      *
-     * @param name the qualified name of the generator.
+     * @param name the qualified name of the outlet.
      */
-    public NewlineGenerator(QualifiedName name)
+    public NewlineOutlet(QualifiedName name)
     {
         super(name);
     }

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletUtils.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/GeneratorUtils.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletUtils.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletUtils.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/GeneratorUtils.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/GeneratorUtils.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletUtils.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,29 +21,29 @@ package org.apache.torque.gf.generator.j
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.qname.Namespace;
-import org.apache.torque.gf.qname.QualifiedName;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourcePath;
-import org.apache.torque.gf.variable.Variable;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+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.source.SourcePath;
+import org.apache.torque.generator.variable.Variable;
 
 /**
  * Utility methods to retrieve information out of the source model or the
  * configuration. The methods provide adequate logging and error handling.
  */
-public final class GeneratorUtils
+public final class OutletUtils
 {
     /**
      * Private constructor for utility class.
      */
-    private GeneratorUtils()
+    private OutletUtils()
     {
     }
 
     /** The logger for the class. */
-    private static Log log = LogFactory.getLog(GeneratorUtils.class);
+    private static Log log = LogFactory.getLog(OutletUtils.class);
 
     /**
      * Retrieves the value of a source element attribute. The source element
@@ -165,7 +165,7 @@ public final class GeneratorUtils
                 && presetValue == null
                 && variableName == null)
         {
-             return GeneratorUtils.getOption(
+             return OutletUtils.getOption(
                      optionName,
                      controllerState,
                      clazz);
@@ -175,7 +175,7 @@ public final class GeneratorUtils
                 && presetValue == null
                 && variableName == null)
         {
-             return GeneratorUtils.getSourceElementAttribute(
+             return OutletUtils.getSourceElementAttribute(
                      sourceElementName,
                      sourceElementAttribute,
                      controllerState,
@@ -187,7 +187,7 @@ public final class GeneratorUtils
                 && presetValue == null)
         {
             Namespace namespace
-                    = controllerState.getGenerator().getName().getNamespace();
+                    = controllerState.getOutlet().getName().getNamespace();
             QualifiedName variableQualifiedName = new QualifiedName(
                     variableName,
                     namespace);

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletWithoutMergepoints.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/GeneratorWithoutMergepoints.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletWithoutMergepoints.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletWithoutMergepoints.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/GeneratorWithoutMergepoints.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/GeneratorWithoutMergepoints.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletWithoutMergepoints.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,24 +19,24 @@ package org.apache.torque.gf.generator.j
  * under the License.
  */
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.configuration.mergepoint.MergepointMapping;
-import org.apache.torque.gf.generator.GeneratorImpl;
-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.OutletImpl;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
- * A generator without mergepoints.
+ * An outlet without mergepoints.
  */
-public abstract class GeneratorWithoutMergepoints extends GeneratorImpl
+public abstract class OutletWithoutMergepoints extends OutletImpl
 {
     /**
-     * Constructs a GeneratorWithoutMergepoints with the given name.
+     * Constructs a OutletWithoutMergepoints with the given name.
      *
-     * @param name the name of this generator, not null.
+     * @param name the name of this outlet, not null.
      *
      * @throws NullPointerException if name is null.
      */
-    public GeneratorWithoutMergepoints(QualifiedName name)
+    public OutletWithoutMergepoints(QualifiedName name)
     {
         super(name);
     }
@@ -46,7 +46,7 @@ public abstract class GeneratorWithoutMe
             throws ConfigurationException
     {
         throw new UnsupportedOperationException(
-                "The generator " + getClass().getName()
+                "The outlet " + getClass().getName()
                     + " does not support mergepoints");
     }
 

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/PackageToPathOutlet.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/PackageToPathGenerator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/PackageToPathOutlet.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/PackageToPathOutlet.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/PackageToPathGenerator.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/PackageToPathGenerator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/PackageToPathOutlet.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,21 +19,21 @@ package org.apache.torque.gf.generator.j
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
  * Takes a package as input and generates a path from it.
  */
-public class PackageToPathGenerator extends StringInputGenerator
+public class PackageToPathOutlet extends StringInputOutlet
 {
     /**
      * Constructor for use in child classes.
      *
-     * @param qualifiedName the fully qualified name of the generator.
+     * @param qualifiedName the fully qualified name of the outlet.
      */
-    public PackageToPathGenerator(QualifiedName qualifiedName)
+    public PackageToPathOutlet(QualifiedName qualifiedName)
     {
         super(qualifiedName);
     }
@@ -41,7 +41,7 @@ public class PackageToPathGenerator exte
     /**
      * Reads the input and replaces all dots by slashes.
      *
-     * @see org.apache.torque.gf.generator.Generator#execute(ControllerState)
+     * @see org.apache.torque.generator.outlet.Outlet#execute(ControllerState)
      */
     @Override
     public String execute(ControllerState controllerState)

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/StringInputOutlet.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/StringInputGenerator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/StringInputOutlet.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/StringInputOutlet.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/StringInputGenerator.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/java/StringInputGenerator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/StringInputOutlet.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.generator.java;
+package org.apache.torque.generator.outlet.java;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,15 +19,15 @@ package org.apache.torque.gf.generator.j
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
- * A base class for a generator which takes a String as input
- * (not a Source Element as a normal generator would).
+ * A base class for a outlet which takes a String as input
+ * (not a Source Element as a normal outlet would).
  */
-public abstract class StringInputGenerator extends GeneratorWithoutMergepoints
+public abstract class StringInputOutlet extends OutletWithoutMergepoints
 {
     /**
      * The direct input.
@@ -57,11 +57,11 @@ public abstract class StringInputGenerat
     private String inputVariable;
 
     /**
-     * Constructs a singleInputGenerator.
+     * Constructs a singleInputOutlet.
      *
-     * @param qualifiedName the name of the generator.
+     * @param qualifiedName the name of the outlet.
      */
-    public StringInputGenerator(QualifiedName qualifiedName)
+    public StringInputOutlet(QualifiedName qualifiedName)
     {
         super(qualifiedName);
     }
@@ -139,7 +139,7 @@ public abstract class StringInputGenerat
     protected String getInput(ControllerState controllerState)
         throws GeneratorException
     {
-        return GeneratorUtils.getFromDifferentPlaces(
+        return OutletUtils.getFromDifferentPlaces(
                 inputValue,
                 inputOption,
                 inputVariable,

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/package.html
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/package.html?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/package.html Sun May 16 15:35:27 2010
@@ -15,12 +15,11 @@
 -->
 <html>
   <head>
-    <title>Torque-gf java generators</title>
+    <title>Torque generator java outlets</title>
   </head>
   <body>
     <p>
-      This package defines java generators and provides some implementations
-      for different purposes.
+      This package defines java outlets and provides some implementations.
     </p>
   </body>
 </html>

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/package.html (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/package.html)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/package.html?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/package.html&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/package.html&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/generator/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/package.html Sun May 16 15:35:27 2010
@@ -15,11 +15,12 @@
 -->
 <html>
   <head>
-    <title>Torque-gf generators</title>
+    <title>Torque generator outlets</title>
   </head>
   <body>
     <p>
-      This package defines torque-gf generators.
+      This package defines torque generator outlets which produce output
+      snippets from the source.
     </p>
   </body>
 </html>

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

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

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

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

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/package.html
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/package.html?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/processor/string/package.html Sun May 16 15:35:27 2010
@@ -15,7 +15,7 @@
 -->
 <html>
   <head>
-    <title>Torque-gf string processors</title>
+    <title>Torque generator string processors</title>
   </head>
   <body>
     <p>

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/QualifiedName.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.qname;
+package org.apache.torque.generator.qname;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,8 @@ import org.apache.commons.lang.StringUti
  * A qualified name is in the scope of its own namespace and all children
  * namespaces of its own namespace (i.e. the namespaces "deeper down"
  * the hierarchy). For example, the namespace org.apache.torque
- * is in the scope of org.apache but not in the scope of org.apache.torque.gf.
+ * is in the scope of org.apache but not in the scope of 
+ * org.apache.torque.generator.
  * As a special case, if the namespace is the empty String,
  * the name is valid in all namespaces.
  *

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/package.html
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/package.html?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/qname/package.html Sun May 16 15:35:27 2010
@@ -15,7 +15,7 @@
 -->
 <html>
   <head>
-    <title>Torque-gf qualified names</title>
+    <title>Torque generator qualified names</title>
   </head>
   <body>
     <p>

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/FileSource.java (from r930713, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSource.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/FileSource.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/FileSource.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSource.java&r1=930713&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSource.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/FileSource.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source;
+package org.apache.torque.generator.source;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,9 +28,9 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.source.filter.SourceFilter;
-import org.apache.torque.gf.source.xml.SourceToXml;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.source.filter.SourceFilter;
+import org.apache.torque.generator.source.xml.SourceToXml;
 
 /**
  * A Source which uses a file as input.

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/FileSourcesImpl.java (from r917533, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSourcesImpl.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/FileSourcesImpl.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/FileSourcesImpl.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSourcesImpl.java&r1=917533&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/FileSourcesImpl.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/FileSourcesImpl.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source;
+package org.apache.torque.generator.source;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,9 +28,9 @@ import java.util.Set;
 
 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.file.Fileset;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.configuration.ConfigurationHandlers;
+import org.apache.torque.generator.file.Fileset;
 
 /**
  * A collection of Sources, which all have the same elements,

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SimpleSourcesImpl.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SimpleSourcesImpl.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SimpleSourcesImpl.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SimpleSourcesImpl.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SimpleSourcesImpl.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SimpleSourcesImpl.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SimpleSourcesImpl.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source;
+package org.apache.torque.generator.source;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,9 +23,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.torque.gf.configuration.ClassHelper;
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.source.filter.SourceFilter;
+import org.apache.torque.generator.configuration.ClassHelper;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.source.filter.SourceFilter;
 
 /**
  * A collection of Sources, which all have the same elements,

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/Source.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Source.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/Source.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/Source.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Source.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Source.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/Source.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source;
+package org.apache.torque.generator.source;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package org.apache.torque.gf.source;
 import java.io.File;
 import java.util.List;
 
-import org.apache.torque.gf.source.filter.SourceFilter;
+import org.apache.torque.generator.source.filter.SourceFilter;
 
 /**
  * An entity which serves as an input for the generation process.



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