db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r917591 - in /db/torque/torque4/trunk/torque-generator/src: main/resources/org/apache/torque/gf/configuration/ test/configuration/src/main/torque-gf-parent/conf/ test/deeplyNestedMergepoints/src/main/torque-gf/conf/ test/java/org/apache/tor...
Date Mon, 01 Mar 2010 17:05:47 GMT
Author: tfischer
Date: Mon Mar  1 17:05:47 2010
New Revision: 917591

URL: http://svn.apache.org/viewvc?rev=917591&view=rev
Log:
Fixed a bug in the configuration.xsd. The source element was not checked against the configuration.
Some test cases were invalid after the bugfix and have been adjusted. 

Modified:
    db/torque/torque4/trunk/torque-generator/src/main/resources/org/apache/torque/gf/configuration/configuration.xsd
    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/deeplyNestedMergepoints/src/main/torque-gf/conf/control.xml
    db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/ReadConfigurationTest.java
    db/torque/torque4/trunk/torque-generator/src/test/propertyToJava/src/main/torque-gf/conf/control.xml
    db/torque/torque4/trunk/torque-generator/src/test/resources/org/apache/torque/gf/test/readfromclasspath/conf/control.xml

Modified: 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/gf/configuration/configuration.xsd?rev=917591&r1=917590&r2=917591&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/gf/configuration/configuration.xsd
Mon Mar  1 17:05:47 2010
@@ -70,7 +70,7 @@
   <complexType name="output">
     <sequence>
       <element name="filenameGenerator" type="configuration:baseGenerator" minOccurs="0"/>
-      <element name="source"/>
+      <element name="source" type="configuration:source"/>
       <element name="generator" type="configuration:generatorReference"/>
     </sequence>
     <attribute name="name" type="string" use="required">
@@ -115,6 +115,7 @@
           <element name="transformer" type="configuration:transformer" minOccurs="0" maxOccurs="unbounded"/>
         </sequence>
         <attribute name="type" type="string" use="optional"/>
+        <attribute name="elements" type="string" use="optional"/>
       </extension>
     </complexContent>
   </complexType>

Modified: 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-gf-parent/conf/control.xml?rev=917591&r1=917590&r2=917591&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-gf-parent/conf/control.xml
Mon Mar  1 17:05:47 2010
@@ -30,14 +30,14 @@
       <foo>ParentFoo</foo>
       <bar>ParentBar</bar>
     </filenameGenerator>
-    <source element="sourceElement" type="xml">
+    <source elements="parentSourceElement" type="xml">
       <include>parentSource</include>
     </source>
     <generator name="org.apache.torque.gf.test.readConfiguration.testParentGenerator"/>
   </output>
   <output name="secondOutput">
     <filenameGenerator xsi:type="velocityGenerator" path="testTemplate.vm"/>
-    <source path="parentSource" type="properties">
+    <source type="properties">
       <include>secondParentSource</include>
       <exclude>secondParentExclude</exclude>
     </source>

Modified: 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-gf/conf/control.xml?rev=917591&r1=917590&r2=917591&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-gf/conf/control.xml
Mon Mar  1 17:05:47 2010
@@ -23,7 +23,7 @@
     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">
   <output name="output" file="output.txt">
-    <source element="sourceElement" type="xml">
+    <source elements="sourceElement" type="xml">
       <include>source.xml</include>
     </source>
     <generator name="nestingGenerator0"/>

Modified: db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/ReadConfigurationTest.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/ReadConfigurationTest.java?rev=917591&r1=917590&r2=917591&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/ReadConfigurationTest.java
(original)
+++ db/torque/torque4/trunk/torque-generator/src/test/java/org/apache/torque/gf/configuration/ReadConfigurationTest.java
Mon Mar  1 17:05:47 2010
@@ -641,7 +641,7 @@
                     FileSourcesImpl sources = new FileSourcesImpl(
                             new XmlSourceType(),
                             sourceFileset,
-                            null,
+                            "parentSourceElement",
                             null,
                             new ArrayList<TransformerDefinition>(),
                             configurationHandlers);

Modified: 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-gf/conf/control.xml?rev=917591&r1=917590&r2=917591&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-gf/conf/control.xml
Mon Mar  1 17:05:47 2010
@@ -34,7 +34,7 @@
         <action xsi:type="optionAction" option="package" />
        </mergepoint>
     </filenameGenerator>
-    <source element="properties">
+    <source elements="properties">
       <include>propertiesData.properties</include>
     </source>
     <generator name="org.apache.torque.gf.velocity.propertiesToJava" />
@@ -49,13 +49,13 @@
         <action xsi:type="optionAction" option="package" />
        </mergepoint>
     </filenameGenerator>
-    <source element="properties">
+    <source elements="properties">
       <include>propertiesData.properties</include>
     </source>
     <generator name="org.apache.torque.gf.velocity.propertiesExtendedToJava" />
   </output>
   <output name="properties" file="Properties.properties">
-    <source element="properties">
+    <source elements="properties">
       <include>propertiesData.properties</include>
     </source>
     <generator name="org.apache.torque.gf.velocity.propertiesCopy"/>

Modified: 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/gf/test/readfromclasspath/conf/control.xml?rev=917591&r1=917590&r2=917591&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/gf/test/readfromclasspath/conf/control.xml
Mon Mar  1 17:05:47 2010
@@ -23,7 +23,9 @@
     xmlns="http://db.apache.org/torque/gf/4.0/configuration">
   <options path="options.properties" xsi:type="propertiesOptions"/> 
   <output name="properties" file="Properties.properties">
-    <source element="properties" path="propertiesData.properties"/>
+    <source elements="properties">
+      <include>propertiesData.properties</include>
+    </source>
     <generator name="org.apache.torque.gf.velocity.PropertiesCopy"/>
   </output>
 </control>



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message