Skip to content

Commit

Permalink
Move active eduGAIN configuration out to ukf-data
Browse files Browse the repository at this point in the history
Resolves #37.
  • Loading branch information
iay committed Oct 31, 2016
1 parent 1db7b7a commit e56ea32
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
External specialised directories.
-->
<property name="aggregates.dir" value="${shared.ws.dir}/${git.repo.project.products}/aggregates"/>
<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"/>
<property name="output.dir" value="${shared.ws.dir}/build"/>
Expand Down Expand Up @@ -1399,6 +1400,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.edugain.dir" value="${edugain.dir}"/>
<property name="mda.entities.dir" value="${entities.dir}"/>
<property name="mda.mdx.dir" value="${mdx.dir}"/>
<property name="mda.members.dir" value="${members.dir}"/>
Expand Down
3 changes: 2 additions & 1 deletion mdx/int_edugain/beans.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<!--
Import additional channel-local beans.
-->
<import resource="classpath:int_edugain/entity-blacklist.xml"/>
<import resource="file:${edugain.dir}/entity-blacklist.xml"/>
<import resource="file:${edugain.dir}/verify-blacklist.xml"/>

<!--
Location of various resources.
Expand Down
1 change: 0 additions & 1 deletion mdx/int_edugain/verbs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
Import channel-specific beans.
-->
<import resource="classpath:int_edugain/beans.xml"/>
<import resource="classpath:int_edugain/verify-blacklist.xml"/>

<bean id="serializeImported" parent="SerializationStage">
<property name="outputFile">
Expand Down

0 comments on commit e56ea32

Please sign in to comment.