From dd54cae8c22aa9dc3da24144a9e7db00fc580758 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 15 Jul 2014 12:13:16 +0100
Subject: [PATCH] Parameterise import aggregate generation.

Take local file locations of production aggregate and generated import
aggregate from properties.
Add a target to generate the import aggregate.
---
 build.xml               | 20 ++++++++++++++++++++
 mdx/incommon/import.xml | 21 +++++++++++----------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index 1e7dbc84..d417ad8f 100644
--- a/build.xml
+++ b/build.xml
@@ -1449,6 +1449,13 @@
     -->
     <property name="mda.inc.exported.xml" value="${mda.incdir}/exported.xml"/>
 
+    <!--
+        Default local file location to which to write the import aggregate.
+
+        This can be overridden in build.properties.
+    -->
+    <property name="mda.inc.imported.xml" value="${mda.incdir}/imported.xml"/>
+
     <!--
         inc.fetch.production
 
@@ -1476,4 +1483,17 @@
         <echo>Generation complete.</echo>
     </target>
 
+    <!--
+        inc.generate.import
+
+        Generate the InCommon import aggregate.
+    -->
+    <target name="inc.generate.import">
+        <echo>Generating InCommon import aggregate in ${mda.inc.imported.xml}</echo>
+        <echo>    from production aggregate in ${mda.inc.production.xml}</echo>
+        <echo>    and selected eduGAIN entities...</echo>
+        <CHANNEL.do channel="incommon" verb="export"/>
+        <echo>Generation complete.</echo>
+    </target>
+
 </project>
\ No newline at end of file
diff --git a/mdx/incommon/import.xml b/mdx/incommon/import.xml
index a54c234e..b7c5b9b9 100644
--- a/mdx/incommon/import.xml
+++ b/mdx/incommon/import.xml
@@ -32,7 +32,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/incommon/imported.xml"/>
+                <constructor-arg value="${inc.imported.xml}"/>
             </bean>
         </property>
     </bean>
@@ -87,17 +87,18 @@
         p:id="import">
         <property name="stages">
             <list>
-                <!-- Start with the InCommon production aggregate. -->
-                <ref bean="us_incommon_productionAggregate"/>
-
                 <!--
-                    Check for fatal errors at the aggregate level:
-                        missing or expired validUntil attribute
-                        invalid signature
+                    Start with the InCommon production aggregate.
+
+                    In a production environment, this will be the *unsigned* aggregate,
+                    so we perform minimal checking on its contents.
                 -->
-                <ref bean="check_validUntil"/>
-                <ref bean="us_incommon_checkSignature"/>
-                <ref bean="errorTerminatingFilter"/>
+                <bean id="production_aggregate" parent="DOMResourceSourceStage"
+                    p:id="production_aggregate">
+                    <property name="DOMResource">
+                        <bean parent="ClassPathResource" c:_0="incommon/production.xml"/>
+                    </property>
+                </bean>
 
                 <!-- Break down into individual entities. -->
                 <ref bean="disassemble"/>