From 113ec297f1516fb0269da84e2f54d423108be3b5 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 22 Jun 2011 10:49:01 +0000
Subject: [PATCH] Rename incommon channel to us_incommon.

---
 build.xml                                  |  8 ++++----
 mdx/{incommon => us_incommon}/beans.xml    |  4 ++--
 mdx/{incommon => us_incommon}/import.xml   | 16 ++++++++--------
 mdx/{incommon => us_incommon}/incommon.pem |  0
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename mdx/{incommon => us_incommon}/beans.xml (95%)
 rename mdx/{incommon => us_incommon}/import.xml (73%)
 rename mdx/{incommon => us_incommon}/incommon.pem (100%)

diff --git a/build.xml b/build.xml
index 15930fab..b32b9fb7 100644
--- a/build.xml
+++ b/build.xml
@@ -1117,10 +1117,6 @@
         <CHANNEL.import channel="ie_edugate"/>
     </target>
     
-    <target name="flow.incommon.import">
-        <CHANNEL.import channel="incommon"/>
-    </target>
-    
     <target name="flow.edugain.import">
         <CHANNEL.import channel="edugain"/>
     </target>
@@ -1145,6 +1141,10 @@
         <CHANNEL.import channel="uk_eduserv"/>
     </target>
     
+    <target name="flow.us_incommon.import">
+        <CHANNEL.import channel="us_incommon"/>
+    </target>
+    
 	<!--
 	    *************************************************
 	    ***                                           ***
diff --git a/mdx/incommon/beans.xml b/mdx/us_incommon/beans.xml
similarity index 95%
rename from mdx/incommon/beans.xml
rename to mdx/us_incommon/beans.xml
index 8444de1c..ffc1a64a 100644
--- a/mdx/incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Common beans for InCommon operations.
+    Common beans for this channel.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
@@ -21,7 +21,7 @@
     <bean id="inCommonSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/incommon/incommon.pem"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/us_incommon/incommon.pem"/>
             </bean>
         </property>
     </bean>
diff --git a/mdx/incommon/import.xml b/mdx/us_incommon/import.xml
similarity index 73%
rename from mdx/incommon/import.xml
rename to mdx/us_incommon/import.xml
index ea328bde..c36e713e 100644
--- a/mdx/incommon/import.xml
+++ b/mdx/us_incommon/import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Import pipeline for metadata from InCommon.
+    Import pipeline for this channel.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> 
@@ -11,24 +11,24 @@
     <import resource="../common-beans.xml"/>
         
     <!--
-        Import InCommon-specific beans.
+        Import channel-specific beans.
     -->
     <import resource="beans.xml"/>
     
-    <bean id="incommon_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="us_incommon_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="incommon_serializeImported"/>
+        <property name="id" value="us_incommon_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/incommon/imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/us_incommon/imported.xml"/>
             </bean>
         </property>
     </bean>
     
-    <bean id="incommon_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="us_incommon_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="incommon_import"/>
+        <property name="id" value="us_incommon_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchInCommonExportAggregate"/>
@@ -43,7 +43,7 @@
                 
                 <ref bean="standardImportTail"/>
                 
-                <ref bean="incommon_serializeImported"/>
+                <ref bean="us_incommon_serializeImported"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/incommon/incommon.pem b/mdx/us_incommon/incommon.pem
similarity index 100%
rename from mdx/incommon/incommon.pem
rename to mdx/us_incommon/incommon.pem