Change channel names and all bean names so that they are acceptable S…

…pEL identifiers. This means changing '.' and '-' characters into '_' characters throughout.
InCommon · Jun 21, 2011 · 2c6c782 · 2c6c782
1 parent 7f96a1f
commit 2c6c782
Show file tree

Hide file tree

Showing 22 changed files with 164 additions and 159 deletions.
diff --git a/build.xml b/build.xml
@@ -1050,14 +1050,19 @@
 	<!--
 	    Aggregator based work is divided into channels, each of
 	    which lives in a directory under /mdx/.  Channels are
-	    mostly named country-source, but there are exceptions
+	    mostly named country_source, but there are exceptions
 	    to this rule.  Some of the exceptions may be rationalised
 	    in the future.
 	    
 	    Each channel can have a number of verbs which can be
 	    executed.  The convention is that the verb names a
 	    configuration file, and that the pipeline to execute
-	    is named as channel.pipeline.
+	    is named as channel_pipeline.
+	    
+	    Note that these conventions, which derive from identifier
+	    names in the Spring Expression Language, in combination
+	    mean that pipelines may be named in the form
+	    country_source_pipeline.
 	-->
 
 	<!--
@@ -1071,7 +1076,7 @@
         <sequential>
             <echo>Running @{channel} @{verb} flow.</echo>
             <MDA config="${mdx.dir}/@{channel}/@{verb}.xml"
-                pipeline="@{channel}.@{verb}"/>
+                pipeline="@{channel}_@{verb}"/>
             <echo>Completed @{channel} @{verb} flow.</echo>
         </sequential>
     </macrodef>
@@ -1108,12 +1113,12 @@
         <CHANNEL.import channel="caf"/>
     </target>
 
-	<target name="flow.cz-eduid.import">
-		<CHANNEL.import channel="cz-eduid"/>
+	<target name="flow.cz_eduid.import">
+		<CHANNEL.import channel="cz_eduid"/>
 	</target>
 
-	<target name="flow.ie-edugate.import">
-        <CHANNEL.import channel="ie-edugate"/>
+	<target name="flow.ie_edugate.import">
+        <CHANNEL.import channel="ie_edugate"/>
     </target>
 
     <target name="flow.incommon.import">
@@ -1125,7 +1130,7 @@
     </target>
 
     <target name="flow.edugain.test.import">
-    	<CHANNEL.do channel="edugain" verb="test-import"/>
+    	<CHANNEL.do channel="edugain" verb="testImport"/>
     </target>
 
 	<target name="flow.swamid.import">
@@ -1136,8 +1141,8 @@
         <CHANNEL.import channel="switch"/>
     </target>
 
-    <target name="flow.uk-eduserv.import">
-        <CHANNEL.import channel="uk-eduserv"/>
+    <target name="flow.uk_eduserv.import">
+        <CHANNEL.import channel="uk_eduserv"/>
     </target>
 
 	<!--

diff --git a/mdx/aaf/import.xml b/mdx/aaf/import.xml
@@ -15,9 +15,9 @@
     -->
     <import resource="beans.xml"/>
 
-    <bean id="aaf.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="aaf_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="aaf.serializeImported"/>
+        <property name="id" value="aaf_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -26,9 +26,9 @@
         </property>
     </bean>
 
-    <bean id="aaf.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="aaf_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="aaf_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchAafExportAggregate"/>
@@ -43,7 +43,7 @@
 
                 <ref bean="standardImportTail"/>
 
-                <ref bean="aaf.serializeImported"/>
+                <ref bean="aaf_serializeImported"/>
             </list>
         </property>
     </bean>

diff --git a/mdx/arnes/import.xml b/mdx/arnes/import.xml
@@ -15,9 +15,9 @@
     -->
     <import resource="beans.xml"/>
 
-    <bean id="arnes.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="arnes_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="arnes.serializeImported"/>
+        <property name="id" value="arnes_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -26,9 +26,9 @@
         </property>
     </bean>
 
-    <bean id="arnes.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="arnes_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="arnes_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchArnesExportAggregate"/>
@@ -43,7 +43,7 @@
 
                 <ref bean="standardImportTail"/>
 
