Convert to new conventions for int_testshib channel.

InCommon · Jul 25, 2012 · 594d4a5 · 594d4a5
1 parent fe4994d
commit 594d4a5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/build.xml b/build.xml
@@ -879,6 +879,8 @@
         flow.importProduction.all
         
         Run the importProduction flow on each channel that has one.
+        
+        Exception: int_testshib, which is too large and anarchic to be worthwhile.
     -->
     <target name="flow.importProduction.all">
         <CHANNEL.do verb="importProduction" channel="be_belnet"/>

diff --git a/mdx/int_testshib/beans.xml b/mdx/int_testshib/beans.xml
@@ -11,6 +11,13 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
+    <!--
+        Location of various resources.
+    -->
+    <bean id="int_testshib_productionAggregate_url" class="java.lang.String">
+        <constructor-arg value="http://www.testshib.org/metadata/testshib-two-metadata.xml"/>
+    </bean>
+
     <!--
         Fetch the production aggregate.
     -->
@@ -19,19 +26,18 @@
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url" value="http://www.testshib.org/metadata/testshib-two-metadata.xml"/>
+                <constructor-arg name="url"    ref="int_testshib_productionAggregate_url"/>
             </bean>
         </property>
     </bean>
 
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch and process the production entities as a collection.
     -->
-    <bean id="int_testshib_exportedEntities" parent="composite_parent"
-        p:id="int_testshib_exportedEntities">
+    <bean id="int_testshib_productionEntities" parent="composite_parent"
+        p:id="int_testshib_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production one instead -->
                 <ref bean="int_testshib_productionAggregate"/>
 
                 <ref bean="disassemble"/>
@@ -41,4 +47,9 @@
         </property>
     </bean>
 
+    <!--
+        Select primary export aggregate.
+    -->
+    <alias alias="int_testshib_exportedAggregate" name="int_testshib_productionAggregate"/>
+    <alias alias="int_testshib_exportedEntities"  name="int_testshib_productionEntities"/>
 </beans>
diff --git a/mdx/int_testshib/verbs.xml b/mdx/int_testshib/verbs.xml
@@ -21,6 +21,9 @@
     -->
     <import resource="beans.xml"/>
 
+    <!--
+        Serialise into this channel's "imported" aggregate file.
+    -->
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">
         <property name="outputFile">
@@ -30,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="int_testshib_exportedEntities"/>
+                <ref bean="int_testshib_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="int_testshib_productionAggregate"/>
@@ -51,4 +54,6 @@
         </property>
     </bean>
 
+    <alias alias="import"    name="importProduction"/>
+    <alias alias="importRaw" name="importProductionRaw"/>
 </beans>