From 7e1c2a882ba566cdb5781d504f298629e433e097 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 17 Jul 2012 09:50:58 +0000
Subject: [PATCH] Convert to new conventions for us_incommon channel.

---
 build.xml                 |  2 +-
 mdx/us_incommon/beans.xml | 22 +++++++++++++++++-----
 mdx/us_incommon/verbs.xml | 12 +++++++-----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index de0771dd..1ea9ed5a 100644
--- a/build.xml
+++ b/build.xml
@@ -873,7 +873,6 @@
 		<CHANNEL.import channel="nz_tuakiri"/>
         <CHANNEL.import channel="si_arnes"/>
         <CHANNEL.import channel="uk_eduserv"/>
-        <CHANNEL.import channel="us_incommon"/>
 	</target>
 	
     <!--
@@ -895,6 +894,7 @@
     	<CHANNEL.do verb="importProduction" channel="nl_surfnet"/>
     	<CHANNEL.do verb="importProduction" channel="no_feide"/>
     	<CHANNEL.do verb="importProduction" channel="se_swamid"/>
+        <CHANNEL.do verb="importProduction" channel="us_incommon"/>
     </target>
     
     <!--
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index da6aa7cf..983c4090 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -12,14 +12,21 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
     
     <!--
-        Fetch the InCommon production metadata aggregate.
+        Location of various resources.
+    -->
+    <bean id="us_incommon_productionAggregate_url" class="java.lang.String">
+        <constructor-arg value="http://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml"/>
+    </bean>
+    
+    <!--
+        Fetch the production aggregate.
     -->
     <bean id="us_incommon_productionAggregate" parent="domResourceStage_parent"
         p:id="us_incommon_productionAggregate">
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url" value="http://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml"/>
+                <constructor-arg name="url"    ref="us_incommon_productionAggregate_url"/>
             </bean>
         </property>
     </bean>
@@ -45,10 +52,10 @@
     </bean>
 
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch and process the production entities as a collection.
     -->
-    <bean id="us_incommon_exportedEntities" parent="composite_parent"
-        p:id="us_incommon_exportedEntities">
+    <bean id="us_incommon_productionEntities" parent="composite_parent"
+        p:id="us_incommon_productionEntities">
         <property name="composedStages">
             <list>
                 <!-- no export aggregate; use the production one instead -->
@@ -70,4 +77,9 @@
         </property>
     </bean>
     
+    <!--
+        Select primary export aggregate.
+    -->
+    <alias alias="us_incommon_exportedAggregate" name="us_incommon_productionAggregate"/>
+    <alias alias="us_incommon_exportedEntities"  name="us_incommon_productionEntities"/>
 </beans>
diff --git a/mdx/us_incommon/verbs.xml b/mdx/us_incommon/verbs.xml
index 5ec670e3..69e546e4 100644
--- a/mdx/us_incommon/verbs.xml
+++ b/mdx/us_incommon/verbs.xml
@@ -33,19 +33,19 @@
         </property>
     </bean>
     
-    <bean id="import" parent="pipeline_parent"
-        p:id="import">
+    <bean id="importProduction" parent="pipeline_parent"
+        p:id="importProduction">
         <property name="stages">
             <list>
-                <ref bean="us_incommon_exportedEntities"/>
+                <ref bean="us_incommon_productionEntities"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
-        p:id="importRaw">
+    <bean id="importProductionRaw" parent="pipeline_parent"
+        p:id="importProductionRaw">
         <property name="stages">
             <list>
                 <ref bean="us_incommon_productionAggregate"/>
@@ -54,4 +54,6 @@
         </property>
     </bean>
     
+    <alias alias="import"    name="importProduction"/>
+    <alias alias="importRaw" name="importProductionRaw"/>
 </beans>