-                <ref bean="arnes.serializeImported"/>
+                <ref bean="arnes_serializeImported"/>
             </list>
         </property>
     </bean>

diff --git a/mdx/caf/import.xml b/mdx/caf/import.xml
@@ -15,9 +15,9 @@
     -->
     <import resource="beans.xml"/>
 
-    <bean id="caf.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="caf_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="caf.serializeImported"/>
+        <property name="id" value="caf_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -26,9 +26,9 @@
         </property>
     </bean>
 
-    <bean id="caf.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="caf_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="caf_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchCafExportAggregate"/>
@@ -43,7 +43,7 @@
 
                 <ref bean="standardImportTail"/>
 
-                <ref bean="caf.serializeImported"/>
+                <ref bean="caf_serializeImported"/>
             </list>
         </property>
     </bean>

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
@@ -184,7 +184,7 @@
                 <ref bean="populateItemIds"/>
                 <ref bean="cleanImport"/>
                 <ref bean="checkSchemas"/>
-                <ref bean="CHECK.imported"/>
+                <ref bean="CHECK_imported"/>
                 <ref bean="errorAnnouncingFilter"/>
             </list>
         </property>

diff --git a/mdx/cz-eduid/beans.xml → mdx/cz_eduid/beans.xml b/mdx/cz-eduid/beans.xml → mdx/cz_eduid/beans.xml
@@ -20,44 +20,44 @@
         
         For the moment, use the production aggregate in lieu of a designated export aggregate.
     -->
-    <bean id="cz-eduid.fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="cz_eduid_fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="cz-eduid.fetchExportAggregate"/>
+        <property name="id" value="cz_eduid_fetchExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="https://metadata.eduid.cz/entities/eduid"/>        
     </bean>
 
     <!--
         Metadata signing certificate.
     -->
-    <bean id="cz-eduid.signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+    <bean id="cz_eduid_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
         lazy-init="true">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cz-eduid/metadata.eduid.cz.crt.pem"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cz_eduid/metadata.eduid.cz.crt.pem"/>
             </bean>
         </property>
     </bean>
 
     <!--
         Check the signature on a document.
     -->
-    <bean id="cz-eduid.checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+    <bean id="cz_eduid_checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="cz-eduid.checkSignature"/>
-        <property name="verificationCertificate" ref="cz-eduid.signingCertificate"/>
+        <property name="id" value="cz_eduid_checkSignature"/>
+        <property name="verificationCertificate" ref="cz_eduid_signingCertificate"/>
     </bean>
 
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="cz-eduid.exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+    <bean id="cz_eduid_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="cz-eduid.exportedEntities"/>
+        <property name="id" value="cz_eduid_exportedEntities"/>
         <property name="composedStages">
             <list>
-                <ref bean="cz-eduid.fetchExportAggregate"/>
-                <ref bean="cz-eduid.checkSignature"/>
+                <ref bean="cz_eduid_fetchExportAggregate"/>
+                <ref bean="cz_eduid_checkSignature"/>
 
                 <!-- failure to validate signature is fatal -->
                 <ref bean="errorTerminatingFilter"/>

diff --git a/mdx/cz-eduid/import.xml → mdx/cz_eduid/import.xml b/mdx/cz-eduid/import.xml → mdx/cz_eduid/import.xml
@@ -15,25 +15,25 @@
     -->
     <import resource="beans.xml"/>
 
-    <bean id="cz-eduid.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="cz_eduid_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="cz-eduid.serializeImported"/>
+        <property name="id" value="cz_eduid_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cz-eduid/imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cz_eduid/imported.xml"/>
             </bean>
         </property>
     </bean>
 
-    <bean id="cz-eduid.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="cz_eduid_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="cz_eduid_import"/>
         <property name="stages">
             <list>                
-                <ref bean="cz-eduid.exportedEntities"/>
+                <ref bean="cz_eduid_exportedEntities"/>
                 <ref bean="standardImportTail"/>
-                <ref bean="cz-eduid.serializeImported"/>
+                <ref bean="cz_eduid_serializeImported"/>
             </list>
         </property>
     </bean>

