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 [6/6] - in /db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator: ./ configuration/ configuration/controller/ configuration/generator/ configuration/mergepoint/ configuration/option/ configuration/outle...
Date Sun, 16 May 2010 15:35:33 GMT
Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceAttributeName.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceAttributeName.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceAttributeName.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceAttributeName.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceAttributeName.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceAttributeName.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceAttributeName.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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java (from r930722, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceElement.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceElement.java&r1=930722&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceElement.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceElement.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

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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceException.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceException.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceException.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceException.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceException.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceException.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceException.java Sun May 16 15:35:27 2010
@@ -1,4 +1,6 @@
-package org.apache.torque.gf.source;
+package org.apache.torque.generator.source;
+
+import org.apache.torque.generator.GeneratorException;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +22,9 @@ package org.apache.torque.gf.source;
  */
 
 /**
- * This exception denotes that the source for a generator cannot be processed.
+ * This exception denotes that the source cannot be read.
  */
-public class SourceException extends Exception
+public class SourceException extends GeneratorException
 {
     /**
      * The version of the class

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceImpl.java (from r930714, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceImpl.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceImpl.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceImpl.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceImpl.java&r1=930714&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourceImpl.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceImpl.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,8 +23,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.source.filter.SourceFilter;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.source.filter.SourceFilter;
 
 /**
  * A Source which uses a file as input.

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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourcePath.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourcePath.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/SourcePath.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourcePath.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
@@ -26,7 +26,7 @@ import java.util.ListIterator;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.apache.torque.gf.generator.GeneratorException;
+import org.apache.torque.generator.GeneratorException;
 
 /**
  * Methods for traversing a source tree.

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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/Sources.java (from r917533, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Sources.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/Sources.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/Sources.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Sources.java&r1=917533&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/Sources.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/Sources.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
@@ -21,8 +21,8 @@ package org.apache.torque.gf.source;
 
 import java.util.Iterator;
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.file.Fileset;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.file.Fileset;
 
 /**
  * The input for an generation process.

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/TransformerDefinition.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/TransformerDefinition.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/TransformerDefinition.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/TransformerDefinition.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/TransformerDefinition.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/TransformerDefinition.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/TransformerDefinition.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
@@ -19,7 +19,7 @@ package org.apache.torque.gf.source;
  * under the License.
  */
 
-import org.apache.torque.gf.source.transform.SourceTransformer;
+import org.apache.torque.generator.source.transform.SourceTransformer;
 
 /**
  * All necessary informations for doing a transformation.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/SourceFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/SourceFilter.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/SourceFilter.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/SourceFilter.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.filter;
+package org.apache.torque.generator.source.filter;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.torque.gf.source.filt
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
+import org.apache.torque.generator.control.ControllerState;
 
 /**
  * A filter deciding whether the generation should proceed or not.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/StopGenerationSourceFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/StopGenerationSourceFilter.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/StopGenerationSourceFilter.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/filter/StopGenerationSourceFilter.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.filter;
+package org.apache.torque.generator.source.filter;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.torque.gf.source.filt
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
+import org.apache.torque.generator.control.ControllerState;
 
 /**
  * A filter which always stops the current generation.

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

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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/PropertiesSourceParser.java (from r930722, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/properties/PropertiesSourceParser.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/PropertiesSourceParser.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/PropertiesSourceParser.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/properties/PropertiesSourceParser.java&r1=930722&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/properties/PropertiesSourceParser.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/PropertiesSourceParser.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.properties;
+package org.apache.torque.generator.source.properties;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,10 +26,9 @@ import java.util.Properties;
 import java.util.Set;
 
 import org.apache.commons.collections.set.ListOrderedSet;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourceException;
-import org.apache.torque.gf.source.SourceParser;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.SourceException;
+import org.apache.torque.generator.source.SourceParser;
 
 /**
  * Parses a stream containing properties data into a source element hierarchy.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/PropertiesSourceType.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/PropertiesSourceType.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/PropertiesSourceType.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/PropertiesSourceType.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.properties;
+package org.apache.torque.generator.source.properties;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.torque.gf.source.prop
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceParser;
-import org.apache.torque.gf.source.SourceType;
+import org.apache.torque.generator.source.SourceParser;
+import org.apache.torque.generator.source.SourceType;
 
 /**
  * The source type representing an properties source.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/package.html
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/package.html?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/properties/package.html Sun May 16 15:35:27 2010
@@ -15,12 +15,11 @@
 -->
 <html>
   <head>
-    <title>Torque-gf properties sources</title>
+    <title>Torque generator properties sources</title>
   </head>
   <body>
     <p>
-      This package contains the handling of properties source files
-      in Torque-gf.
+      This package contains the handling of properties source files.
     </p>
   </body>
 </html>

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.transform;
+package org.apache.torque.generator.source.transform;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,8 +27,8 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
 
 /**
  * Adds or replaces attributes in a SourceElement according to a definition

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformer.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformer.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformer.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.transform;
+package org.apache.torque.generator.source.transform;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package org.apache.torque.gf.source.tran
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.processor.string.Camelbacker;
-import org.apache.torque.gf.source.SourceElement;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.processor.string.Camelbacker;
+import org.apache.torque.generator.source.SourceElement;
 
 /**
  * Converts a source element Attribute such that it can be used as method name.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/CopyAttributeTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/CopyAttributeTransformer.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/CopyAttributeTransformer.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/CopyAttributeTransformer.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.transform;
+package org.apache.torque.generator.source.transform;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,8 @@ package org.apache.torque.gf.source.tran
  */
 
 import org.apache.log4j.Logger;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
 
 /**
  * Fills an attribute with the content of another attribute.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/GetterSetterNameTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/GetterSetterNameTransformer.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/GetterSetterNameTransformer.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/GetterSetterNameTransformer.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.transform;
+package org.apache.torque.generator.source.transform;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package org.apache.torque.gf.source.tran
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.processor.string.Camelbacker;
-import org.apache.torque.gf.source.SourceElement;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.processor.string.Camelbacker;
+import org.apache.torque.generator.source.SourceElement;
 
 /**
  * Takes a property name as input from a source element attribute

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTargetAttributeTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTargetAttributeTransformer.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTargetAttributeTransformer.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTargetAttributeTransformer.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.transform;
+package org.apache.torque.generator.source.transform;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,8 @@ package org.apache.torque.gf.source.tran
  */
 
 import org.apache.log4j.Logger;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
 
 /**
  * A transformer which has a source attribute and a target attribute.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTransformer.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTransformer.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTransformer.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTransformer.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.transform;
+package org.apache.torque.generator.source.transform;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.torque.gf.source.tran
  * under the License.
  */
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.source.SourceElement;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
 
 /**
  * Transforms one source tree into another source tree.

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

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

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/SourceToXml.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/SourceToXml.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/SourceToXml.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/SourceToXml.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.xml;
+package org.apache.torque.generator.source.xml;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.torque.gf.source.SourceElement;
+import org.apache.torque.generator.source.SourceElement;
 
 /**
  * Creates an xml String out of a source tree.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceParser.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceParser.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceParser.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceParser.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.xml;
+package org.apache.torque.generator.source.xml;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,9 +26,9 @@ import javax.xml.parsers.ParserConfigura
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourceException;
-import org.apache.torque.gf.source.SourceParser;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.source.SourceException;
+import org.apache.torque.generator.source.SourceParser;
 import org.xml.sax.SAXException;
 
 /**

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceSaxHandler.java (from r930722, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/xml/XmlSourceSaxHandler.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceSaxHandler.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceSaxHandler.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/xml/XmlSourceSaxHandler.java&r1=930722&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/source/xml/XmlSourceSaxHandler.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceSaxHandler.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.xml;
+package org.apache.torque.generator.source.xml;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,7 @@ package org.apache.torque.gf.source.xml;
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.source.SourceElement;
+import org.apache.torque.generator.source.SourceElement;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceType.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceType.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceType.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/XmlSourceType.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.source.xml;
+package org.apache.torque.generator.source.xml;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.torque.gf.source.xml;
  * under the License.
  */
 
-import org.apache.torque.gf.source.SourceParser;
-import org.apache.torque.gf.source.SourceType;
+import org.apache.torque.generator.source.SourceParser;
+import org.apache.torque.generator.source.SourceType;
 
 /**
  * The source type representing an XML source.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/package.html
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/package.html?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/xml/package.html Sun May 16 15:35:27 2010
@@ -15,12 +15,11 @@
 -->
 <html>
   <head>
-    <title>Torque-gf XML sources</title>
+    <title>Torque generator XML sources</title>
   </head>
   <body>
     <p>
-      This package contains the handling of XML source files
-      in Torque-gf.
+      This package contains the handling of XML source files.
     </p>
   </body>
 </html>

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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutlet.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/TemplateGenerator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutlet.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutlet.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/TemplateGenerator.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/TemplateGenerator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutlet.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.template;
+package org.apache.torque.generator.template;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,14 +19,14 @@ package org.apache.torque.gf.template;
  * under the License.
  */
 
-import org.apache.torque.gf.configuration.ConfigurationException;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.Generator;
+import org.apache.torque.generator.configuration.ConfigurationException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.outlet.Outlet;
 
 /**
- * A Generator which interprets a template.
+ * A Outlet which interprets a template.
  */
-public interface TemplateGenerator extends Generator
+public interface TemplateOutlet extends Outlet
 {
     /**
      * Returns the contents as a Template as a String.

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutletImpl.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/TemplateGeneratorImpl.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutletImpl.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutletImpl.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/TemplateGeneratorImpl.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/TemplateGeneratorImpl.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/TemplateOutletImpl.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.template;
+package org.apache.torque.generator.template;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,22 +28,22 @@ 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.ConfigurationProvider;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.control.TokenReplacer;
-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.ConfigurationProvider;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.control.TokenReplacer;
+import org.apache.torque.generator.outlet.OutletImpl;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
- * An implementation of the TemplateGenerator interface.
+ * An implementation of the TemplateOutlet interface.
  */
-public abstract class TemplateGeneratorImpl
-        extends GeneratorImpl
-        implements TemplateGenerator
+public abstract class TemplateOutletImpl
+        extends OutletImpl
+        implements TemplateOutlet
 {
     /** The log of the class. */
-    private static Log log = LogFactory.getLog(TemplateGeneratorImpl.class);
+    private static Log log = LogFactory.getLog(TemplateOutletImpl.class);
 
     /**
      * The content of the templates.
@@ -83,9 +83,9 @@ public abstract class TemplateGeneratorI
     private static final int CONTENT_TO_STRING_MAX_OUTPUT_LENGTH = 40;
 
     /**
-     * Constructs a TemplateGeneratorImpl with the given name.
+     * Constructs a TemplateOutletImpl with the given name.
      *
-     * @param name the name of this generator, not null.
+     * @param name the name of this outlet, not null.
      * @param configurationProvider the provider for reading the templates,
      *        not null.
      * @param path the path to the templates, not null.
@@ -98,7 +98,7 @@ public abstract class TemplateGeneratorI
      * @throws NullPointerException if name or inputStream are null.
      * @throws ConfigurationException if the template cannot be loaded.
      */
-    protected TemplateGeneratorImpl(
+    protected TemplateOutletImpl(
             QualifiedName name,
             ConfigurationProvider configurationProvider,
             String path,
@@ -216,9 +216,9 @@ public abstract class TemplateGeneratorI
     }
 
     /**
-     * Returns a String representation of this generator for debugging purposes.
+     * Returns a String representation of this outlet for debugging purposes.
      *
-     * @return a String representation of this generator, never null.
+     * @return a String representation of this outlet, never null.
      *
      * @see Object#toString()
      */

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

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/TorqueGfVelocity.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/TorqueGfVelocity.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/TorqueGfVelocity.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/TorqueGenVelocity.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.template.velocity;
+package org.apache.torque.generator.template.velocity;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,20 +19,22 @@ package org.apache.torque.gf.template.ve
  * under the License.
  */
 
+import java.io.File;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.variable.Variable;
+import org.apache.commons.lang.StringUtils;
+import org.apache.torque.generator.GeneratorException;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.variable.Variable;
 
 /**
  * This class acts as an interface to the Torque generator from the
  * templates. It lets the user access Torque generator properties from the
  * templates, and allows to execute certain action from within the templates.
  */
-public class TorqueGfVelocity
+public class TorqueGenVelocity
 {
     /**
      * The state of the controller in which this generator interface is used.
@@ -40,9 +42,9 @@ public class TorqueGfVelocity
     private ControllerState controllerState;
 
     /**
-     * The generator in which context this class is used.
+     * The outlet in which context this class is used.
      */
-    private VelocityGenerator generator;
+    private VelocityOutlet outlet;
 
     /**
      * A counter which can be used in velocity templates.
@@ -52,26 +54,26 @@ public class TorqueGfVelocity
     /**
      * Constructs a generator interface within the given controllerState.
      *
-     * @param generator the controller state in which this
-     *        generator interface will be used, not null.
+     * @param outlet the outlet in which this generator interface will be used,
+     *        not null.
      * @param controllerState the controller context.
      *
-     * @throws NullPointerException if controllerState is null.
+     * @throws NullPointerException if outlet or controllerState are null.
      */
-    public TorqueGfVelocity(
-            VelocityGenerator generator,
+    public TorqueGenVelocity(
+            VelocityOutlet outlet,
             ControllerState controllerState)
     {
         if (controllerState == null)
         {
             throw new NullPointerException("controllerState may not be null");
         }
-        if (generator == null)
+        if (outlet == null)
         {
-            throw new NullPointerException("generator may not be null");
+            throw new NullPointerException("outlet may not be null");
         }
         this.controllerState = controllerState;
-        this.generator = generator;
+        this.outlet = outlet;
     }
 
     /**
@@ -85,7 +87,7 @@ public class TorqueGfVelocity
     public String mergepoint(String mergepointName)
         throws GeneratorException
     {
-        return generator.mergepoint(mergepointName, controllerState);
+        return outlet.mergepoint(mergepointName, controllerState);
     }
 
     /**
@@ -167,7 +169,7 @@ public class TorqueGfVelocity
     /**
      * Returns the option 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 currently active outlet is used.
      *
      * In the case that the option is not set in this namespace, the parent
      * namespaces are searched recursively.  If the option is not set in any
@@ -187,7 +189,7 @@ public class TorqueGfVelocity
      * Returns the option with the given key as boolean value.
      * 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.
+     * currently active outlet is used.
      *
      * In the case that the option is not set in this namespace, the parent
      * namespaces are searched recursively.  If the option is not set in any
@@ -204,9 +206,38 @@ public class TorqueGfVelocity
     }
 
     /**
+     * Returns the option with the given key as int value.
+     * The key can either be a name prefixed with a namespace,
+     * or a name without namespace, in which case the namespace of the
+     * currently active outlet is used.
+     *
+     * In the case that the option is not set in this namespace, the parent
+     * namespaces are searched recursively.  If the option is not set in any
+     * of the parent namespaces or empty, 0 is returned.
+     *
+     * @param key the key for the option to retrieve.
+     * @return the option for the given key, converted to a boolean
+     */
+    public int intOption(String key)
+    {
+        Object optionValue = controllerState.getOption(key);
+        if (optionValue == null)
+        {
+            return 0;
+        }
+        String optionString = optionValue.toString();
+        if (StringUtils.isBlank(optionString))
+        {
+            return 0;
+        }
+        
+        return Integer.parseInt(optionString);
+    }
+
+    /**
      * 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 currently active 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
@@ -218,13 +249,14 @@ public class TorqueGfVelocity
      */
     public Object getVariable(String key)
     {
-        return generator.getVariable(key, controllerState);
+        return outlet.getVariable(key, controllerState);
     }
 
     /**
      * 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.
+     * in the latter case, the variable is set in the namespace of the
+     * currently active 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.
@@ -234,13 +266,13 @@ public class TorqueGfVelocity
      */
     public void setVariable(String key, Object value)
     {
-        generator.setVariable(key, value, controllerState);
+        outlet.setVariable(key, value, controllerState);
     }
 
     /**
      * 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.
+     * in the latter case, the variable is set in the namespace of the
+     * currently active outlet.
      *
      * @param key the name of the variable, not null.
      * @param value the value of the variable, may be null.
@@ -249,12 +281,23 @@ public class TorqueGfVelocity
      * @throws NullPointerException if key or scope is null.
      * @throws IllegalArgumentException if the key is no valid QualifiedName.
      */
-    public void setVariable(String key, Object value, Variable.Scope scope)
+    public void setVariable(String key, Object value, String scope)
     {
-        generator.setVariable(key, value, scope, controllerState);
+        Variable.Scope scopeValue = Variable.Scope.valueOf(scope);
+        outlet.setVariable(key, value, scopeValue, controllerState);
     }
 
     /**
+     * Returns the currently processed source file.
+     * 
+     * @return the source file which is currently processed.
+     */
+    public File getSourceFile()
+    {
+        return controllerState.getSourceFile();
+    }
+    
+    /**
      * Returns the current date.
      *
      * @return the current date, not null.

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/VelocityGenerator.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/VelocityGenerator.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/VelocityGenerator.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.template.velocity;
+package org.apache.torque.generator.template.velocity;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,37 +25,37 @@ 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.ConfigurationProvider;
-import org.apache.torque.gf.control.ControllerState;
-import org.apache.torque.gf.generator.GeneratorException;
-import org.apache.torque.gf.option.Option;
-import org.apache.torque.gf.option.Options;
-import org.apache.torque.gf.qname.Namespace;
-import org.apache.torque.gf.qname.QualifiedName;
-import org.apache.torque.gf.qname.QualifiedNameMap;
-import org.apache.torque.gf.source.SourceElement;
-import org.apache.torque.gf.template.TemplateGeneratorImpl;
-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.ConfigurationProvider;
+import org.apache.torque.generator.control.ControllerState;
+import org.apache.torque.generator.option.Option;
+import org.apache.torque.generator.option.Options;
+import org.apache.torque.generator.qname.Namespace;
+import org.apache.torque.generator.qname.QualifiedName;
+import org.apache.torque.generator.qname.QualifiedNameMap;
+import org.apache.torque.generator.source.SourceElement;
+import org.apache.torque.generator.template.TemplateOutletImpl;
+import org.apache.torque.generator.variable.Variable;
+import org.apache.torque.generator.variable.VariableStore;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.context.Context;
 import org.apache.velocity.util.StringUtils;
 
 /**
- * A Generator which uses a velocity template for generation.
+ * A Outlet which uses a velocity template for generation.
  */
-public class VelocityGenerator extends TemplateGeneratorImpl
+public class VelocityOutlet extends TemplateOutletImpl
 {
     /**
-     * The name under which the Torque generator will be put
+     * The name under which the Torque generator interface will be put
      * into the context.
      */
-    public static final String TORQUE_GF_CONTEXT_NAME = "torqueGf";
+    public static final String TORQUE_GEN_CONTEXT_NAME = "torqueGen";
 
     /**
-     * The name under which the Torque generator will be put
+     * The name under which the velocity StringUtils will be put
      * into the context.
      */
     public static final String STRING_UTILS_CONTEXT_NAME = "stringUtils";
@@ -67,7 +67,7 @@ public class VelocityGenerator extends T
     public static final String NULL_KEY_CONTEXT_NAME = "value";
 
     /** The log. */
-    private static Log log = LogFactory.getLog(VelocityGenerator.class);
+    private static Log log = LogFactory.getLog(VelocityOutlet.class);
 
     /**
      * Whether the options should be put into the context.
@@ -86,9 +86,9 @@ public class VelocityGenerator extends T
     private boolean sourceAttributesInContext = true;
 
     /**
-     * Constructs a new VelocityTemplateGenerator.
+     * Constructs a new VelocityTemplateOutlet.
      *
-     * @param name the name of this generator, not null.
+     * @param name the name of this outlet, not null.
      * @param configurationProvider the provider for reading the templates,
      *        not null.
      * @param path the path to the templates, not null.
@@ -100,7 +100,7 @@ public class VelocityGenerator extends T
      * @throws ConfigurationException if an error occurs while reading the
      *         template.
      */
-    public VelocityGenerator(
+    public VelocityOutlet(
             QualifiedName name,
             ConfigurationProvider configurationProvider,
             String path,
@@ -115,9 +115,9 @@ public class VelocityGenerator extends T
     }
 
     /**
-     * Tells the generator to put all options which name space is visible to
-     * the name space of this generator into the context.
-     * Only the variable names are used as keys in the context, the name spaces
+     * Tells the outlet to put all options which name space is visible to
+     * the namespace of this outlet into the context.
+     * Only the variable names are used as keys in the context, the namespaces
      * are stripped.
      *
      * @param optionsInContext whether to put the options into the context.
@@ -128,10 +128,10 @@ public class VelocityGenerator extends T
     }
 
     /**
-     * Returns whether all options which name spaces are visible to
-     * the name space of this generator are put into the context.
+     * Returns whether all options which namespaces are visible to
+     * the name space of this outlet are put into the context.
      *
-     * @return whether the generator puts the options into the context.
+     * @return whether the outlet puts the options into the context.
      */
     public boolean isOptionsInContext()
     {
@@ -139,9 +139,9 @@ public class VelocityGenerator extends T
     }
 
     /**
-     * Tells the generator to put all variables which are visible to this
-     * generator into the context.
-     * Only the variable names are used as keys in the context, the name spaces
+     * Tells the outlet to put all variables which are visible to this
+     * outlet into the context.
+     * Only the variable names are used as keys in the context, the namespaces
      * are stripped.
      *
      * @param variablesInContext whether to put the variables into the context.
@@ -153,9 +153,9 @@ public class VelocityGenerator extends T
 
     /**
      * Returns whether all variables which are visible to this
-     * generator are put into the context.
+     * outlet are put into the context.
      *
-     * @return whether the generator puts the variables into the context.
+     * @return whether the outlet puts the variables into the context.
      */
     public boolean isVariablesInContext()
     {
@@ -163,7 +163,7 @@ public class VelocityGenerator extends T
     }
 
     /**
-     * Tells the generator to put the attributes of the current source element
+     * Tells the outlet to put the attributes of the current source element
      * into the context or not.
      *
      * @param sourceAttributesInContext whether to put the source attributes
@@ -179,7 +179,7 @@ public class VelocityGenerator extends T
      * Returns whether the attributes of the current source element
      * are put into the context.
      *
-     * @return whether the generator puts the attributes of the current source
+     * @return whether the outlet puts the attributes of the current source
      *         element into the context.
      */
     public boolean isSourceAttributesInContext()
@@ -194,7 +194,7 @@ public class VelocityGenerator extends T
      *
      * @return the result of the generation, not null.
      *
-     * @see org.apache.torque.gf.generator.Generator#execute(ControllerState)
+     * @see org.apache.torque.generator.outlet.Outlet#execute(ControllerState)
      */
     @Override
     public String execute(ControllerState controllerState)
@@ -203,9 +203,9 @@ public class VelocityGenerator extends T
     {
         if (log.isDebugEnabled())
         {
-            log.debug("Start executing VelocityGenerator " + getName());
+            log.debug("Start executing VelocityOutlet " + getName());
         }
-        controllerState.getVariableStore().startGenerator();
+        controllerState.getVariableStore().startOutlet();
 
         try
         {
@@ -230,7 +230,7 @@ public class VelocityGenerator extends T
                         + sourceElement.getName()
                         + ", is not the expected name, "
                         + getInputElementName()
-                        + ", for generator "
+                        + ", for outlet "
                         + getName());
             }
 
@@ -240,19 +240,19 @@ public class VelocityGenerator extends T
             try
             {
                 Velocity.evaluate(context, writer,
-                        "VelocityTemplateGenerator:" + getName(),
+                        "VelocityTemplateOutlet:" + getName(),
                         getContent(controllerState));
                 writer.flush();
                 writer.close();
             }
             catch (Exception e)
             {
-                log.error("error during execution of generator "
+                log.error("error during execution of outlet "
                             + getName()
                             + " : " + e.getMessage(),
                         e);
                 throw new GeneratorException(
-                        "Error during execution of generator "
+                        "Error during execution of outlet "
                             + getName()
                             + " : "
                             + e.getMessage(),
@@ -263,16 +263,16 @@ public class VelocityGenerator extends T
         }
         finally
         {
-            controllerState.getVariableStore().endGenerator();
+            controllerState.getVariableStore().endOutlet();
             if (log.isDebugEnabled())
             {
-                log.debug("End executing VelocityGenerator " + getName());
+                log.debug("End executing VelocityOutlet " + getName());
             }
         }
     }
 
     /**
-     * Creates the velocity context for the generator.
+     * Creates the velocity context for the outlet.
      *
      * @param controllerState the controller state, not null.
      * @return
@@ -282,8 +282,8 @@ public class VelocityGenerator extends T
     {
         Context context = new VelocityContext();
         context.put(
-                TORQUE_GF_CONTEXT_NAME,
-                new TorqueGfVelocity(this, controllerState));
+                TORQUE_GEN_CONTEXT_NAME,
+                new TorqueGenVelocity(this, controllerState));
         context.put(
                 STRING_UTILS_CONTEXT_NAME,
                 new StringUtils());
@@ -336,7 +336,7 @@ public class VelocityGenerator extends T
         if (variablesInContext)
         {
             // Only consider variables visible from the namespace
-            // of this generator. If a name exists in different
+            // of this outlet. If a name exists in different
             // namespaces visible from this namespace,
             // only consider the most significant name.
             Namespace namespace = getName().getNamespace();

Copied: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutletState.java (from r916199, db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/VelocityGeneratorState.java)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutletState.java?p2=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutletState.java&p1=db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/VelocityGeneratorState.java&r1=916199&r2=944862&rev=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/gf/template/velocity/VelocityGeneratorState.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutletState.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.template.velocity;
+package org.apache.torque.generator.template.velocity;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,9 +22,9 @@ package org.apache.torque.gf.template.ve
 import org.apache.velocity.context.Context;
 
 /**
- * The generator state of a velocity template generator.
+ * The outlet state of a velocity template outlet.
  */
-public class VelocityGeneratorState
+public class VelocityOutletState
 {
     /**
      * The velocity context which is currently used.

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilter.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.template.velocity;
+package org.apache.torque.generator.template.velocity;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,11 +28,11 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
-import org.apache.torque.gf.template.TemplateFilter;
+import org.apache.torque.generator.template.TemplateFilter;
 
 /**
  * A Filter for velocity templates. It has the effect of beautifying the output
- * of the velocity generator.
+ * of the velocity outlet.
  */
 public class VelocityTemplateFilter implements TemplateFilter
 {

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/package.html
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/package.html?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/package.html (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/package.html Sun May 16 15:35:27 2010
@@ -15,11 +15,12 @@
 -->
 <html>
   <head>
-    <title>Torque-gf v elocity generators</title>
+    <title>Torque generator velocity outlets</title>
   </head>
   <body>
     <p>
-      This package contains the handling of velocity generators in Torque-gf.
+      This package contains the handling of velocity outlets in the 
+      Torque generator.
     </p>
   </body>
 </html>

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/Variable.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.variable;
+package org.apache.torque.generator.variable;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,15 +19,14 @@ package org.apache.torque.gf.variable;
  * under the License.
  */
 
-import org.apache.torque.gf.qname.QualifiedName;
+import org.apache.torque.generator.qname.QualifiedName;
 
 /**
- * A variable which can be used to transport data in and between
- * generators.
+ * A variable which can be used to transport data in and between outlets.
  * A variable has a name (possibly with a name space),
  * a value (which may be null),
- * and a scope (determining in which generators this variable will be visible).
- * if the scope is <code>CHILDREN</code>, the generator in which this
+ * and a scope (determining in which outlets this variable will be visible).
+ * if the scope is <code>CHILDREN</code>, the outlet in which this
  * variable was set is also stored in the variable.
  */
 public class Variable
@@ -38,12 +37,12 @@ public class Variable
     public enum Scope
     {
         /**
-         * The scope of the variable is limited to the current generator.
+         * The scope of the variable is limited to the current outlet.
          */
-        GENERATOR,
+        OUTLET,
         /**
-         * The scope of the variable is the current generator and
-         * recursively all the generators in the merge points accessed
+         * The scope of the variable is the current outlet and
+         * recursively all the outlets in the merge points accessed
          * in the generation process.
          */
         CHILDREN,

Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java?rev=944862&r1=916199&r2=944862&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java (original)
+++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/variable/VariableStore.java Sun May 16 15:35:27 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf.variable;
+package org.apache.torque.generator.variable;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package org.apache.torque.gf.variable;
 
 import java.util.LinkedList;
 
-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;
 
 /**
  * Stores all variables which are currently accessible.
@@ -32,17 +32,17 @@ public class VariableStore
 {
     /**
      * contains all variables with the scope
-     * <code>Variable.Scope.GENERATOR<code>.
+     * <code>Variable.Scope.OUTLET<code>.
      */
-    private QualifiedNameMap<Variable> generatorScope
+    private QualifiedNameMap<Variable> outletScope
             = new QualifiedNameMap<Variable>();
 
     /**
      * contains all variables with the scope
      * <code>Variable.Scope.CHILDREN<code>.
      * The QualifiedNameMap with the largest index contains the variables added
-     * in the current generator, and with descending index the variables added
-     * to the respective calling generators.
+     * in the current outlet, and with descending index the variables added
+     * to the respective calling outlets.
      */
     private LinkedList<QualifiedNameMap<Variable>> childrenScopeList
             = new LinkedList<QualifiedNameMap<Variable>>();
@@ -70,9 +70,9 @@ public class VariableStore
      */
     public void set(Variable variable)
     {
-        if (Variable.Scope.GENERATOR.equals(variable.getScope()))
+        if (Variable.Scope.OUTLET.equals(variable.getScope()))
         {
-            generatorScope.put(variable.getName(), variable);
+            outletScope.put(variable.getName(), variable);
         }
         else if (Variable.Scope.CHILDREN.equals(variable.getScope()))
         {
@@ -99,9 +99,9 @@ public class VariableStore
      */
     public void remove(Variable variable)
     {
-        if (Variable.Scope.GENERATOR.equals(variable.getScope()))
+        if (Variable.Scope.OUTLET.equals(variable.getScope()))
         {
-            generatorScope.remove(variable.getName());
+            outletScope.remove(variable.getName());
         }
         else if (Variable.Scope.CHILDREN.equals(variable.getScope()))
         {
@@ -120,27 +120,23 @@ public class VariableStore
     }
 
     /**
-     * Signals this store that the processing of a generator has ended.
-     * Removes all variables with the scope
-     * <code>Variable.Scope.GENERATOR</code>,
-     * and all variables with the scope <code>Variable.Scope.CHILDREN</code>
-     * which were set by the generator which processing ended.
+     * Signals this store that the processing of a outlet has started.
      */
-    public void startGenerator()
+    public void startOutlet()
     {
         childrenScopeList.addLast(new QualifiedNameMap<Variable>());
     }
 
     /**
-     * Signals this store that the processing of a generator has ended.
+     * Signals this store that the processing of a outlet has ended.
      * Removes all variables with the scope
-     * <code>Variable.Scope.GENERATOR</code>,
+     * <code>Variable.Scope.OUTLET</code>,
      * and all variables with the scope <code>Variable.Scope.CHILDREN</code>
-     * which were set by the generator which processing ended.
+     * which were set by the outlet which processing ended.
      */
-    public void endGenerator()
+    public void endOutlet()
     {
-        generatorScope.clear();
+        outletScope.clear();
         childrenScopeList.removeLast();
     }
 
@@ -167,7 +163,7 @@ public class VariableStore
      */
     public void clear()
     {
-        generatorScope.clear();
+        outletScope.clear();
         childrenScopeList.clear();
         fileScope.clear();
         globalScope.clear();
@@ -201,7 +197,7 @@ public class VariableStore
             result.putAll(childrenScope);
         }
 
-        result.putAll(generatorScope);
+        result.putAll(outletScope);
 
         return result;
     }
@@ -219,11 +215,11 @@ public class VariableStore
      */
     public Variable getInHierarchy(QualifiedName key)
     {
-        Variable inGeneratorScope = generatorScope.getInHierarchy(key);
+        Variable inOutletScope = outletScope.getInHierarchy(key);
         Variable inFileScope = fileScope.getInHierarchy(key);
         Variable inGenerationScope = globalScope.getInHierarchy(key);
 
-        // look through children, with precedence to the generators which
+        // look through children, with precedence to the outlets which
         // started later
         Variable result = null;
         for (QualifiedNameMap<Variable> childrenScope : childrenScopeList)
@@ -231,7 +227,7 @@ public class VariableStore
             Variable inChildrenScope = childrenScope.getInHierarchy(key);
             result = getMoreSpecific(inChildrenScope, result);
         }
-        result = getMoreSpecific(inGeneratorScope, result);
+        result = getMoreSpecific(inOutletScope, result);
         result = getMoreSpecific(result, inFileScope);
         result = getMoreSpecific(result, inGenerationScope);
         return result;

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



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