Copied: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/SourceToXmlTest.java (from r930722, db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/xml/SourceToXmlTest.java) URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/SourceToXmlTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/SourceToXmlTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/xml/SourceToXmlTest.java&r1=930722&r2=944867&rev=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/xml/SourceToXmlTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/SourceToXmlTest.java Sun May 16 15:45:37 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,10 +26,11 @@ import java.util.ArrayList; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; -import org.apache.torque.gf.source.FileSource; -import org.apache.torque.gf.source.SourceElement; -import org.apache.torque.gf.source.SourceElement; -import org.apache.torque.gf.source.TransformerDefinition; +import org.apache.torque.generator.source.FileSource; +import org.apache.torque.generator.source.SourceElement; +import org.apache.torque.generator.source.TransformerDefinition; +import org.apache.torque.generator.source.xml.SourceToXml; +import org.apache.torque.generator.source.xml.XmlSourceType; import org.junit.Test; /** @@ -43,7 +44,7 @@ public class SourceToXmlTest public void testSourceToXml() throws Exception { File xmlFile - = new File("src/test/resources/org/apache/torque/gf/source/xml/source.xml"); + = new File("src/test/resources/org/apache/torque/generator/source/xml/source.xml"); FileSource fileSource = new FileSource( new XmlSourceType(), xmlFile, @@ -54,7 +55,7 @@ public class SourceToXmlTest String result = new SourceToXml().toXml(rootElement); String expected = FileUtils.readFileToString(new File( - "src/test/resources/org/apache/torque/gf/source/xml/sourceToXmlResult.xml")); + "src/test/resources/org/apache/torque/generator/source/xml/sourceToXmlResult.xml")); // remove license from expected file expected = StringUtils.substringAfterLast(expected, "-->\n\n"); assertEquals(expected, result); @@ -64,7 +65,7 @@ public class SourceToXmlTest public void testSourceToXmlWithReferences() throws Exception { File xmlFile = new File( - "src/test/resources/org/apache/torque/gf/source/xml/source.xml"); + "src/test/resources/org/apache/torque/generator/source/xml/source.xml"); FileSource fileSource = new FileSource( new XmlSourceType(), xmlFile, @@ -77,7 +78,7 @@ public class SourceToXmlTest String result = new SourceToXml().toXml(rootElement); String expected = FileUtils.readFileToString(new File( - "src/test/resources/org/apache/torque/gf/source/xml/sourceToXmlWithReferenceResult.xml")); + "src/test/resources/org/apache/torque/generator/source/xml/sourceToXmlWithReferenceResult.xml")); // remove license from expected file expected = StringUtils.substringAfterLast(expected, "-->\n\n"); assertEquals(expected, result);
Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/XmlParserTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/XmlParserTest.java?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/XmlParserTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/XmlParserTest.java Sun May 16 15:45:37 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 @@ -24,9 +24,10 @@ import static org.junit.Assert.assertEqu import java.io.File; import java.util.ArrayList; -import org.apache.torque.gf.source.FileSource; -import org.apache.torque.gf.source.SourceElement; -import org.apache.torque.gf.source.TransformerDefinition; +import org.apache.torque.generator.source.FileSource; +import org.apache.torque.generator.source.SourceElement; +import org.apache.torque.generator.source.TransformerDefinition; +import org.apache.torque.generator.source.xml.XmlSourceType; import org.junit.Test; public class XmlParserTest @@ -35,7 +36,7 @@ public class XmlParserTest public void testReadXmlSource() throws Exception { File xmlFile = new File( - "src/test/resources/org/apache/torque/gf/source/xml/source.xml"); + "src/test/resources/org/apache/torque/generator/source/xml/source.xml"); FileSource fileSource = new FileSource( new XmlSourceType(), xmlFile, Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java Sun May 16 15:45:37 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 @@ -27,6 +27,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; +import org.apache.torque.generator.template.velocity.VelocityTemplateFilter; import org.junit.Before; import org.junit.Test; Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java Sun May 16 15:45:37 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 @@ -22,9 +22,11 @@ package org.apache.torque.gf.variable; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import org.apache.torque.gf.BaseTest; -import org.apache.torque.gf.qname.QualifiedName; -import org.apache.torque.gf.qname.QualifiedNameMap; +import org.apache.torque.generator.BaseTest; +import org.apache.torque.generator.qname.QualifiedName; +import org.apache.torque.generator.qname.QualifiedNameMap; +import org.apache.torque.generator.variable.Variable; +import org.apache.torque.generator.variable.VariableStore; import org.junit.Test; public class VariableStoreTest extends BaseTest @@ -33,7 +35,7 @@ public class VariableStoreTest extends B public void testVariableScopePrecedence() { VariableStore store = new VariableStore(); - store.startGenerator(); + store.startOutlet(); QualifiedName qualifiedName = new QualifiedName("org.apache.torque.name"); @@ -41,12 +43,12 @@ public class VariableStoreTest extends B store.set(new Variable( qualifiedName, "org.apache.torque.GENERATOR", - Variable.Scope.GENERATOR)); + Variable.Scope.OUTLET)); store.set(new Variable( qualifiedName, "org.apache.torque.CHILDREN1", Variable.Scope.CHILDREN)); - store.startGenerator(); + store.startOutlet(); store.set(new Variable( qualifiedName, "org.apache.torque.CHILDREN2", @@ -76,7 +78,7 @@ public class VariableStoreTest extends B "org.apache.torque.CHILDREN2", store.getContent().get(qualifiedName).getValue()); - store.endGenerator(); + store.endOutlet(); assertEquals( "org.apache.torque.CHILDREN1", @@ -85,7 +87,7 @@ public class VariableStoreTest extends B "org.apache.torque.CHILDREN1", store.getContent().get(qualifiedName).getValue()); - store.endGenerator(); + store.endOutlet(); assertEquals( "org.apache.torque.FILE", @@ -115,7 +117,7 @@ public class VariableStoreTest extends B store.set(new Variable( new QualifiedName("org.apache.torque.name"), "org.apache.torque.GENERATOR", - Variable.Scope.GENERATOR)); + Variable.Scope.OUTLET)); store.set(new Variable( new QualifiedName("org.apache.name"), "org.apache.FILE", @@ -130,7 +132,7 @@ public class VariableStoreTest extends B store.set(new Variable( new QualifiedName("org.apache.name"), "org.apache.GENERATOR", - Variable.Scope.GENERATOR)); + Variable.Scope.OUTLET)); store.set(new Variable( new QualifiedName("org.apache.torque.name"), "org.apache.torque.FILE", @@ -147,7 +149,7 @@ public class VariableStoreTest extends B store.set(new Variable( new QualifiedName("org.apache.torque.name"), "org.apache.torque", - Variable.Scope.GENERATOR)); + Variable.Scope.OUTLET)); QualifiedName qualifiedName = new QualifiedName("org.apache.torque.name"); assertEquals( @@ -166,16 +168,16 @@ public class VariableStoreTest extends B public void testGetContents() { VariableStore store = new VariableStore(); - store.startGenerator(); + store.startOutlet(); store.set(new Variable( new QualifiedName("org.apache.torque.generator"), "org.apache.torque.generator", - Variable.Scope.GENERATOR)); + Variable.Scope.OUTLET)); store.set(new Variable( new QualifiedName("org.apache.torque.children1"), "org.apache.torque.children1", Variable.Scope.CHILDREN)); - store.startGenerator(); + store.startOutlet(); store.set(new Variable( new QualifiedName("org.apache.torque.children2"), "org.apache.torque.children2", @@ -239,7 +241,7 @@ public class VariableStoreTest extends B public void testRemove() { VariableStore store = new VariableStore(); - store.startGenerator(); + store.startOutlet(); QualifiedName qualifiedName = new QualifiedName("org.apache.torque.name"); @@ -247,7 +249,7 @@ public class VariableStoreTest extends B store.set(new Variable( qualifiedName, "org.apache.torque.GENERATOR", - Variable.Scope.GENERATOR)); + Variable.Scope.OUTLET)); store.set(new Variable( qualifiedName, "org.apache.torque.CHILDREN", @@ -296,7 +298,7 @@ public class VariableStoreTest extends B store.set(new Variable( qualifiedName, "org.apache.torque.GENERATOR", - Variable.Scope.GENERATOR)); + Variable.Scope.OUTLET)); store.set(childrenVariable); store.set(new Variable( qualifiedName, Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableTest.java?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableTest.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableTest.java Sun May 16 15:45:37 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 @@ -23,9 +23,10 @@ import static org.junit.Assert.assertEqu import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import org.apache.torque.gf.BaseTest; -import org.apache.torque.gf.qname.Namespace; -import org.apache.torque.gf.qname.QualifiedName; +import org.apache.torque.generator.BaseTest; +import org.apache.torque.generator.qname.Namespace; +import org.apache.torque.generator.qname.QualifiedName; +import org.apache.torque.generator.variable.Variable; import org.junit.Test; /** Copied: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/control.xml (from r917591, db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/conf/control.xml) URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/control.xml?p2=db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/control.xml&p1=db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/conf/control.xml&r1=917591&r2=944867&rev=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/control.xml Sun May 16 15:45:37 2010 @@ -20,45 +20,45 @@ <control xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/configuration.xsd"; - xmlns="http://db.apache.org/torque/gf/4.0/configuration"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; + xmlns="http://db.apache.org/torque/4.0/generator/configuration"; loglevel="debug"> <options path="options.properties" xsi:type="propertiesOptions"/> <output name="propertiesClass"> - <filenameGenerator xsi:type="javaGenerator" - class="org.apache.torque.gf.generator.java.JavaFilenameGenerator"> + <filenameOutlet xsi:type="javaOutlet" + class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet"> <mergepoint name="classname"> <action xsi:type="optionAction" option="propertiesClassName" /> </mergepoint> <mergepoint name="package"> <action xsi:type="optionAction" option="package" /> </mergepoint> - </filenameGenerator> + </filenameOutlet> <source elements="properties"> <include>propertiesData.properties</include> </source> - <generator name="org.apache.torque.gf.velocity.propertiesToJava" /> + <outlet name="org.apache.torque.generator.velocity.propertiesToJava" /> </output> <output name="extendingClass"> - <filenameGenerator xsi:type="javaGenerator" - class="org.apache.torque.gf.generator.java.JavaFilenameGenerator"> + <filenameOutlet xsi:type="javaOutlet" + class="org.apache.torque.generator.outlet.java.JavaFilenameOutlet"> <mergepoint name="classname"> <action xsi:type="optionAction" option="extendingClassName" /> </mergepoint> <mergepoint name="package"> <action xsi:type="optionAction" option="package" /> </mergepoint> - </filenameGenerator> + </filenameOutlet> <source elements="properties"> <include>propertiesData.properties</include> </source> - <generator name="org.apache.torque.gf.velocity.propertiesExtendedToJava" /> + <outlet name="org.apache.torque.generator.velocity.propertiesExtendedToJava" /> </output> <output name="properties" file="Properties.properties"> <source elements="properties"> <include>propertiesData.properties</include> </source> - <generator name="org.apache.torque.gf.velocity.propertiesCopy"/> + <outlet name="org.apache.torque.generator.velocity.propertiesCopy"/> </output> </control> \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/options.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/options.properties?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/options.properties (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/options.properties Sun May 16 15:45:37 2010 @@ -16,8 +16,8 @@ # under the License. #option without namespace -# both for the generator and the filenameGenerator -package = org.apache.torque.gf.properties +# both for the outlet and the filenameOutlet +package = org.apache.torque.generator.properties #option with namespace -org.apache.torque.gf.velocity.propertiesClassName = VelocityProperties -org.apache.torque.gf.velocity.extendingClassName = VelocityExtendedProperties \ No newline at end of file +org.apache.torque.generator.velocity.propertiesClassName = VelocityProperties +org.apache.torque.generator.velocity.extendingClassName = VelocityExtendedProperties \ No newline at end of file Copied: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/javaTestOutlet.xml (from r916199, db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/javaTestGenerator.xml) URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/javaTestOutlet.xml?p2=db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/javaTestOutlet.xml&p1=db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/javaTestGenerator.xml&r1=916199&r2=944867&rev=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/javaTestGenerator.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/javaTestOutlet.xml Sun May 16 15:45:37 2010 @@ -18,21 +18,18 @@ under the License. --> -<generators xmlns="http://db.apache.org/torque/gf/4.0/configuration"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/generator.xsd"; +<outlets xmlns="http://db.apache.org/torque/4.0/generator/configuration"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <generator name="org.apache.torque.gf.java.testGenerator" - xsi:type="javaGenerator" - class="org.apache.torque.gf.java.JavaGenerator"> + <outlet name="org.apache.torque.generator.java.testOutlet" + xsi:type="javaOutlet" + class="org.apache.torque.generator.java.JavaOutlet"> <mergepoint name="properties"> <action xsi:type="traverseAllAction" element="entry" - generator="org.apache.torque.gf.velocity.propertyCopy"/> + outlet="org.apache.torque.generator.velocity.propertyCopy"/> </mergepoint> <foo>Foo</foo> <bar>Bar</bar> - </generator> - <generator name="org.apache.torque.gf.velocity.propertyCopy" - xsi:type="velocityGenerator" - path="propertyCopy.vm"/> -</generators> \ No newline at end of file + </outlet> +</outlets> \ No newline at end of file Copied: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityExtendedPropertiesOutlet.xml (from r916199, db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/velocityExtendedPropertiesGenerator.xml) URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityExtendedPropertiesOutlet.xml?p2=db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityExtendedPropertiesOutlet.xml&p1=db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/velocityExtendedPropertiesGenerator.xml&r1=916199&r2=944867&rev=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/velocityExtendedPropertiesGenerator.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityExtendedPropertiesOutlet.xml Sun May 16 15:45:37 2010 @@ -18,14 +18,14 @@ under the License. --> -<generators xmlns="http://db.apache.org/torque/gf/4.0/configuration"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/generator.xsd"; +<outlets xmlns="http://db.apache.org/torque/4.0/generator/configuration"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <generator name="org.apache.torque.gf.velocity.propertiesExtendedToJava" - xsi:type="velocityGenerator" + <outlet name="org.apache.torque.generator.velocity.propertiesExtendedToJava" + xsi:type="velocityOutlet" path="propertiesExtendedToJava.vm" optionsInContext="true" sourceAttributesInContext="true"> <input elementName="properties"/> - </generator> -</generators> \ No newline at end of file + </outlet> +</outlets> \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesCopy.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesCopy.xml?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesCopy.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesCopy.xml Sun May 16 15:45:37 2010 @@ -18,18 +18,18 @@ under the License. --> -<generators xmlns="http://db.apache.org/torque/gf/4.0/configuration"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/generator.xsd"; +<outlets xmlns="http://db.apache.org/torque/4.0/generator/configuration"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <generator name="org.apache.torque.gf.velocity.propertiesCopy" - xsi:type="velocityGenerator" + <outlet name="org.apache.torque.generator.velocity.propertiesCopy" + xsi:type="velocityOutlet" path="propertiesCopy.vm"> <mergepoint name="properties"> <action xsi:type="traverseAllAction" element="entry" - generator="org.apache.torque.gf.velocity.propertyCopy"/> + outlet="org.apache.torque.generator.velocity.propertyCopy"/> </mergepoint> - </generator> - <generator name="org.apache.torque.gf.velocity.propertyCopy" - xsi:type="velocityGenerator" + </outlet> + <outlet name="org.apache.torque.generator.velocity.propertyCopy" + xsi:type="velocityOutlet" path="propertyCopy.vm"/> -</generators> \ No newline at end of file +</outlets> \ No newline at end of file Copied: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesOutlet.xml (from r916199, db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/velocityPropertiesGenerator.xml) URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesOutlet.xml?p2=db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesOutlet.xml&p1=db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/velocityPropertiesGenerator.xml&r1=916199&r2=944867&rev=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/velocityPropertiesGenerator.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesOutlet.xml Sun May 16 15:45:37 2010 @@ -18,22 +18,22 @@ under the License. --> -<generators xmlns="http://db.apache.org/torque/gf/4.0/configuration"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/generator.xsd"; +<outlets xmlns="http://db.apache.org/torque/4.0/generator/configuration"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <generator name="org.apache.torque.gf.velocity.propertiesToJava" - xsi:type="velocityGenerator" + <outlet name="org.apache.torque.generator.velocity.propertiesToJava" + xsi:type="velocityOutlet" path="propertiesToJava.vm" optionsInContext="true" sourceAttributesInContext="true"> <input elementName="properties"/> <mergepoint name="variableDefinitions"> <action xsi:type="traverseAllAction" element="entry" - generator="org.apache.torque.gf.velocity.variableDefinition"/> + outlet="org.apache.torque.generator.velocity.variableDefinition"/> </mergepoint> <mergepoint name="variableAssignments"> <action xsi:type="traverseAllAction" element="entry" - generator="org.apache.torque.gf.velocity.variableAssignment"/> + outlet="org.apache.torque.generator.velocity.variableAssignment"/> </mergepoint> - </generator> -</generators> \ No newline at end of file + </outlet> +</outlets> \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityVariableAssignment.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityVariableAssignment.xml?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityVariableAssignment.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityVariableAssignment.xml Sun May 16 15:45:37 2010 @@ -18,13 +18,13 @@ under the License. --> -<generators xmlns="http://db.apache.org/torque/gf/4.0/configuration"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/generator.xsd"; +<outlets xmlns="http://db.apache.org/torque/4.0/generator/configuration"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <generator name="org.apache.torque.gf.velocity.variableAssignment" - xsi:type="velocityGenerator" + <outlet name="org.apache.torque.generator.velocity.variableAssignment" + xsi:type="velocityOutlet" path="variableAssignment.vm"> <input elementName="entry"/> - </generator> -</generators> + </outlet> +</outlets> \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityVariableDefinition.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityVariableDefinition.xml?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityVariableDefinition.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityVariableDefinition.xml Sun May 16 15:45:37 2010 @@ -18,12 +18,12 @@ under the License. --> -<generators xmlns="http://db.apache.org/torque/gf/4.0/configuration"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/generator.xsd"; +<outlets xmlns="http://db.apache.org/torque/4.0/generator/configuration"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <generator name="org.apache.torque.gf.velocity.variableDefinition" - xsi:type="velocityGenerator" + <outlet name="org.apache.torque.generator.velocity.variableDefinition" + xsi:type="velocityOutlet" path="variableDefinition.vm"> <input elementName="entry"/> - </generator> -</generators> \ No newline at end of file + </outlet> +</outlets> \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesCopy.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesCopy.vm?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesCopy.vm (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesCopy.vm Sun May 16 15:45:37 2010 @@ -15,4 +15,4 @@ ## specific language governing permissions and limitations ## under the License. ## -$torqueGf.mergepoint("properties") \ No newline at end of file +$torqueGen.mergepoint("properties") \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesExtendedToJava.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesExtendedToJava.vm?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesExtendedToJava.vm (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesExtendedToJava.vm Sun May 16 15:45:37 2010 @@ -15,9 +15,9 @@ ## specific language governing permissions and limitations ## under the License. ## -package $torqueGf.option("package"); +package $torqueGen.option("package"); -public class $torqueGf.option("extendingClassName") - extends $torqueGf.option("propertiesClassName") +public class $torqueGen.option("extendingClassName") + extends $torqueGen.option("propertiesClassName") { } \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesToJava.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesToJava.vm?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesToJava.vm (original) +++ db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesToJava.vm Sun May 16 15:45:37 2010 @@ -15,14 +15,14 @@ ## specific language governing permissions and limitations ## under the License. ## -package $torqueGf.option("package"); +package $torqueGen.option("package"); -public class $torqueGf.option("propertiesClassName") +public class $torqueGen.option("propertiesClassName") { -$torqueGf.mergepoint("variableDefinitions") +$torqueGen.mergepoint("variableDefinitions") static { -$torqueGf.mergepoint("variableAssignments") +$torqueGen.mergepoint("variableAssignments") } } \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/example/gettingstarted/PropertyKeys.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/example/gettingstarted/PropertyKeys.java?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/example/gettingstarted/PropertyKeys.java (original) +++ db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/example/gettingstarted/PropertyKeys.java Sun May 16 15:45:37 2010 @@ -1,4 +1,4 @@ -package org.apache.torque.gf.example.gettingstarted; +package org.apache.torque.generator.example.gettingstarted; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/conf/control.xml (from r917591, db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/test/readfromclasspath/conf/control.xml) URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/conf/control.xml?p2=db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/conf/control.xml&p1=db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/test/readfromclasspath/conf/control.xml&r1=917591&r2=944867&rev=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/test/readfromclasspath/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/conf/control.xml Sun May 16 15:45:37 2010 @@ -19,14 +19,14 @@ --> <control xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/configuration.xsd"; - xmlns="http://db.apache.org/torque/gf/4.0/configuration";> + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; + xmlns="http://db.apache.org/torque/4.0/generator/configuration";> <options path="options.properties" xsi:type="propertiesOptions"/> <output name="properties" file="Properties.properties"> <source elements="properties"> <include>propertiesData.properties</include> </source> - <generator name="org.apache.torque.gf.velocity.PropertiesCopy"/> + <outlet name="org.apache.torque.generator.velocity.PropertiesCopy"/> </output> </control> \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/outlets/testGenerator.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/outlets/testGenerator.xml?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/outlets/testGenerator.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/outlets/testGenerator.xml Sun May 16 15:45:37 2010 @@ -18,18 +18,18 @@ under the License. --> -<generators xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/generator.xsd"; - xmlns="http://db.apache.org/torque/gf/4.0/configuration";> - <generator xsi:type="velocityGenerator" - name="org.apache.torque.gf.TestTemplateFromClasspath" +<outlets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; + xmlns="http://db.apache.org/torque/4.0/generator/configuration";> + <outlet xsi:type="velocityOutlet" + name="org.apache.torque.generator.TestTemplateFromClasspath" path="testTemplate.vm"> <mergepoint name="testMergepoint"> <action xsi:type="traverseAllAction" element="entry" - generator="org.apache.torque.gf.test.readConfiguration.JavaGenerator"/> + outlet="org.apache.torque.generator.test.readConfiguration.JavaOutlet"/> </mergepoint> - </generator> - <generator xsi:type="javaGenerator" - name="org.apache.torque.gf.test.readConfiguration.JavaGenerator" - class="org.apache.torque.gf.java.JavaGenerator"/> -</generators> \ No newline at end of file + </outlet> + <outlet xsi:type="javaOutlet" + name="org.apache.torque.generator.test.readConfiguration.JavaOutlet" + class="org.apache.torque.generator.java.JavaOutlet"/> +</outlets> \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/templates/testTemplate.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/templates/testTemplate.vm?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/templates/testTemplate.vm (original) +++ db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/templates/testTemplate.vm Sun May 16 15:45:37 2010 @@ -15,4 +15,4 @@ ## specific language governing permissions and limitations ## under the License. ## -$torqueGf.mergepoint("properties") \ No newline at end of file +$torqueGen.mergepoint("properties") \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/conf/control.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/conf/control.xml?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/conf/control.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/conf/control.xml Sun May 16 15:45:37 2010 @@ -20,15 +20,15 @@ <control xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/configuration.xsd"; - xmlns="http://db.apache.org/torque/gf/4.0/configuration"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; + xmlns="http://db.apache.org/torque/4.0/generator/configuration"; loglevel="debug"> <output name="propertyKeys" - file="org/apache/torque/gf/example/gettingstarted/PropertyKeys.java"> + file="org/apache/torque/generator/example/gettingstarted/PropertyKeys.java"> <source> <include>propertiesData.properties</include> </source> - <generator name="classFrame"/> + <outlet name="classFrame"/> </output> </control> \ No newline at end of file Copied: db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/outlets/enumOutlets.xml (from r916199, db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gf/generatorDefs/enumGenerators.xml) URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/outlets/enumOutlets.xml?p2=db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/outlets/enumOutlets.xml&p1=db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gf/generatorDefs/enumGenerators.xml&r1=916199&r2=944867&rev=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gf/generatorDefs/enumGenerators.xml (original) +++ db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/outlets/enumOutlets.xml Sun May 16 15:45:37 2010 @@ -18,37 +18,37 @@ under the License. --> -<generators xmlns="http://db.apache.org/torque/gf/4.0/configuration"; - xsi:schemaLocation="http://db.apache.org/torque/gf/4.0/configuration http://db.apache.org/torque/gf/4.0/generator.xsd"; +<outlets xmlns="http://db.apache.org/torque/4.0/generator/configuration"; + xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <generator name="classFrame" xsi:type="velocityGenerator" path="classFrame.vm"> + <outlet name="classFrame" xsi:type="velocityOutlet" path="classFrame.vm"> <mergepoint name="constants"> - <action xsi:type="traverseAllAction" element="entry" generator="constant"/> + <action xsi:type="traverseAllAction" element="entry" outlet="constant"/> </mergepoint> <mergepoint name="fields"> - <action xsi:type="applyAction" generator="keyField"/> - <action xsi:type="applyAction" generator="newline"/> + <action xsi:type="applyAction" outlet="keyField"/> + <action xsi:type="applyAction" outlet="newline"/> </mergepoint> <mergepoint name="methods"> - <action xsi:type="applyAction" generator="constructor"/> - <action xsi:type="applyAction" generator="newline"/> - <action xsi:type="applyAction" generator="getKey"/> - <action xsi:type="applyAction" generator="newline"/> - <action xsi:type="applyAction" generator="toString"/> + <action xsi:type="applyAction" outlet="constructor"/> + <action xsi:type="applyAction" outlet="newline"/> + <action xsi:type="applyAction" outlet="getKey"/> + <action xsi:type="applyAction" outlet="newline"/> + <action xsi:type="applyAction" outlet="toString"/> </mergepoint> - </generator> - <generator name="constant" xsi:type="velocityGenerator" path="constant.vm"> + </outlet> + <outlet name="constant" xsi:type="velocityOutlet" path="constant.vm"> <mergepoint name="constantName"> - <action xsi:type="applyAction" generator="constantName"/> + <action xsi:type="applyAction" outlet="constantName"/> </mergepoint> - </generator> - <generator name="constantName" xsi:type="javaGenerator" class="org.apache.torque.gf.generator.java.ConstantNameGenerator"> + </outlet> + <outlet name="constantName" xsi:type="javaOutlet" class="org.apache.torque.generator.outlet.java.ConstantNameOutlet"> <inputSourceElement>.</inputSourceElement> <sourceElementAttribute>key</sourceElementAttribute> - </generator> - <generator name="keyField" xsi:type="velocityGenerator" path="keyField.vm"/> - <generator name="constructor" xsi:type="velocityGenerator" path="constructor.vm"/> - <generator name="getKey" xsi:type="velocityGenerator" path="getKey.vm"/> - <generator name="toString" xsi:type="velocityGenerator" path="toString.vm"/> - <generator name="newline" xsi:type="javaGenerator" class="org.apache.torque.gf.generator.java.NewlineGenerator"/> -</generators> \ No newline at end of file + </outlet> + <outlet name="keyField" xsi:type="velocityOutlet" path="keyField.vm"/> + <outlet name="constructor" xsi:type="velocityOutlet" path="constructor.vm"/> + <outlet name="getKey" xsi:type="velocityOutlet" path="getKey.vm"/> + <outlet name="toString" xsi:type="velocityOutlet" path="toString.vm"/> + <outlet name="newline" xsi:type="javaOutlet" class="org.apache.torque.generator.outlet.java.NewlineOutlet"/> +</outlets> \ No newline at end of file Modified: db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/templates/classFrame.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/templates/classFrame.vm?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/templates/classFrame.vm (original) +++ db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/templates/classFrame.vm Sun May 16 15:45:37 2010 @@ -15,7 +15,7 @@ ## specific language governing permissions and limitations ## under the License. ## -package org.apache.torque.gf.example.gettingstarted; +package org.apache.torque.generator.example.gettingstarted; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -41,7 +41,7 @@ package org.apache.torque.gf.example.get */ public enum PropertyKeys { -$torqueGf.mergepoint("constants")## -$torqueGf.mergepoint("fields")## -$torqueGf.mergepoint("methods")## +$torqueGen.mergepoint("constants")## +$torqueGen.mergepoint("fields")## +$torqueGen.mergepoint("methods")## } Modified: db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/templates/constant.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/templates/constant.vm?rev=944867&r1=916199&r2=944867&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/templates/constant.vm (original) +++ db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/templates/constant.vm Sun May 16 15:45:37 2010 @@ -16,6 +16,6 @@ ## under the License. ## /** Key for ${key} */ - $torqueGf.mergepoint("constantName")("${key}")#if(${torqueGf.getSourceElement().hasFollowingSibling()}),#else;#end + $torqueGen.mergepoint("constantName")("${key}")#if(${torqueGen.getSourceElement().hasFollowingSibling()}),#else;#end --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
