From 611105f637b26e62823c241e0c1c876b0cf29387 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 17 Apr 2012 13:46:42 +0000
Subject: [PATCH] Bugzilla 902: move import transform inside the aggregator
 Bugzilla 903: import transform should check for schema validity before
 anything else Also a fair amount of cleanup related to these changes.

---
 build.xml                              | 13 +---
 mdx/uk/beans.xml                       |  4 +-
 {build => mdx/uk}/import.xsl           |  0
 {build => mdx/uk}/ns_norm_fragment.xsl |  6 +-
 mdx/uk/verbs.xml                       | 82 ++++++++++++++++++++++----
 5 files changed, 78 insertions(+), 27 deletions(-)
 rename {build => mdx/uk}/import.xsl (100%)
 rename {build => mdx/uk}/ns_norm_fragment.xsl (95%)

diff --git a/build.xml b/build.xml
index b22dec19..2cf7d725 100644
--- a/build.xml
+++ b/build.xml
@@ -762,18 +762,9 @@
 	
 	<target name="import.metadata">
 		<echo>Importing metadata from ${entities.dir}/import.xml</echo>
-		
-		<!-- Step 1: perform real processing into temporary file -->
-		<XALAN x="${build.dir}/import.xsl"
-			i="${entities.dir}/import.xml" o="${temp.xml}"/>
-		
-		<!-- Step 2: normalise namespaces into result file -->
-        <XALAN x="${build.dir}/ns_norm_fragment.xsl"
-            i="${temp.xml}" o="${entities.dir}/imported.xml"/>
-		
+        <delete file="${entities.dir}/imported.xml" quiet="true" verbose="false"/>
+		<CHANNEL.do channel="uk" verb="import"/>
 		<echo>Imported metadata to ${entities.dir}/imported.xml</echo>
-		<CHANNEL.do channel="uk" verb="validateImportedMetadata"/>
-		<echo>Checked.</echo>
 	</target>
 	
     <!--
diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 6042bf67..fb7e704c 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -398,10 +398,8 @@
         Serialise the (assumed HTML) DomDocumentItem into the UK federation statistics
         output file in the production XML directory.
     -->
-    <bean id="uk_serializeStatistics" parent="stage_parent"
-        class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="uk_serializeStatistics" parent="serialize_parent"
         p:id="uk_serializeStatistics">
-        <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
                 <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-stats.html"/>
diff --git a/build/import.xsl b/mdx/uk/import.xsl
similarity index 100%
rename from build/import.xsl
rename to mdx/uk/import.xsl
diff --git a/build/ns_norm_fragment.xsl b/mdx/uk/ns_norm_fragment.xsl
similarity index 95%
rename from build/ns_norm_fragment.xsl
rename to mdx/uk/ns_norm_fragment.xsl
index 8f816793..21070d15 100644
--- a/build/ns_norm_fragment.xsl
+++ b/mdx/uk/ns_norm_fragment.xsl
@@ -35,9 +35,9 @@
 
 
 	<!--
-		Import templates for basic normalisation.
-	-->
-	<xsl:import href="ns_norm.xsl"/>
+        Import templates for basic normalisation.
+    -->
+	<xsl:import href="../../build/ns_norm.xsl"/>
 	
 
 	<!--
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index a6ad3bc7..9b480a83 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Verb to generate all UK aggregates.
+    Miscellaneous UK channel verbs.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
+    default-lazy-init="true"
     xmlns:p="http://www.springframework.org/schema/p"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -150,13 +151,28 @@
     -->
     
     <!--
-        importedMetadata
+        fetchImportMetadata
+        
+        Fetches the contents of the file used to hold metadata to be imported
+        into a UK federation fragment file.
+    -->
+    <bean id="fetchImportMetadata" parent="domFileStage_parent"
+        p:id="fetchImportMetadata">
+        <property name="source">
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/entities/import.xml"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        fetchImportedMetadata
         
         Fetches the contents of the file used to hold metadata just imported
         by the federation's import transform.
     -->
-    <bean id="importedMetadata" parent="domFileStage_parent"
-        p:id="importedMetadata">
+    <bean id="fetchImportedMetadata" parent="domFileStage_parent"
+        p:id="fetchImportedMetadata">
         <property name="source">
             <bean class="java.io.File">
                 <constructor-arg value="#{ systemProperties['basedir'] }/entities/imported.xml"/>
@@ -165,21 +181,67 @@
     </bean>
 
     <!--
-        validateImportedMetadata
+        serializeImportedMetadata
+        
+        Serialise the fragment file just imported.
+    -->
+    <bean id="serializeImportedMetadata" parent="serialize_parent"
+        p:id="serializeImportedMetadata">
+        <property name="outputFile">
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/entities/imported.xml"/>
+            </bean>
+        </property>
+    </bean>
+
+    <!--
+        import
         
-        Perform custom validation on metadata just imported by the
-        federation's import transform.
+        Pipeline to import a metadata fragment file.
+        
+        For now, just the head of that pipeline.
     -->
-    <bean id="validateImportedMetadata" parent="pipeline_parent"
-        p:id="validateImportedMetadata">
+    <bean id="import" parent="pipeline_parent"
+        p:id="import">
         <property name="stages">
             <list>
-                <ref bean="importedMetadata"/>
+                <!-- fetch the input file -->
+                <ref bean="fetchImportMetadata"/>
+                <ref bean="populateItemIds"/>
+                
+                <!-- perform schema validation and stop immediately if this fails -->
+                <ref bean="checkSchemas"/>
+                <ref bean="errorTerminatingFilter"/>
+                
+                <!-- transform into a fragment using our local conventions -->
+                <bean id="importTransform" parent="xslt_parent"
+                    p:id="importTransform">
+                    <property name="xslResource">
+                        <bean parent="file_parent">
+                            <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/import.xsl"/>
+                        </bean>
+                    </property>
+                </bean>
+                
+                <!-- normalise namespaces in a specific way -->
+                <bean id="normalizeFragment" parent="xslt_parent"
+                    p:id="normalizeFragment">
+                    <property name="xslResource">
+                        <bean parent="file_parent">
+                            <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_fragment.xsl"/>
+                        </bean>
+                    </property>
+                </bean>
+                
+                <!-- check the transformed input -->
                 <ref bean="CHECK_std"/>
                 <ref bean="check_future"/>
                 <ref bean="check_imported"/>
                 <ref bean="check_vhosts"/>
                 <ref bean="errorTerminatingFilter"/>
+                
+                <!-- write output file -->
+                <ref bean="serializeImportedMetadata"/>
             </list>
         </property>
     </bean>