Reimplement scope injection logic using an MDA stage.

internet2 · Jul 13, 2016 · cb58919 · cb58919
1 parent 9eb7ff3
commit cb58919
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 105 deletions.
diff --git a/build.xml b/build.xml
@@ -498,9 +498,6 @@
                     <fileset dir="${tools.dir}/xalan/lib">
                         <include name="sdss-xalan-md-*.jar"/>
                     </fileset>
-                    <fileset dir="${tools.dir}/xalan/lib">
-                        <include name="ukf-members-*.jar"/>
-                    </fileset>
                 </classpath>
                 <syspropertyset>
                     <propertyset refid="mda.properties"/>

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
@@ -291,14 +291,9 @@
                 <!--
                     Inject scopes "pushed" to entities from the members.xml file.
                 -->
-                <bean id="scopes_inject" parent="XSLTransformationStage"
-                    p:XSLResource="classpath:uk/scopes_inject.xsl">
-                    <property name="transformParameters">
-                        <map>
-                            <entry key="members" value-ref="uk_members"/>
-                        </map>
-                    </property>
-                </bean>
+                <bean id="scopes_inject" parent="stage_parent"
+                    class="uk.org.ukfederation.mda.dom.saml.ScopeInjectionStage"
+                    p:members-ref="uk_members"/>
 
                 <ref bean="populateItemIds"/>
                 <ref bean="uk_populateIds"/>

diff --git a/mdx/uk/scopes_inject.xsl b/mdx/uk/scopes_inject.xsl
diff --git a/tools/ukf-mda/ukf-mda-0.9.2.jar b/tools/ukf-mda/ukf-mda-0.9.2.jar
diff --git a/tools/ukf-mda/ukf-mda-0.9.3.jar b/tools/ukf-mda/ukf-mda-0.9.3.jar
diff --git a/tools/ukf-mda/ukf-members-1.2.0.jar b/tools/ukf-mda/ukf-members-1.2.0.jar
diff --git a/tools/xalan/lib/ukf-members-1.1.0.jar b/tools/xalan/lib/ukf-members-1.1.0.jar