diff --git a/mdx/cz-eduid/metadata.eduid.cz.crt.pem → mdx/cz_eduid/metadata.eduid.cz.crt.pem b/mdx/cz-eduid/metadata.eduid.cz.crt.pem → mdx/cz_eduid/metadata.eduid.cz.crt.pem
diff --git a/mdx/edugain/import.xml b/mdx/edugain/import.xml
@@ -19,9 +19,9 @@
     -->
     <import resource="beans.xml"/>
 
-    <bean id="edugain.serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="edugain_serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="edugain.serializeImported"/>
+        <property name="id" value="edugain_serializeImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
@@ -30,9 +30,9 @@
         </property>
     </bean>
 
-    <bean id="edugain.import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="edugain_import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="edugain_import"/>
         <property name="stages">
             <list>
                 <ref bean="fetchEduGainAggregate"/>
@@ -47,7 +47,7 @@
 
                 <ref bean="standardImportTail"/>
 
-                <ref bean="edugain.serializeImported"/>
+                <ref bean="edugain_serializeImported"/>
             </list>
         </property>
     </bean>

diff --git a/mdx/edugain/test-import.xml → mdx/edugain/testImport.xml b/mdx/edugain/test-import.xml → mdx/edugain/testImport.xml
@@ -19,20 +19,20 @@
     -->
     <import resource="beans.xml"/>
 
-    <bean id="edugain.serializeTestImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+    <bean id="edugain_serializeTestImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="edugain.serializeTestImported"/>
+        <property name="id" value="edugain_serializeTestImported"/>
         <property name="serializer" ref="serializer"/>
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/edugain/test-imported.xml"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/edugain/testImported.xml"/>
             </bean>
         </property>
     </bean>
 
-    <bean id="edugain.test-import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+    <bean id="edugain_testImport" class="net.shibboleth.metadata.pipeline.SimplePipeline"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="pipeline"/>
+        <property name="id" value="edugain_testImport"/>
         <property name="stages">
             <list>
                 <ref bean="fetchEduGainTestAggregate"/>
@@ -47,7 +47,7 @@
 
                 <ref bean="standardImportTail"/>
 
-                <ref bean="edugain.serializeTestImported"/>
+                <ref bean="edugain_serializeTestImported"/>
             </list>
         </property>
     </bean>

diff --git a/mdx/ie-edugate/beans.xml → mdx/ie_edugate/beans.xml b/mdx/ie-edugate/beans.xml → mdx/ie_edugate/beans.xml
@@ -10,43 +10,43 @@
         
         For the moment, use the production aggregate in lieu of a designated export aggregate.
     -->
-    <bean id="ie-edugate.fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+    <bean id="ie_edugate_fetchExportAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="ie-edugate.fetchExportAggregate"/>
+        <property name="id" value="ie_edugate_fetchExportAggregate"/>
         <property name="parserPool" ref="parserPool"/>
         <property name="sourceUrl" value="https://edugate.heanet.ie/edugate-metadata-signed.xml"/>        
     </bean>
 
     <!--
         Metadata signing certificate.
     -->
-    <bean id="ie-edugate.signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+    <bean id="ie_edugate_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ie-edugate/metadata-signer.crt"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ie_edugate/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
 
     <!--
         Check the signature on a document.
     -->
-    <bean id="ie-edugate.checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+    <bean id="ie_edugate_checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="ie-edugate.checkSignature"/>
-        <property name="verificationCertificate" ref="ie-edugate.signingCertificate"/>
+        <property name="id" value="ie_edugate_checkSignature"/>
+        <property name="verificationCertificate" ref="ie_edugate_signingCertificate"/>
     </bean>
 
     <!--
         Fetch and process the exported entities as a collection.
     -->
-    <bean id="ie-edugate.exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+    <bean id="ie_edugate_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
         init-method="initialize" lazy-init="true">
-        <property name="id" value="ie-edugate.exportedEntities"/>
+        <property name="id" value="ie_edugate_exportedEntities"/>
         <property name="composedStages">
             <list>
-                <ref bean="ie-edugate.fetchExportAggregate"/>
-                <ref bean="ie-edugate.checkSignature"/>
+                <ref bean="ie_edugate_fetchExportAggregate"/>
+                <ref bean="ie_edugate_checkSignature"/>
 
                 <!-- failure to validate signature is fatal -->
                 <ref bean="errorTerminatingFilter"/>