Bugzilla 994: Don't use relative URLs in Spring configuration files.

InCommon · Jun 6, 2013 · 8148054 · 8148054
1 parent ae4b58b
commit 8148054
Showing 40 changed files with 87 additions and 82 deletions.
diff --git a/build.xml b/build.xml
@@ -410,6 +410,10 @@
             <java classname="net.shibboleth.metadata.cli.SimpleCommandLine"
                 fork="true" failonerror="true" maxmemory="${java.max.memory}">
                 <classpath>
+                	<!-- Spring "classpath:" imports can be under the MDX directory --> 
+                	<pathelement path="${mdx.dir}"/>
+
+                	<!-- Include all APIs we may want to use. -->
                     <fileset dir="${tools.mda}/lib">
                         <include name="*.jar"/>
                     </fileset>
@@ -897,7 +901,6 @@
         <CHANNEL.import channel="ie_edugate"/>
 		<CHANNEL.do channel="ie_edugate" verb="importAll"/>
         <CHANNEL.import channel="int_edugain"/>
-		<CHANNEL.do channel="int_edugain" verb="testImport"/>
         <CHANNEL.import channel="jp_gakunin"/>
 		<CHANNEL.import channel="nl_surfconext"/>
 		<CHANNEL.import channel="nz_tuakiri"/>

diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:at_aconet/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/au_aaf/verbs.xml b/mdx/au_aaf/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:au_aaf/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/be_belnet/verbs.xml b/mdx/be_belnet/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:be_belnet/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/br_cafe/verbs.xml b/mdx/br_cafe/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:br_cafe/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/ca_caf/verbs.xml b/mdx/ca_caf/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:ca_caf/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/ch_switchaai/verbs.xml b/mdx/ch_switchaai/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:ch_switchaai/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
@@ -281,7 +281,7 @@
     <!--
         Import beans that perform individual validation checks.
     -->
-    <import resource="validation-beans.xml"/>
+    <import resource="classpath:validation-beans.xml"/>
 
     <!--
         identifierStrategy

diff --git a/mdx/conventions.md b/mdx/conventions.md
@@ -83,7 +83,7 @@ Thus, most channels would be expected to contain the following beans as part of
 * `channel_exportedAggregate`
 * `channel_exportedEntities`
 
-In older channels, these are explicit bean definitions.  In newer channels, the convention is to use the Spring <alias> feature to designate the existing aggregate-specific beans.
+In older channels, these are explicit bean definitions.  In newer channels, the convention is to use the Spring `<alias>` feature to designate the existing aggregate-specific beans.
 
 ## Common `beans.xml` channel beans
 
@@ -119,8 +119,10 @@ The verbs `import` and `importRaw` are intended to be a synonym for `importExpor
 ## `verbs.xml` and `<verb>.xml` conventions
 
 Verb definition files should import the channel's `beans.xml` file as well as
-the `common-beans.xml` file from the parent `/mdx/` directory through a relative
-path.
+the `common-beans.xml` file from the parent `/mdx/` directory.  Non-relative classpath references should be used, for example:
+
+    <import resource="classpath:se_swamid/beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
 Verb definition files should not import each other; any beans required to be
 shared between verb definition files should be moved into the channel's

diff --git a/mdx/cz_eduid/verbs.xml b/mdx/cz_eduid/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:cz_eduid/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/de_dfnaai/verbs.xml b/mdx/de_dfnaai/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:de_dfnaai/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/dk_wayf/verbs.xml b/mdx/dk_wayf/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:dk_wayf/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/es_sir/verbs.xml b/mdx/es_sir/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:es_sir/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/eu_clarin/verbs.xml b/mdx/eu_clarin/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:eu_clarin/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/fi_haka/verbs.xml b/mdx/fi_haka/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:fi_haka/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/fr_renater/verbs.xml b/mdx/fr_renater/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:fr_renater/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/gr_grnet/verbs.xml b/mdx/gr_grnet/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:gr_grnet/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/hr_eduhr/verbs.xml b/mdx/hr_eduhr/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:hr_eduhr/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/hu_eduid/verbs.xml b/mdx/hu_eduid/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:hu_eduid/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/ie_edugate/verbs.xml b/mdx/ie_edugate/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:ie_edugate/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/in_infed/verbs.xml b/mdx/in_infed/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:in_infed/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
@@ -15,8 +15,8 @@
     <!--
         Import eduGAIN participant beans for namespace stripping stages.
     -->
-    <import resource="../cz_eduid/beans.xml"/>
-    <import resource="../hu_eduid/beans.xml"/>
+    <import resource="classpath:cz_eduid/beans.xml"/>
+    <import resource="classpath:hu_eduid/beans.xml"/>
 
     <!--
         Fetch the eduGAIN test aggregate.

diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:int_edugain/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/int_testshib/verbs.xml b/mdx/int_testshib/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:int_testshib/beans.xml"/>
 
     <!--
         Serialise into this channel's "imported" aggregate file.

diff --git a/mdx/it_idem/verbs.xml b/mdx/it_idem/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:it_idem/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">

diff --git a/mdx/jp_gakunin/verbs.xml b/mdx/jp_gakunin/verbs.xml
@@ -15,12 +15,12 @@
     <!--
         Import commonly used beans.
     -->
-    <import resource="../common-beans.xml"/>
+    <import resource="classpath:common-beans.xml"/>
 
     <!--
         Import channel-specific beans.
     -->
-    <import resource="beans.xml"/>
+    <import resource="classpath:jp_gakunin/beans.xml"/>
 
     <bean id="serializeImported" parent="serialize_parent"
         p:id="serializeImported">