Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Convert most uses of FileSystemResource to use "classpath:" prefix re…
Browse files Browse the repository at this point in the history 
…source strings.
  • Loading branch information
@iay
iay committed Jan 9, 2016
1 parent 20c9b53 commit 9a9b95c
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 90 deletions.
10 changes: 3 additions & 7 deletions mdx/int_edugain/verbs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,9 @@
p:designatedEntities-ref="int_edugain_verify_blacklist"/>

<!-- flag up any remaining entities -->
<bean id="check_recovered" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/int_edugain/check_recovered.xsl"/>
</bean>
</property>
</bean>
<bean id="check_recovered" parent="XSLValidationStage"
p:XSLResource="classpath:int_edugain/check_recovered.xsl"/>

<ref bean="errorTerminatingFilter"/>
</list>
</property>
Expand Down
53 changes: 12 additions & 41 deletions mdx/uk/beans.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,8 @@
Checks specific to the UK registrar function.
-->
<bean id="check_ukreg" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_ukreg.xsl"/>
</bean>
</property>
<bean id="check_ukreg" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_ukreg.xsl">
<property name="transformParameters">
<map>
<entry key="members" value-ref="uk_members"/>
Expand All @@ -219,49 +215,29 @@
<!--
check_uk_keydesc_key
-->
<bean id="check_uk_keydesc_key" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_uk_keydesc_key.xsl"/>
</bean>
</property>
</bean>
<bean id="check_uk_keydesc_key" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_uk_keydesc_key.xsl"/>


<!--
check_uk_mdattr
-->
<bean id="check_uk_mdattr" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_uk_mdattr.xsl"/>
</bean>
</property>
</bean>
<bean id="check_uk_mdattr" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_uk_mdattr.xsl"/>


<!--
check_uk_mdrps
-->
<bean id="check_uk_mdrps" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_uk_mdrps.xsl"/>
</bean>
</property>
</bean>
<bean id="check_uk_mdrps" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_uk_mdrps.xsl"/>


<!--
check_uk_urlenc
-->
<bean id="check_uk_urlenc" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_uk_urlenc.xsl"/>
</bean>
</property>
</bean>
<bean id="check_uk_urlenc" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_uk_urlenc.xsl"/>


<!--
Expand Down Expand Up @@ -433,13 +409,8 @@
used in an XML document. This one is UK-specific, as it makes specific choices
in order to limit the number of prefixes used.
-->
<bean id="uk_normaliseNamespaces" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/ns_norm_uk.xsl"/>
</bean>
</property>
</bean>
<bean id="uk_normaliseNamespaces" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/ns_norm_uk.xsl"/>

<!--
*************************************************
Expand Down
45 changes: 10 additions & 35 deletions mdx/uk/generate.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,8 @@
<!--
check_fixup_keyuse
-->
<bean id="check_fixup_keyuse" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_fixup_keyuse.xsl"/>
</bean>
</property>
</bean>
<bean id="check_fixup_keyuse" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_fixup_keyuse.xsl"/>

<!--
checkPublishable
Expand Down Expand Up @@ -388,13 +383,8 @@
</property>
</bean>

<bean id="CDSNormaliseNamespaces" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/ns_norm_cds.xsl"/>
</bean>
</property>
</bean>
<bean id="CDSNormaliseNamespaces" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/ns_norm_cds.xsl"/>

<!--
*******************************************
Expand Down Expand Up @@ -473,13 +463,8 @@
</property>
</bean>

<bean id="uk_normaliseFallback" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/ns_norm_back.xsl"/>
</bean>
</property>
</bean>
<bean id="uk_normaliseFallback" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/ns_norm_back.xsl"/>

<bean id="serializeUnsignedFallbackAggregate" parent="SerializationStage">
<property name="outputFile">
Expand Down Expand Up @@ -532,13 +517,8 @@
</property>
</bean>

<bean id="uk_normaliseTest" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/ns_norm_test.xsl"/>
</bean>
</property>
</bean>
<bean id="uk_normaliseTest" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/ns_norm_test.xsl"/>

<bean id="serializeUnsignedTestAggregate" parent="SerializationStage">
<property name="outputFile">
Expand Down Expand Up @@ -588,13 +568,8 @@
</property>
</bean>

<bean id="uk_normaliseExport" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/ns_norm_export.xsl"/>
</bean>
</property>
</bean>
<bean id="uk_normaliseExport" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/ns_norm_export.xsl"/>

<bean id="uk_exportSelector" parent="XPathItemSelectionStrategy">
<constructor-arg value="/md:EntityDescriptor[not(md:Extensions/ukfedlabel:ExportOptOut)]"/>
Expand Down
9 changes: 2 additions & 7 deletions mdx/uk/verbs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,8 @@
p:XSLResource="classpath:uk/import.xsl"/>

<!-- normalise namespaces in a specific way -->
<bean id="normalizeFragment" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/ns_norm_fragment.xsl"/>
</bean>
</property>
</bean>
<bean id="normalizeFragment" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/ns_norm_fragment.xsl"/>

<!-- check the transformed input -->
<ref bean="checkSchemas"/>
Expand Down

0 comments on commit 9a9b95c

Please sign in to comment.