Skip to content

Commit

Permalink
Add ability to block a set of entities from the fallback aggregate.
Browse files Browse the repository at this point in the history
See ukf/ukf-meta#195
  • Loading branch information
Alex Stuart committed Oct 15, 2019
1 parent dcd6955 commit d041e4f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@
External specialised directories.
-->
<property name="aggregates.dir" value="${shared.ws.dir}/${git.repo.project.products}/aggregates"/>
<property name="blocklists.dir" value="${shared.ws.dir}/${git.repo.project.data}/blocklists"/>
<property name="edugain.dir" value="${shared.ws.dir}/${git.repo.project.data}/edugain"/>
<property name="entities.dir" value="${shared.ws.dir}/${git.repo.project.data}/entities"/>
<property name="members.dir" value="${shared.ws.dir}/${git.repo.project.data}/members"/>
Expand Down Expand Up @@ -1569,6 +1570,7 @@
by properties defined in the external properties files, e.g., build.properties.
-->
<property name="mda.java.endorsed.dirs" value="${tools.dir}/endorsed"/>
<property name="mda.blocklists.dir" value="${blocklists.dir}"/>
<property name="mda.edugain.dir" value="${edugain.dir}"/>
<property name="mda.entities.dir" value="${entities.dir}"/>
<property name="mda.mdx.dir" value="${mdx.dir}"/>
Expand Down
8 changes: 8 additions & 0 deletions mdx/uk/generate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
-->
<import resource="classpath:int_edugain/beans.xml"/>

<!--
Import beans for blocklists.
-->
<import resource="file:${blocklists.dir}/fallback-blocklist.xml"/>

<!--
*****************************
Expand Down Expand Up @@ -520,6 +524,10 @@
<bean id="uk_fallbackPipeline" parent="mda.SimplePipeline">
<property name="stages">
<list>
<bean id="removeFallbackBlocklist" parent="mda.EntityFilterStage"
p:whitelistingEntities="false"
p:designatedEntities-ref="fallbackEntityBlocklist"/>

<!--
Enforce IdP display name uniqueness before assembling aggregate
-->
Expand Down

0 comments on commit d041e4f

Please sign in to comment.