From 0fadf2046873b3d408ebc0dae7bc053c554e456a Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 20 Jul 2011 11:48:42 +0000
Subject: [PATCH] Switch test and export aggregate output locations to the
 production /xml/ directory. Comment out the generation of production, wayf
 and fallback aggregates for now.

---
 mdx/uk/generate.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index d476b12a..0477cb1f 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -268,7 +268,7 @@
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ukfederation-test-unsigned.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-test-unsigned.xml"/>
             </bean>
         </property>
     </bean>
@@ -308,7 +308,7 @@
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ukfederation-export-unsigned.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/xml/ukfederation-export-unsigned.xml"/>
             </bean>
         </property>
     </bean>
@@ -392,6 +392,7 @@
                 <!--
                     Fork into new pipelines for the production, fallback and WAYF aggregates.
                 -->
+                <!--
                 <bean id="otherDemux" class="net.shibboleth.metadata.pipeline.PipelineDemultiplexerStage"
                     init-method="initialize" lazy-init="true">
                     <property name="id" value="otherDemux"/>
@@ -413,6 +414,7 @@
                     </property>
                     <property name="waitingForPipelines" value="true"/>
                 </bean>
+                -->
                 
                 <!--
                     Merge in entities from other metadata sources.