Give each channel's "beans" file the name "beans.xml".

InCommon · Jun 13, 2011 · 11957ea · 11957ea
1 parent cbec910
commit 11957ea
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 10 deletions.
diff --git a/mdx/aaf/aaf-import.xml b/mdx/aaf/aaf-import.xml
@@ -13,7 +13,7 @@
     <!--
         Import AAF-specific beans.
     -->
-    <import resource="aaf-beans.xml"/>
+    <import resource="beans.xml"/>
 
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>

diff --git a/mdx/aaf/aaf-beans.xml → mdx/aaf/beans.xml b/mdx/aaf/aaf-beans.xml → mdx/aaf/beans.xml
diff --git a/mdx/arnes/arnes-import.xml b/mdx/arnes/arnes-import.xml
@@ -13,7 +13,7 @@
     <!--
         Import ARNES-specific beans.
     -->
-    <import resource="arnes-beans.xml"/>
+    <import resource="beans.xml"/>
 
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>

diff --git a/mdx/arnes/arnes-beans.xml → mdx/arnes/beans.xml b/mdx/arnes/arnes-beans.xml → mdx/arnes/beans.xml
diff --git a/mdx/caf/caf-beans.xml → mdx/caf/beans.xml b/mdx/caf/caf-beans.xml → mdx/caf/beans.xml
diff --git a/mdx/caf/caf-import.xml b/mdx/caf/caf-import.xml
@@ -13,7 +13,7 @@
     <!--
         Import CAF-specific beans.
     -->
-    <import resource="caf-beans.xml"/>
+    <import resource="beans.xml"/>
 
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>

diff --git a/mdx/edugain/edugain-beans.xml → mdx/edugain/beans.xml b/mdx/edugain/edugain-beans.xml → mdx/edugain/beans.xml
diff --git a/mdx/edugain/edugain-import.xml b/mdx/edugain/edugain-import.xml
@@ -17,7 +17,7 @@
     <!--
         Import eduGAIN-specific beans.
     -->
-    <import resource="edugain-beans.xml"/>
+    <import resource="beans.xml"/>
 
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>

diff --git a/mdx/edugain/edugain-test-import.xml b/mdx/edugain/edugain-test-import.xml
@@ -17,7 +17,7 @@
     <!--
         Import eduGAIN-specific beans.
     -->
-    <import resource="edugain-beans.xml"/>
+    <import resource="beans.xml"/>
 
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>

diff --git a/mdx/edugate/edugate-beans.xml → mdx/edugate/beans.xml b/mdx/edugate/edugate-beans.xml → mdx/edugate/beans.xml
diff --git a/mdx/edugate/edugate-import.xml b/mdx/edugate/edugate-import.xml
@@ -13,7 +13,7 @@
     <!--
         Import Edugate-specific beans.
     -->
-    <import resource="edugate-beans.xml"/>
+    <import resource="beans.xml"/>
 
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>

diff --git a/mdx/incommon/incommon-beans.xml → mdx/incommon/beans.xml b/mdx/incommon/incommon-beans.xml → mdx/incommon/beans.xml
diff --git a/mdx/incommon/incommon-import.xml b/mdx/incommon/incommon-import.xml
@@ -13,7 +13,7 @@
     <!--
         Import InCommon-specific beans.
     -->
-    <import resource="incommon-beans.xml"/>
+    <import resource="beans.xml"/>
 
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>

diff --git a/mdx/swamid/swamid-beans.xml → mdx/swamid/beans.xml b/mdx/swamid/swamid-beans.xml → mdx/swamid/beans.xml
diff --git a/mdx/swamid/swamid-import.xml b/mdx/swamid/swamid-import.xml
@@ -13,7 +13,7 @@
     <!--
         Import SWAMID-specific beans.
     -->
-    <import resource="swamid-beans.xml"/>
+    <import resource="beans.xml"/>
 
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>

diff --git a/mdx/switch/switch-beans.xml → mdx/switch/beans.xml b/mdx/switch/switch-beans.xml → mdx/switch/beans.xml
diff --git a/mdx/switch/switch-import.xml b/mdx/switch/switch-import.xml
@@ -13,7 +13,7 @@
     <!--
         Import SWITCH-specific beans.
     -->
-    <import resource="switch-beans.xml"/>
+    <import resource="beans.xml"/>
 
     <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
         <property name="id" value="pipeline"/>

diff --git a/mdx/uk/uk-beans.xml → mdx/uk/beans.xml b/mdx/uk/uk-beans.xml → mdx/uk/beans.xml
diff --git a/mdx/uk/uk-collect.xml b/mdx/uk/uk-collect.xml
@@ -17,7 +17,7 @@
     <!--
         Import UK-specific beans.
     -->
-    <import resource="uk-beans.xml"/>
+    <import resource="beans.xml"/>
 
     <!--
         fetchUkFragmentFiles