Rename incommon channel to us_incommon.

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>
+
 	<!--
 	    *************************************************
 	    ***                                           ***

mdx/incommon/beans.xml → 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>

mdx/incommon/import.xml → 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>