Name changes: ClasspathResource/ClassPathResource and FilesystemResou…

…rce/FileSystemResource to assist with Spring resource migration.
internet2 · Mar 13, 2014 · 7283927 · 7283927
1 parent 93e4e80
commit 7283927
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 115 deletions.
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
@@ -26,6 +26,18 @@
     <bean id="String" abstract="true" class="java.lang.String"/>
     <bean id="QName" abstract="true" class="javax.xml.namespace.QName"/>
 
+    <!--
+        File system and class path Resource parent shorthand beans.
+        
+        These are currently defined as Shibboleth resources, but will become
+        Spring resources in Shibboleth MDA 0.9. The parent beans are named
+        after the Spring Resource classes to ease migration later.
+    -->
+    <bean id="ClassPathResource" abstract="true" parent="component_parent"
+        class="net.shibboleth.utilities.java.support.resource.ClasspathResource"/>
+    <bean id="FileSystemResource" abstract="true" parent="component_parent"
+        class="net.shibboleth.utilities.java.support.resource.FilesystemResource"/>
+
     <!--
         Shibboleth-defined Resource class parent bean.
         
@@ -43,22 +55,6 @@
     -->
     <bean id="component_parent" abstract="true" init-method="initialize"/>
 
-    <!--
-        ClasspathResource
-        
-        Parent for all classpath resource beans.
-    -->
-    <bean id="ClasspathResource" abstract="true" parent="component_parent"
-        class="net.shibboleth.utilities.java.support.resource.ClasspathResource"/>
-
-    <!--
-        FilesystemResource
-        
-        Parent for all file system resource beans.
-    -->
-    <bean id="FilesystemResource" abstract="true" parent="component_parent"
-        class="net.shibboleth.utilities.java.support.resource.FilesystemResource"/>
-
     <!--
         SimplePipeline
         
@@ -393,7 +389,7 @@
     <bean id="normaliseNamespaces" parent="XSLTransformationStage"
         p:id="normaliseNamespaces">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="ns_norm.xsl"/>
             </bean>
         </property>
@@ -673,7 +669,7 @@
     -->
     <bean id="default_regauth_parent" abstract="true" parent="XSLTransformationStage">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="default_regauth.xsl"/>
             </bean>
         </property>
@@ -702,7 +698,7 @@
     <bean id="stripAAMDUI" parent="XSLTransformationStage"
         p:id="stripAAMDUI">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="strip-aa-mdui.xsl"/>
             </bean>
         </property>
@@ -785,74 +781,74 @@
         A list of all schema documents that we make common use of in SAML metadata.
     -->
     <util:list id="schemaResources">
-        <bean parent="FilesystemResource" c:resourcePath="#{ systemProperties['basedir'] }/xml/incommon-metadata.xsd"/>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource" c:resourcePath="#{ systemProperties['basedir'] }/xml/incommon-metadata.xsd"/>
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/MetadataExchange.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/saml-metadata-rpi-v1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/saml-schema-assertion-2.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/saml-schema-metadata-2.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/shibboleth-metadata-1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-metadata-attr.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-request-initiation.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-holder-of-key-browser-sso.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-idp-discovery.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-metadata-algsupport-v1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/sstc-saml-metadata-ui-v1.0.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/uk-fed-label.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-addr.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-authorization.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-federation.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/ws-securitypolicy-1.2.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xenc-schema.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xenc-schema-11.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xml.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xmldsig-core-schema.xsd"/>
         </bean>
-        <bean parent="FilesystemResource">
+        <bean parent="FileSystemResource">
             <constructor-arg value="#{ systemProperties['basedir'] }/xml/xmldsig11-schema.xsd"/>
         </bean>
     </util:list>
@@ -877,7 +873,7 @@
     <bean id="stripComments" parent="XSLTransformationStage"
         p:id="stripComments">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="strip-comments.xsl"/>
             </bean>
         </property>
@@ -921,7 +917,7 @@
     <bean id="cleanImport" parent="XSLTransformationStage"
         p:id="cleanImport">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="clean-import.xsl"/>
             </bean>
         </property>

