Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Pull stripMdattrNamespace out of standardImportActions and include it… 
… explicitly at all points that standardImportActions currently appears.

No net behavioural change, but allows something different to happen in each location in the future.
@iay
iay committed Feb 22, 2013
1 parent 06c6677 commit 9430229
Showing 33 changed files with 200 additions and 17 deletions.
4 changes: 4 additions & 0 deletions mdx/at_aconet/beans.xml
View file
@@ -66,6 +66,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
4 changes: 4 additions & 0 deletions mdx/au_aaf/beans.xml
View file
@@ -66,6 +66,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/be_belnet/beans.xml
View file
@@ -88,6 +88,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -113,6 +117,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/br_cafe/beans.xml
View file
@@ -87,6 +87,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -112,6 +116,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
4 changes: 4 additions & 0 deletions mdx/ca_caf/beans.xml
View file
@@ -78,6 +78,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/ch_switchaai/beans.xml
View file
@@ -108,6 +108,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -133,6 +137,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
11 changes: 0 additions & 11 deletions mdx/common-beans.xml
View file
@@ -567,17 +567,6 @@
<ref bean="checkSchemas"/>
<ref bean="CHECK_imported"/>
<ref bean="errorAnnouncingFilter"/>

<!--
Strip the namespace used by the entity attribute namespace for now.
This needs to be replaced in the long run by per-channel handling that
lets through those attributes which we have verified that the source
validates in the same way we do, or those which we don't care about.
This namespace is stripped after the checks to allow for the
entity attributes to be checked before they are discarded.
-->
<ref bean="stripMdattrNamespace"/>
</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/cz_eduid/beans.xml
View file
@@ -107,6 +107,10 @@
<ref bean="cz_eduid_stripMetadataNamespace"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -134,6 +138,10 @@
<ref bean="cz_eduid_stripMetadataNamespace"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/de_dfnaai/beans.xml
View file
@@ -88,6 +88,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -113,6 +117,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
4 changes: 4 additions & 0 deletions mdx/dk_wayf/beans.xml
View file
@@ -73,6 +73,10 @@
<ref bean="dk_wayf_spMetadata"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/es_sir/beans.xml
View file
@@ -88,6 +88,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -117,6 +121,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
4 changes: 4 additions & 0 deletions mdx/eu_clarin/beans.xml
View file
@@ -49,6 +49,10 @@

<ref bean="disassemble"/>
<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/fi_haka/beans.xml
View file
@@ -108,6 +108,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -133,6 +137,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
4 changes: 4 additions & 0 deletions mdx/fr_renater/beans.xml
View file
@@ -79,6 +79,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/gr_grnet/beans.xml
View file
@@ -88,6 +88,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -113,6 +117,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
4 changes: 4 additions & 0 deletions mdx/hr_eduhr/beans.xml
View file
@@ -118,6 +118,10 @@
<ref bean="hr_eduhr_check_regauth"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/hu_eduid/beans.xml
View file
@@ -122,6 +122,10 @@

<ref bean="hu_eduid_check_regauth"/>
<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -150,6 +154,10 @@

<ref bean="hu_eduid_check_regauth"/>
<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/ie_edugate/beans.xml
View file
@@ -138,6 +138,10 @@

<ref bean="ie_edugate_check_regauth"/>
<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -165,6 +169,10 @@
<ref bean="ie_edugate_default_regauth"/>
<ref bean="ie_edugate_check_regauth"/>
<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
4 changes: 4 additions & 0 deletions mdx/in_infed/beans.xml
View file
@@ -55,6 +55,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/int_edugain/beans.xml
View file
@@ -95,6 +95,10 @@
<ref bean="hu_eduid_stripEntityAttributesNamespace"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -130,6 +134,10 @@
<ref bean="hu_eduid_stripEntityAttributesNamespace"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
4 changes: 4 additions & 0 deletions mdx/int_testshib/beans.xml
View file
@@ -43,6 +43,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
8 changes: 8 additions & 0 deletions mdx/it_idem/beans.xml
View file
@@ -88,6 +88,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
@@ -113,6 +117,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>
4 changes: 4 additions & 0 deletions mdx/jp_gakunin/beans.xml
View file
@@ -66,6 +66,10 @@
<ref bean="disassemble"/>

<ref bean="standardImportActions"/>

<!-- Strip all entity attributes from this source. -->
<ref bean="stripMdattrNamespace"/>

</list>
</property>
</bean>

0 comments on commit 9430229

Please sign in to comment.