From 9abee64baabcdbefb7e61f296c7cf94fc084b7fe Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 13 Jul 2011 14:19:56 +0000
Subject: [PATCH] Track latest aggregator snapshot.  Add statistics generation.

---
 mdx/uk/beans.xml                       |   4 +-
 mdx/uk/generate.xml                    |  52 +++++++++++++++++++++++--
 tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar | Bin 13570 -> 11676 bytes
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 990e2ef8..3f30a38d 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -44,8 +44,8 @@
     <bean id="uk_filterDeletedEntities" class="net.shibboleth.metadata.dom.XPathFilteringStage"
         init-method="initialize" lazy-init="true">
         <property name="id" value="uk_filterDeletedEntities"/>
-        <constructor-arg name="expression" value="//ukfedlabel:DeletedEntity"/>
-        <constructor-arg name="context" ref="commonNamespaces"/>
+        <property name="xpathExpression" value="//ukfedlabel:DeletedEntity"/>
+        <property name="namespaceContext" ref="commonNamespaces"/>
     </bean>
     
     
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 120ea61d..a224618c 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -327,6 +327,47 @@
         </property>
     </bean>
     
+    <!--
+        *********************************************
+        ***                                       ***
+        ***   S T A T I S T I C S   O U T P U T   ***
+        ***                                       ***
+        *********************************************
+    -->
+    
+    <bean id="serializeStatistics" class="net.shibboleth.metadata.pipeline.SerializationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="serializeStatistics"/>
+        <property name="serializer" ref="serializer"/>
+        <property name="outputFile">
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ukfederation-stats.html"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <bean id="uk_generateStatistics" class="net.shibboleth.metadata.dom.XSLTransformationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="uk_generateStatistics"/>
+        <property name="xslResource">
+            <bean class="org.opensaml.util.resource.FilesystemResource">
+                <constructor-arg value="#{ systemProperties['basedir'] }/build/statistics.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <bean id="uk_statisticsPipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="uk_statisticsPipeline"/>
+        <property name="stages">
+            <list>
+                <ref bean="assemble"/>
+                <ref bean="uk_generateStatistics"/>
+                <ref bean="serializeStatistics"/>
+            </list>
+        </property>
+    </bean>
+    
     <!--
         *************************************
         ***                               ***
@@ -346,7 +387,8 @@
                 <ref bean="uk_registeredEntities"/>
                 
                 <!--
-                    Fork into a new pipeline for the export aggregate.
+                    Fork into new pipelines for the export aggregate and for
+                    the registrar statistics.
                     
                     The export aggregate only includes UK-registered entities,
                     so the fork needs to occur before any others are introduced.
@@ -355,15 +397,19 @@
                     metadata as closely as possible, so the fork must happen before
                     too many UK-specific transformations are performed.
                 -->
-                <bean id="exportDemux" class="net.shibboleth.metadata.pipeline.PipelineDemultiplexerStage"
+                <bean id="registrarDemux" class="net.shibboleth.metadata.pipeline.PipelineDemultiplexerStage"
                     init-method="initialize" lazy-init="true">
-                    <property name="id" value="exportDemux"/>
+                    <property name="id" value="registrarDemux"/>
                     <property name="pipelineAndSelectionStrategies">
                         <list>
                             <bean class="org.opensaml.util.Pair">
                                 <constructor-arg ref="uk_exportPipeline"/>
                                 <constructor-arg ref="uk_exportSelector"/>
                             </bean>
+                            <bean class="org.opensaml.util.Pair">
+                                <constructor-arg ref="uk_statisticsPipeline"/>
+                                <constructor-arg ref="everythingSelector"/>
+                            </bean>
                         </list>
                     </property>
                     <property name="waitingForPipelines" value="true"/>
diff --git a/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar b/tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar
index e5d2c3c42b3dad7292b92cdd4765f1119ea2fd6e..e3b0621e53d822ee85a33686fdc8892749edfcfd 100644
GIT binary patch
delta 265
zcmZq5niI_%;LXg!#Q*}2UEWUQRbhVQ@^+&MH>2PT$G3K1aVQ}%xlvhqb2g(g-{$FJ
ziv^g0$|u{ZYk}!3bvqEfd9`{f8(2VC&je)9WG}tv%s_)So9JI+oIG7jV6vE@+T{IW
zQj@<K2uwa~D8;l?aB`rL(d0i8B48m?BPpieqClY}CT=Mpr8N1vkt0*A43H@^d7d)I
zWIJOXum!%x(oE_Kle3Iv!Q3t&H$-7_po!|_Gf)+`fkIP3Lb{VxO|+QqftYbjMrxBc
UnmF@`Fo-a8voSFIRs;DC0RJylrT_o{

delta 2159
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
YFiAPAqww~B0R)oWo-^Adg#4NP2eDDskpKVy