Author: tfischer
Date: Sun May 16 15:45:37 2010
New Revision: 944867
URL: http://svn.apache.org/viewvc?rev=944867&view=rev
Log:
Refactoring in the generator (Step 3):
"Generator" (interface name of output-producing class and config xml
element name) -> Outlet
"$torqueGf" (velocity variable name) -> "$torqueGen"
gf (package name) -> "generator"
Added:
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/configuration/
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/configuration.xsd
- copied, changed from r918875,
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/configuration/configuration.xsd
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/configuration/generator.xsd
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/log4j.properties
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/log4j.properties
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gf/
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gf-parent/
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/conf/control.xml
- copied, changed from r917591,
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gf-parent/conf/control.xml
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/outlets/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gf-parent/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/outlets/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gf/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gf/
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/conf/control.xml
- copied, changed from r917591,
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gf/conf/control.xml
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/outlets/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gf/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/outlets/outlets.xml
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gf/generatorDefs/generators.xml
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/BaseTest.java
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/BaseTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java
- copied, changed from r917591,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/ReadConfigurationTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/generator/
- copied from r918869,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/generator/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/
- copied from r918869,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/generator/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationTest.java
- copied, changed from r918869,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/generator/GeneratorConfigurationTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/control/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java
- copied, changed from r919745,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/control/DeeplyNestedMergepointsTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java
- copied, changed from r919745,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/control/PropertyToJavaGenerationTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/example/gettingstarted/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java
- copied, changed from r919745,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/example/gettingstarted/GettingStartedTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/file/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/generator/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/generator/java/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/generator/java/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/java/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaOutlet.java
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/java/JavaGenerator.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/generator/java/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutletTest.java
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/generator/java/ModifySourcenameGeneratorTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/NewlineOutletTest.java
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/generator/java/NewlineGeneratorTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/processor/string/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/qname/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/RichSourceElementImplTest.java
- copied, changed from r930722,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/RichSourceElementImplTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/SourcePathTest.java
- copied, changed from r930722,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/SourcePathTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/properties/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/properties/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/transform/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformerTest.java
- copied, changed from r930722,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/transform/BeanPropertyMethodNameTransformerTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/xml/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/SourceToXmlTest.java
- copied, changed from r930722,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/source/xml/SourceToXmlTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/template/velocity/
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/variable/
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/control.xml
- copied, changed from r917591,
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/conf/control.xml
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/javaTestOutlet.xml
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/javaTestGenerator.xml
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityExtendedPropertiesOutlet.xml
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/velocityExtendedPropertiesGenerator.xml
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesOutlet.xml
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/generatorDefs/velocityPropertiesGenerator.xml
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/example/
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/example/gettingstarted/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/example/gettingstarted/
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/source/
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/source/properties/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/source/properties/
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/source/xml/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/source/xml/
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/source/xml/sourceToXmlWithReferenceResult.xml
- copied unchanged from r930722,
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/source/xml/sourceToXmlWithReferenceResult.xml
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/conf/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/test/readfromclasspath/conf/
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/conf/control.xml
- copied, changed from r917591,
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/test/readfromclasspath/conf/control.xml
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/outlets/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/test/readfromclasspath/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/package.html
- copied unchanged from r916199,
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/test/readfromclasspath/package.html
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/templates/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/test/readfromclasspath/templates/
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gf/
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/outlets/
- copied from r916199,
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gf/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/outlets/enumOutlets.xml
- copied, changed from r916199,
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gf/generatorDefs/enumGenerators.xml
Removed:
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/generator.xsd
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/outlets/generators.xml
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/outlet/GeneratorConfigurationTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaGenerator.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/ModifySourcenameGeneratorTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/outlet/java/NewlineGeneratorTest.java
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/javaTestGenerator.xml
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityExtendedPropertiesGenerator.xml
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesGenerator.xml
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/generatorDefs/
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/outlets/enumGenerators.xml
Modified:
db/torque/torque4/trunk/torque-generator/pom.xml
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/conf/parent-options.properties
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/outlets/testGenerator.xml
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/conf/control.xml
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/conf/options.properties
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/outlets/testGenerator.xml
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/templates/nesting.vm
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStarted.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/file/FilesetTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/CamelbackerTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/ConstantNameCreatorTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/NamespaceTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameMapTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/qname/QualifiedNameTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/properties/PropertiesParserTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/AttributeTransformerTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/xml/XmlParserTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/template/velocity/VelocityTemplateFilterTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableTest.java
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/conf/options.properties
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityPropertiesCopy.xml
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityVariableAssignment.xml
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/outlets/velocityVariableDefinition.xml
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesCopy.vm
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesExtendedToJava.vm
db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gen/templates/propertiesToJava.vm
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/example/gettingstarted/PropertyKeys.java
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/outlets/testGenerator.xml
db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/generator/test/readfromclasspath/templates/testTemplate.vm
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/conf/control.xml
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/templates/classFrame.vm
db/torque/torque4/trunk/torque-generator/src/test/site/gettingStarted/src/main/torque-gen/templates/constant.vm
Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=944867&r1=944866&r2=944867&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Sun May 16 15:45:37 2010
@@ -113,12 +113,12 @@
<configuration>
<tasks>
<!-- prepare the PropertyToJavaJarGenerationTest -->
- <mkdir
dir="${basedir}/target/test/propertyToJavaJar/src/main/torque-gf/src"/>
- <copy
todir="${basedir}/target/test/propertyToJavaJar/src/main/torque-gf/src">
- <fileset
dir="${basedir}/src/test/propertyToJava/src/main/torque-gf/src" />
+ <mkdir
dir="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/src"/>
+ <copy
todir="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/src">
+ <fileset
dir="${basedir}/src/test/propertyToJava/src/main/torque-gen/src" />
</copy>
- <jar
basedir="${basedir}/src/test/propertyToJava/src/main/torque-gf"
-
destfile="${basedir}/target/test/propertyToJavaJar/src/main/torque-gf/propertyToJava.jar"/>
+ <jar
basedir="${basedir}/src/test/propertyToJava/src/main/torque-gen"
+
destfile="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/propertyToJava.jar"/>
</tasks>
</configuration>
<goals>
Copied:
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/configuration.xsd
(from r918875,
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/configuration/configuration.xsd)
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/configuration.xsd?p2=db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/configuration.xsd&p1=db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/configuration/configuration.xsd&r1=918875&r2=944867&rev=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/configuration/configuration.xsd
(original)
+++
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/configuration.xsd
Sun May 16 15:45:37 2010
@@ -19,13 +19,13 @@
-->
<schema xmlns="http://www.w3.org/2001/XMLSchema";
- xmlns:configuration="http://db.apache.org/torque/gf/4.0/configuration";
- targetNamespace="http://db.apache.org/torque/gf/4.0/configuration";
+
xmlns:configuration="http://db.apache.org/torque/4.0/generator/configuration";
+ targetNamespace="http://db.apache.org/torque/4.0/generator/configuration";
elementFormDefault="qualified"
attributeFormDefault="unqualified">
<!-- use HTTP location, will be resolved locally by entity resolver -->
- <include schemaLocation="http://db.apache.org/torque/gf/4.0/generator.xsd"/>
+ <include
schemaLocation="http://db.apache.org/torque/4.0/generator/outlet.xsd"/>
<simpleType name="loglevelType">
<restriction base="string">
@@ -69,9 +69,9 @@
<complexType name="output">
<sequence>
- <element name="filenameGenerator" type="configuration:baseGenerator"
minOccurs="0"/>
+ <element name="filenameOutlet" type="configuration:baseOutlet"
minOccurs="0"/>
<element name="source" type="configuration:source"/>
- <element name="generator" type="configuration:generatorReference"/>
+ <element name="outlet" type="configuration:outletReference"/>
</sequence>
<attribute name="name" type="string" use="required">
<annotation>
@@ -87,7 +87,7 @@
This attribute contains the name of the generated file.
Relative paths are relative to the target directory.
If the file name is not fixed, omit this attribute and use
- the child element filenameGenerator instead.
+ the child element filenameOutlet instead.
</documentation>
</annotation>
</attribute>
@@ -126,7 +126,7 @@
<attribute name="elements" type="string" use="optional"/>
</complexType>
- <complexType name="generatorReference">
+ <complexType name="outletReference">
<attribute name="name" type="string" use="required"/>
</complexType>
Copied:
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd
(from r916199,
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/configuration/generator.xsd)
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd?p2=db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd&p1=db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/configuration/generator.xsd&r1=916199&r2=944867&rev=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/configuration/generator.xsd
(original)
+++
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/configuration/outlet.xsd
Sun May 16 15:45:37 2010
@@ -19,20 +19,20 @@
-->
<schema xmlns="http://www.w3.org/2001/XMLSchema";
- xmlns:configuration="http://db.apache.org/torque/gf/4.0/configuration";
- targetNamespace="http://db.apache.org/torque/gf/4.0/configuration";
+
xmlns:configuration="http://db.apache.org/torque/4.0/generator/configuration";
+ targetNamespace="http://db.apache.org/torque/4.0/generator/configuration";
elementFormDefault="qualified"
attributeFormDefault="unqualified">
- <element name="generators">
+ <element name="outlets">
<complexType>
<sequence>
- <element name="generator" type="configuration:baseGenerator"
maxOccurs="unbounded"/>
+ <element name="outlet" type="configuration:baseOutlet"
maxOccurs="unbounded"/>
<!--
- The mergepoints defined here must be fully qualified with the name
of the generator.
+ The mergepoints defined here must be fully qualified with the name
of the outlet.
The mergepoint must already be known at this time. This is only
ensured if the
- generator is defined in the same file (then the definition of the
mergepoint
- outside the generator does not make sense) or in a parent module.
+ outlet is defined in the same file (then the definition of the
mergepoint
+ outside the outlet does not make sense) or in a parent module.
The mergepoint definition here overrides any previous definition.
-->
<element name="mergepoint" type="configuration:mergepoint"
minOccurs="0" maxOccurs="unbounded"/>
@@ -40,21 +40,21 @@
</complexType>
</element>
- <complexType name="baseGenerator" abstract="true">
+ <complexType name="baseOutlet" abstract="true">
<sequence>
<element name="input" type="configuration:input" minOccurs="0"/>
<element name="mergepoint" type="configuration:mergepoint" minOccurs="0"
maxOccurs="unbounded" />
</sequence>
<!--
- name is optional in filenameGenerators but required in normal generators.
+ name is optional in filenameOutlets but required in normal outlets.
However, this can not be forced here, so use is set to optional.
-->
<attribute name="name" type="string" use="optional"/>
</complexType>
- <complexType name="javaGenerator">
+ <complexType name="javaOutlet">
<complexContent>
- <extension base="configuration:baseGenerator">
+ <extension base="configuration:baseOutlet">
<sequence>
<any processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
@@ -63,9 +63,9 @@
</complexContent>
</complexType>
- <complexType name="velocityGenerator">
+ <complexType name="velocityOutlet">
<complexContent>
- <extension base="configuration:baseGenerator">
+ <extension base="configuration:baseOutlet">
<attribute name="path" type="string" use="required"/>
<attribute name="optionsInContext" type="string" use="optional"/>
<attribute name="sourceAttributesInContext" type="string"
use="optional"/>
@@ -75,9 +75,9 @@
</complexType>
<!-- not yet implemented -->
- <complexType name="xalanGenerator">
+ <complexType name="xalanOutlet">
<complexContent>
- <extension base="configuration:baseGenerator">
+ <extension base="configuration:baseOutlet">
<attribute name="path" type="string" use="required"/>
</extension>
</complexContent>
@@ -100,7 +100,7 @@
<complexType name="applyAction">
<complexContent>
<extension base="configuration:baseAction">
- <attribute name="generator" type="string" use="required"/>
+ <attribute name="outlet" type="string" use="required"/>
<attribute name="acceptNotSet" type="boolean" use="optional"/>
</extension>
</complexContent>
@@ -137,7 +137,7 @@
<complexContent>
<extension base="configuration:baseAction">
<attribute name="element" type="string" use="required"/>
- <attribute name="generator" type="string" use="required"/>
+ <attribute name="outlet" type="string" use="required"/>
</extension>
</complexContent>
</complexType>
Copied:
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/log4j.properties
(from r916199,
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/log4j.properties)
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/log4j.properties?p2=db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/log4j.properties&p1=db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/log4j.properties&r1=916199&r2=944867&rev=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/log4j.properties
(original)
+++
db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/generator/log4j.properties
Sun May 16 15:45:37 2010
@@ -18,7 +18,7 @@
log4j.rootLogger = INFO, generator, console
log4j.appender.generator = org.apache.log4j.FileAppender
-log4j.appender.generator.file = target/torque-gf/log/generator.log
+log4j.appender.generator.file = target/torque-gen/log/torque-gen.log
log4j.appender.generator.append = true
log4j.appender.generator.layout = org.apache.log4j.PatternLayout
log4j.appender.generator.layout.conversionPattern = %d [%t] %-5p %c - %m%n
Copied:
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/conf/control.xml
(from r917591,
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gf-parent/conf/control.xml)
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/conf/control.xml?p2=db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/conf/control.xml&p1=db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gf-parent/conf/control.xml&r1=917591&r2=944867&rev=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gf-parent/conf/control.xml
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/conf/control.xml
Sun May 16 15:45:37 2010
@@ -19,29 +19,29 @@
-->
<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="warn">
<options path="parent-options.properties" xsi:type="propertiesOptions"/>
<output name="parentOutput">
- <filenameGenerator xsi:type="javaGenerator"
- class="org.apache.torque.gf.java.JavaGenerator">
+ <filenameOutlet xsi:type="javaOutlet"
+ class="org.apache.torque.generator.java.JavaOutlet">
<foo>ParentFoo</foo>
<bar>ParentBar</bar>
- </filenameGenerator>
+ </filenameOutlet>
<source elements="parentSourceElement" type="xml">
<include>parentSource</include>
</source>
- <generator
name="org.apache.torque.gf.test.readConfiguration.testParentGenerator"/>
+ <outlet
name="org.apache.torque.generator.test.readConfiguration.testParentOutlet"/>
</output>
<output name="secondOutput">
- <filenameGenerator xsi:type="velocityGenerator" path="testTemplate.vm"/>
+ <filenameOutlet xsi:type="velocityOutlet" path="testTemplate.vm"/>
<source type="properties">
<include>secondParentSource</include>
<exclude>secondParentExclude</exclude>
</source>
- <generator
name="org.apache.torque.gf.test.readConfiguration.parentGenerator"/>
+ <outlet
name="org.apache.torque.generator.test.readConfiguration.parentOutlet"/>
</output>
</control>
\ No newline at end of file
Modified:
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/conf/parent-options.properties
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/conf/parent-options.properties?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/conf/parent-options.properties
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/conf/parent-options.properties
Sun May 16 15:45:37 2010
@@ -21,6 +21,6 @@ optionWithoutNamespace = optionWithoutNa
parentOptionWithoutNamespace = parentOptionWithoutNamespaceParentValue
#option with namespace, will be overwritten in child
-org.apache.torque.gf.optionWithNamespace = optionWithNamespaceParentValue
+org.apache.torque.generator.optionWithNamespace =
optionWithNamespaceParentValue
#option with namespace, will not be overwritten in child
-org.apache.torque.gf.parentOptionWithNamespace =
parentOptionWithNamespaceParentValue
+org.apache.torque.generator.parentOptionWithNamespace =
parentOptionWithNamespaceParentValue
Modified:
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/outlets/testGenerator.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/outlets/testGenerator.xml?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/outlets/testGenerator.xml
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen-parent/outlets/testGenerator.xml
Sun May 16 15:45:37 2010
@@ -18,25 +18,25 @@
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";>
+<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";>
- <generator name="org.apache.torque.gf.test.readConfiguration.javaGenerator"
- xsi:type="javaGenerator"
- class="org.apache.torque.gf.java.JavaGenerator">
+ <outlet name="org.apache.torque.generator.test.readConfiguration.javaOutlet"
+ 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>
<mergepoint name="mergepointFromParent">
<action xsi:type="traverseAllAction" element="xy"
- generator="someParentGenerator"/>
+ outlet="someParentOutlet"/>
</mergepoint>
<foo>ParentFoo2</foo>
<bar>ParentBar2</bar>
- </generator>
- <generator name="org.apache.torque.gf.test.readConfiguration.parentGenerator"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet
name="org.apache.torque.generator.test.readConfiguration.parentOutlet"
+ xsi:type="velocityOutlet"
path="testTemplate.vm"/>
-</generators>
\ No newline at end of file
+</outlets>
\ No newline at end of file
Modified:
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/conf/control.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/conf/control.xml?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/conf/control.xml
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/conf/control.xml
Sun May 16 15:45:37 2010
@@ -20,33 +20,33 @@
<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"/>
<options path="options.xml" xsi:type="xmlOptions"/>
- <output name="org.apache.torque.gf.firstOutput" skipIfExists="true">
- <filenameGenerator xsi:type="javaGenerator"
class="org.apache.torque.gf.java.JavaGenerator">
+ <output name="org.apache.torque.generator.firstOutput" skipIfExists="true">
+ <filenameOutlet xsi:type="javaOutlet"
class="org.apache.torque.generator.java.JavaOutlet">
<foo>Foo</foo>
<bar>Bar</bar>
- </filenameGenerator>
+ </filenameOutlet>
<source type="xml"/>
- <generator
name="org.apache.torque.gf.test.readConfiguration.javaGenerator"/>
+ <outlet
name="org.apache.torque.generator.test.readConfiguration.javaOutlet"/>
</output>
<output name="secondOutput">
- <filenameGenerator xsi:type="velocityGenerator" path="testTemplate.vm"/>
+ <filenameOutlet xsi:type="velocityOutlet" path="testTemplate.vm"/>
<source elements="properties/entry" type="properties">
<include>second.source.path.properties</include>
<exclude>second.excluded.properties</exclude>
</source>
- <generator
name="org.apache.torque.gf.test.readConfiguration.anotherGenerator"/>
+ <outlet
name="org.apache.torque.generator.test.readConfiguration.anotherOutlet"/>
</output>
<output name="thirdOutput" file="outputFileName">
<source>
<include>third.source.path.properties</include>
<exclude>third.excluded.properties</exclude>
</source>
- <generator
name="org.apache.torque.gf.test.readConfiguration.thirdGenerator"/>
+ <outlet
name="org.apache.torque.generator.test.readConfiguration.thirdOutlet"/>
</output>
</control>
\ No newline at end of file
Modified:
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/conf/options.properties
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/conf/options.properties?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/conf/options.properties
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/conf/options.properties
Sun May 16 15:45:37 2010
@@ -18,7 +18,7 @@
#option without namespace
optionWithoutNamespace = optionWithoutNamespaceValue
#option with namespace
-org.apache.torque.gf.optionWithNamespace = optionWithNamespaceValue
+org.apache.torque.generator.optionWithNamespace = optionWithNamespaceValue
org.apache.optionWithNamespace = org.apache.optionWithNamespaceValue
Modified:
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/outlets/testGenerator.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/outlets/testGenerator.xml?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/outlets/testGenerator.xml
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/configuration/src/main/torque-gen/outlets/testGenerator.xml
Sun May 16 15:45:37 2010
@@ -18,35 +18,35 @@
under the License.
-->
-<torqueGfConf:generators
xmlns="http://db.apache.org/torque/gf/4.0/configuration";
- xmlns:torqueGfConf="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";
+<torqueGenConf:outlets
xmlns="http://db.apache.org/torque/4.0/generator/configuration";
+
xmlns:torqueGenConf="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.test.readConfiguration.javaGenerator"
- xsi:type="javaGenerator"
- class="org.apache.torque.gf.java.JavaGenerator">
+ <outlet name="org.apache.torque.generator.test.readConfiguration.javaOutlet"
+ xsi:type="javaOutlet"
+ class="org.apache.torque.generator.java.JavaOutlet">
<input elementName="inputElement"/>
<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>Foo2</foo>
<bar>Bar2</bar>
- </generator>
- <torqueGfConf:generator
name="org.apache.torque.gf.test.readConfiguration.anotherGenerator"
- xsi:type="velocityGenerator"
+ </outlet>
+ <torqueGenConf:outlet
name="org.apache.torque.generator.test.readConfiguration.anotherOutlet"
+ xsi:type="velocityOutlet"
path="testTemplate.vm"
sourceAttributesInContext="false"
optionsInContext="false"
variablesInContext="false"/>
- <mergepoint
name="org.apache.torque.gf.test.readConfiguration.javaGenerator.mergepointName">
+ <mergepoint
name="org.apache.torque.generator.test.readConfiguration.javaOutlet.mergepointName">
<action xsi:type="applyAction"
- generator="someGeneratorAction"
+ outlet="someOutletAction"
acceptNotSet="false"/>
</mergepoint>
- <mergepoint
name="org.apache.torque.gf.test.readConfiguration.javaGenerator.mergepointFromParent">
+ <mergepoint
name="org.apache.torque.generator.test.readConfiguration.javaOutlet.mergepointFromParent">
<action xsi:type="applyAction"
- generator="newGeneratorAction"/>
+ outlet="newOutletAction"/>
</mergepoint>
-</torqueGfConf:generators>
\ No newline at end of file
+</torqueGenConf:outlets>
\ No newline at end of file
Copied:
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/conf/control.xml
(from r917591,
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gf/conf/control.xml)
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/conf/control.xml?p2=db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/conf/control.xml&p1=db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gf/conf/control.xml&r1=917591&r2=944867&rev=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gf/conf/control.xml
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/conf/control.xml
Sun May 16 15:45:37 2010
@@ -20,13 +20,13 @@
<control loglevel="debug"
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";>
<output name="output" file="output.txt">
<source elements="sourceElement" type="xml">
<include>source.xml</include>
</source>
- <generator name="nestingGenerator0"/>
+ <outlet name="nestingOutlet0"/>
</output>
</control>
\ No newline at end of file
Copied:
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/outlets/outlets.xml
(from r916199,
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gf/generatorDefs/generators.xml)
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/outlets/outlets.xml?p2=db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/outlets/outlets.xml&p1=db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gf/generatorDefs/generators.xml&r1=916199&r2=944867&rev=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gf/generatorDefs/generators.xml
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/outlets/outlets.xml
Sun May 16 15:45:37 2010
@@ -18,80 +18,80 @@
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="nestingGenerator0"
- xsi:type="velocityGenerator"
+ <outlet name="nestingOutlet0"
+ xsi:type="velocityOutlet"
path="nesting.vm">
<mergepoint name="mergepoint">
- <action xsi:type="applyAction" generator="nestingGenerator1"/>
+ <action xsi:type="applyAction" outlet="nestingOutlet1"/>
</mergepoint>
- </generator>
- <generator name="nestingGenerator1"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet name="nestingOutlet1"
+ xsi:type="velocityOutlet"
path="nesting.vm">
<mergepoint name="mergepoint">
- <action xsi:type="applyAction" generator="nestingGenerator2"/>
+ <action xsi:type="applyAction" outlet="nestingOutlet2"/>
</mergepoint>
- </generator>
- <generator name="nestingGenerator2"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet name="nestingOutlet2"
+ xsi:type="velocityOutlet"
path="nesting.vm">
<mergepoint name="mergepoint">
- <action xsi:type="applyAction" generator="nestingGenerator3"/>
+ <action xsi:type="applyAction" outlet="nestingOutlet3"/>
</mergepoint>
- </generator>
- <generator name="nestingGenerator3"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet name="nestingOutlet3"
+ xsi:type="velocityOutlet"
path="nesting.vm">
<mergepoint name="mergepoint">
- <action xsi:type="applyAction" generator="nestingGenerator4"/>
+ <action xsi:type="applyAction" outlet="nestingOutlet4"/>
</mergepoint>
- </generator>
- <generator name="nestingGenerator4"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet name="nestingOutlet4"
+ xsi:type="velocityOutlet"
path="nesting.vm">
<mergepoint name="mergepoint">
- <action xsi:type="applyAction" generator="nestingGenerator5"/>
+ <action xsi:type="applyAction" outlet="nestingOutlet5"/>
</mergepoint>
- </generator>
- <generator name="nestingGenerator5"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet name="nestingOutlet5"
+ xsi:type="velocityOutlet"
path="nesting.vm">
<mergepoint name="mergepoint">
- <action xsi:type="applyAction" generator="nestingGenerator6"/>
+ <action xsi:type="applyAction" outlet="nestingOutlet6"/>
</mergepoint>
- </generator>
- <generator name="nestingGenerator6"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet name="nestingOutlet6"
+ xsi:type="velocityOutlet"
path="nesting.vm">
<mergepoint name="mergepoint">
- <action xsi:type="applyAction" generator="nestingGenerator7"/>
+ <action xsi:type="applyAction" outlet="nestingOutlet7"/>
</mergepoint>
- </generator>
- <generator name="nestingGenerator7"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet name="nestingOutlet7"
+ xsi:type="velocityOutlet"
path="nesting.vm">
<mergepoint name="mergepoint">
- <action xsi:type="applyAction" generator="nestingGenerator8"/>
+ <action xsi:type="applyAction" outlet="nestingOutlet8"/>
</mergepoint>
- </generator>
- <generator name="nestingGenerator8"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet name="nestingOutlet8"
+ xsi:type="velocityOutlet"
path="nesting.vm">
<mergepoint name="mergepoint">
- <action xsi:type="applyAction" generator="nestingGenerator9"/>
+ <action xsi:type="applyAction" outlet="nestingOutlet9"/>
</mergepoint>
- </generator>
- <generator name="nestingGenerator9"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet name="nestingOutlet9"
+ xsi:type="velocityOutlet"
path="nesting.vm">
<mergepoint name="mergepoint">
- <action xsi:type="applyAction" generator="contentGenerator"/>
+ <action xsi:type="applyAction" outlet="contentOutlet"/>
</mergepoint>
- </generator>
- <generator name="contentGenerator"
- xsi:type="velocityGenerator"
+ </outlet>
+ <outlet name="contentOutlet"
+ xsi:type="velocityOutlet"
path="content.vm"/>
-</generators>
\ No newline at end of file
+</outlets>
\ No newline at end of file
Modified:
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/templates/nesting.vm
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/templates/nesting.vm?rev=944867&r1=916199&r2=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/templates/nesting.vm
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/deeplyNestedMergepoints/src/main/torque-gen/templates/nesting.vm
Sun May 16 15:45:37 2010
@@ -15,4 +15,4 @@
## specific language governing permissions and limitations
## under the License.
##
-$torqueGf.mergepoint("mergepoint")
\ No newline at end of file
+$torqueGen.mergepoint("mergepoint")
\ No newline at end of file
Copied:
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/BaseTest.java
(from r916199,
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/BaseTest.java)
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/BaseTest.java?p2=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/BaseTest.java&p1=db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/BaseTest.java&r1=916199&r2=944867&rev=944867&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/BaseTest.java
(original)
+++
db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/generator/BaseTest.java
Sun May 16 15:45:37 2010
@@ -1,4 +1,4 @@
-package org.apache.torque.gf;
+package org.apache.torque.generator;
/*
* Licensed to the Apache Software Foundation (ASF) under one
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