diff --git a/mdx/int_edugain/verbs.xml b/mdx/int_edugain/verbs.xml
@@ -116,7 +116,7 @@
                 <bean id="check_recovered" parent="XSLValidationStage"
                     p:id="check_recovered">
                     <property name="XSLResource">
-                        <bean parent="FilesystemResource">
+                        <bean parent="FileSystemResource">
                             <constructor-arg value="#{ systemProperties['basedir'] }/mdx/int_edugain/check_recovered.xsl"/>
                         </bean>
                     </property>

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
@@ -152,7 +152,7 @@
     <bean id="uk_processScopes" parent="XSLTransformationStage"
         p:id="uk_processScopes">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/scopes.xsl"/>
             </bean>
         </property>
@@ -169,7 +169,7 @@
         
         A Resource referencing the members.xml document.
     -->
-    <bean id="uk_membersResource" parent="FilesystemResource">
+    <bean id="uk_membersResource" parent="FileSystemResource">
         <constructor-arg value="#{ systemProperties['basedir'] }/xml/members.xml"/>
     </bean>
 
@@ -207,7 +207,7 @@
     <bean id="uk_fix_mailto" parent="XSLTransformationStage"
         p:id="uk_fix_mailto">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/fix_mailto.xsl"/>
             </bean>
         </property>
@@ -225,7 +225,7 @@
     <bean id="uk_hide_idps" parent="XSLTransformationStage"
         p:id="uk_hide_idps">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/hide_idps.xsl"/>
             </bean>
         </property>
@@ -240,7 +240,7 @@
     <bean id="check_ukreg" parent="XSLValidationStage"
         p:id="check_ukreg">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_ukreg.xsl"/>
             </bean>
         </property>
@@ -258,7 +258,7 @@
     <bean id="check_uk_expkeyname" parent="XSLValidationStage"
         p:id="check_uk_expkeyname">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_expkeyname.xsl"/>
             </bean>
         </property>
@@ -271,7 +271,7 @@
     <bean id="check_uk_keydesc_key" parent="XSLValidationStage"
         p:id="check_uk_keydesc_key">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_keydesc_key.xsl"/>
             </bean>
         </property>
@@ -284,7 +284,7 @@
     <bean id="check_uk_mdrps" parent="XSLValidationStage"
         p:id="check_uk_mdrps">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_mdrps.xsl"/>
             </bean>
         </property>
@@ -297,7 +297,7 @@
     <bean id="check_uk_urlenc" parent="XSLValidationStage"
         p:id="check_uk_urlenc">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/check_uk_urlenc.xsl"/>
             </bean>
         </property>
@@ -312,7 +312,7 @@
     <bean id="uk_trustRootsDocument" class="net.shibboleth.ext.spring.factory.DomDocumentFactoryBean">
         <property name="parserPool" ref="parserPool"/>
         <property name="documentResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/trust-roots.xml"/>
             </bean>
         </property>
@@ -327,7 +327,7 @@
     <bean id="uk_addTrustRoots" parent="XSLTransformationStage"
         p:id="uk_addTrustRoots">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/trust-roots.xsl"/>
             </bean>
         </property>
@@ -347,7 +347,7 @@
     <bean id="uk_processFragment" parent="XSLTransformationStage"
         p:id="uk_processFragment">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/fragment.xsl"/>
             </bean>
         </property>
@@ -479,7 +479,7 @@
     <bean id="uk_stripExtensions" parent="XSLTransformationStage"
         p:id="uk_stripExtensions">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/strip_extensions.xsl"/>
             </bean>
         </property>
@@ -504,7 +504,7 @@
     <bean id="uk_normaliseNamespaces" parent="XSLTransformationStage"
         p:id="uk_normaliseNamespaces">
         <property name="XSLResource">
-            <bean parent="FilesystemResource">
+            <bean parent="FileSystemResource">
                 <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/ns_norm_uk.xsl"/>
             </bean>
         </property>
@@ -579,7 +579,7 @@
     <bean id="uk_generateStatistics" parent="XSLTransformationStage"
         p:id="uk_generateStatistics">
         <property name="XSLResource">
-            <bean parent="ClasspathResource">
+            <bean parent="ClassPathResource">
                 <constructor-arg value="uk/statistics.xsl"/>
             </bean>
         </property>