Slight file re-organization per suggestion from SB; parameterizing fi…

…le list so a single file can be tested more easily.

Test2/build_odd.xml

@@ -16,8 +16,13 @@
   <!-- First we include the generic utilities module.   -->
   <import file="build_utilities.xml" as="utils"/>
 
+  <!-- This is the list of files we're going to process, expressed
+       as a parameter, so that it can be overridden to process 
+       a subset of files. -->
+  <property name="oddFileList" value="testSpecificationDescription.odd testPure1.odd testNonTeiOdd1.odd"/>
+
   <!--  Files for conversion from ODD to RNG.  -->
-  <fileset id="oddToRngFiles" dir="${inputDir}" includes="testSpecificationDescription.odd testPure1.odd testNonTeiOdd1.odd"/>
+  <fileset id="oddToRngFiles" dir="${inputDir}" includes="${oddFileList}"/>
 
 
 <!-- Default target that does everything. -->
@@ -128,7 +133,7 @@
 <!--   Look for a valid exemplar, and if it's there, validate it with
        the schema that's been created. -->
 
-    <property name="validExemplar" value="${inputDir}/${plainFileName}ValidExemplar.xml"/>
+    <property name="validExemplar" value="${inputDir}/validExemplars/${plainFileName}ValidExemplar.xml"/>
 
     <if>
       <available file="${validExemplar}"/>
@@ -140,7 +145,7 @@
 <!--   Look for an invalid exemplar, and if it's there, validate it and diff
        errors against expected-results. -->
 
-    <property name="invalidExemplar" value="${inputDir}/${plainFileName}InvalidExemplar.xml"/>
+    <property name="invalidExemplar" value="${inputDir}/invalidExemplars/${plainFileName}InvalidExemplar.xml"/>
 
     <if>
       <available file="${invalidExemplar}"/>

Test2/build_utilities.xml

@@ -271,7 +271,7 @@
       from a single input pattern (plainFileName).
     </description>
     <property name="rngFile" value="${outputDir}/${plainFileName}.rng"/>
-    <property name="invalidExemplar" value="${inputDir}/${plainFileName}InvalidExemplar.xml"/>
+    <property name="invalidExemplar" value="${inputDir}/invalidExemplars/${plainFileName}InvalidExemplar.xml"/>
     <property name="outputErrorFile" value="${outputDir}/${plainFileName}InvalidExemplarRngErrors.txt"/>
 
 <!--   Run jing to create the error output file. -->

Test2/expected-results/testNonTeiOdd1InvalidExemplarRngErrors.txt

@@ -1,3 +1,3 @@
-/home/mholmes/Documents/tei/Stylesheets/Test2/inputFiles/testNonTeiOdd1InvalidExemplar.xml:9:9: error: element "h3" not allowed here; expected the element end-tag or element "blockquote", "div", "figure", "img", "ol", "p", "table" or "ul"
-/home/mholmes/Documents/tei/Stylesheets/Test2/inputFiles/testNonTeiOdd1InvalidExemplar.xml:20:34: error: value of attribute "class" is invalid; must be equal to "disc", "none" or "square"
-/home/mholmes/Documents/tei/Stylesheets/Test2/inputFiles/testNonTeiOdd1InvalidExemplar.xml:35:22: error: element "caption" not allowed here; expected the element end-tag or element "tr"
+/home/mholmes/Documents/tei/Stylesheets/Test2/inputFiles/invalidExemplars/testNonTeiOdd1InvalidExemplar.xml:9:9: error: element "h3" not allowed here; expected the element end-tag or element "blockquote", "div", "figure", "img", "ol", "p", "table" or "ul"
+/home/mholmes/Documents/tei/Stylesheets/Test2/inputFiles/invalidExemplars/testNonTeiOdd1InvalidExemplar.xml:20:34: error: value of attribute "class" is invalid; must be equal to "disc", "none" or "square"
+/home/mholmes/Documents/tei/Stylesheets/Test2/inputFiles/invalidExemplars/testNonTeiOdd1InvalidExemplar.xml:35:22: error: element "caption" not allowed here; expected the element end-tag or element "tr"