From 5012efd0f1f3c893ad434f403ed011fdc952fed3 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Sun, 31 Jul 2016 17:08:10 +0100
Subject: [PATCH] Pass mdx.dir in to the MDA.

Most of the uses of this directory are actually to write output files,
but each of those uses are set up as ignores for source control
purposes.
---
 build.xml                 | 1 +
 mdx/at_aconet/verbs.xml   | 2 +-
 mdx/int_cobweb/verbs.xml  | 2 +-
 mdx/int_edugain/verbs.xml | 2 +-
 mdx/test/verbs.xml        | 2 +-
 mdx/uk/collect.xml        | 2 +-
 mdx/uk/verbs.xml          | 4 ++--
 mdx/us_incommon/verbs.xml | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 17e80bff..8674967f 100644
--- a/build.xml
+++ b/build.xml
@@ -412,6 +412,7 @@
     -->
     <property name="mda.java.endorsed.dirs" value="${tools.dir}/endorsed"/>
     <property name="mda.basedir" value="${basedir}"/>
+    <property name="mda.mdx.dir" value="${mdx.dir}"/>
 
     <!--
         Build a property set of all the properties to be passed through, with
diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
index cc7897d1..4b5a334a 100644
--- a/mdx/at_aconet/verbs.xml
+++ b/mdx/at_aconet/verbs.xml
@@ -25,7 +25,7 @@
     <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/at_aconet/imported.xml"/>
+                <constructor-arg value="${mdx.dir}/at_aconet/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/int_cobweb/verbs.xml b/mdx/int_cobweb/verbs.xml
index 063cb743..dde7a217 100644
--- a/mdx/int_cobweb/verbs.xml
+++ b/mdx/int_cobweb/verbs.xml
@@ -25,7 +25,7 @@
     <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/int_cobweb/imported.xml"/>
+                <constructor-arg value="${mdx.dir}/int_cobweb/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
index 7ca9668e..538fbdaa 100644
--- a/mdx/int_edugain/verbs.xml
+++ b/mdx/int_edugain/verbs.xml
@@ -26,7 +26,7 @@
     <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/int_edugain/imported.xml"/>
+                <constructor-arg value="${mdx.dir}/int_edugain/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/test/verbs.xml b/mdx/test/verbs.xml
index a3bfd4fb..f5f692df 100644
--- a/mdx/test/verbs.xml
+++ b/mdx/test/verbs.xml
@@ -25,7 +25,7 @@
     <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/test/imported.xml"/>
+                <constructor-arg value="${mdx.dir}/test/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/uk/collect.xml b/mdx/uk/collect.xml
index b6f56398..fa987eb6 100644
--- a/mdx/uk/collect.xml
+++ b/mdx/uk/collect.xml
@@ -25,7 +25,7 @@
     <bean id="serializeCollected" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/uk/collected.xml"/>
+                <constructor-arg value="${mdx.dir}/uk/collected.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 06b2aca4..9441d758 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -62,7 +62,7 @@
                 <bean id="serialize" parent="SerializationStage">
                     <property name="outputFile">
                         <bean class="java.io.File">
-                            <constructor-arg value="${basedir}/mdx/uk/temp.html"/>
+                            <constructor-arg value="${mdx.dir}/uk/temp.html"/>
                         </bean>
                     </property>
                 </bean>
@@ -326,7 +326,7 @@
     <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/uk/imported.xml"/>
+                <constructor-arg value="${mdx.dir}/uk/imported.xml"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml
index 3a438a8b..6ca5a631 100644
--- a/mdx/us_incommon/verbs.xml
+++ b/mdx/us_incommon/verbs.xml
@@ -28,7 +28,7 @@
     <bean id="serializeImported" parent="SerializationStage">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/us_incommon/imported.xml"/>
+                <constructor-arg value="${mdx.dir}/us_incommon/imported.xml"/>
             </bean>
         </property>
     </bean>