Skip to content

Commit

Permalink
Remove everything related to the legacy CMS.
Browse files Browse the repository at this point in the history
  • Loading branch information
@iay
iay committed Jul 31, 2016
1 parent 783ec24 commit 955a442
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 167 deletions.
29 changes: 2 additions & 27 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@

<!--
There are many separate processing "streams": production, test, export,
fallback, "wayf", "cdsall" and "cms".
fallback, "wayf", and "cdsall".
Each stream has its own unsigned file, as follows:
-->
Expand All @@ -168,10 +168,9 @@
<property name="mdaggr.back.unsigned" value="ukfederation-back-unsigned.xml"/>
<property name="mdaggr.wayf.unsigned" value="ukfederation-wayf-unsigned.xml"/>
<property name="mdaggr.cdsall.unsigned" value="ukfederation-cdsall-unsigned.xml"/>
<property name="mdaggr.cms.unsigned" value="cms-metadata.xml"/>

<!--
Each stream except the CMS stream has its own signed file.
Each stream also has its own signed file, as follows:
-->
<property name="mdaggr.prod.signed" value="ukfederation-metadata.xml"/>
<property name="mdaggr.test.signed" value="ukfederation-test.xml"/>
Expand Down Expand Up @@ -322,29 +321,6 @@
<echo>Verification completed.</echo>
</target>

<!--
*************************
*** ***
*** M E M B E R S ***
*** ***
*************************
-->

<!--
generate.members.cms
Produce a variant of the members.xml file suitable for
consumption by the legacy CMS.
-->
<target name="generate.members.cms">
<echo>Generating CMS version of members.xml</echo>
<XALAN
i="${members.dir}/members.xml"
o="${output.dir}/members-cms.xml"
x="${mdx.dir}/uk/members-cms.xsl"/>
<echo>Generated CMS version of members.xml</echo>
</target>

<!--
*************************************************
*** ***
Expand Down Expand Up @@ -415,7 +391,6 @@
<MDNORM i="${output.dir}/${mdaggr.prod.unsigned}"/>
<MDNORM i="${output.dir}/${mdaggr.wayf.unsigned}"/>
<MDNORM.noblank i="${output.dir}/${mdaggr.cdsall.unsigned}"/>
<MDNORM.noblank i="${output.dir}/${mdaggr.cms.unsigned}"/>
<MDNORM i="${output.dir}/${mdaggr.test.unsigned}"/>
<MDNORM i="${output.dir}/${mdaggr.export.unsigned}"/>
<MDNORM i="${output.dir}/${mdaggr.export.preview.unsigned}"/>
Expand Down
101 changes: 2 additions & 99 deletions mdx/uk/generate.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -798,100 +798,8 @@
</list>
</property>
</bean>

<!--
*************************************
*** ***
*** C M S A G G R E G A T E ***
*** ***
*************************************
-->

<!--
Produces an aggregate which is consumed by the helpdesk's
call management system. This will be well-formed XML
but will NOT be schema valid, as many required elements
are removed to give a smaller output file.
-->

<!--
CMSStripUnwanted
The CMS needs only a very restricted subset of
normal metadata in order to do its job. This stage
removes everything it does not need.
-->
<bean id="CMSStripUnwanted" parent="CompositeStage">
<property name="composedStages">
<list>
<ref bean="stripComments"/>

<ref bean="stripAlgNamespace"/>
<ref bean="stripIdpdiscNamespace"/>
<ref bean="stripInitNamespace"/>
<ref bean="stripMdattrNamespace"/>
<ref bean="stripWayfNamespace"/>

<ref bean="stripArtifactResolutionService"/>
<ref bean="stripAssertionConsumerService"/>
<ref bean="stripAttributeAuthorityDescriptor"/>
<ref bean="stripKeyDescriptor"/>
<ref bean="stripManageNameIDService"/>
<ref bean="stripNameIDFormat"/>
<ref bean="stripSingleLogoutService"/>
<ref bean="stripSingleSignOnService"/>

<ref bean="stripMDUIDiscoHints"/>

<ref bean="stripEntityScopes"/>

<!-- remove any now-empty Extensions elements -->
<ref bean="stripEmptyExtensions"/>
</list>
</property>
</bean>

<bean id="CMSFinalise" parent="finalise_parent">
<property name="transformParameters">
<map>
<entry key="extraText"
value="Call Management System metadata; not for end entity use"/>
<entry key="publisher" value-ref="uk_federation_uri"/>
</map>
</property>
</bean>

<bean id="serializeCMSAggregate" parent="SerializationStage">
<property name="outputFile">
<bean class="java.io.File">
<constructor-arg value="${output.dir}/cms-metadata.xml"/>
</bean>
</property>
</bean>

<bean id="CMSPipeline" parent="SimplePipeline">
<property name="stages">
<list>
<!-- make an aggregate first so that we're only traversing one item -->
<ref bean="uk_assemble"/>

<!-- remove many things that the CMS doesn't look at -->
<ref bean="CMSStripUnwanted"/>

<ref bean="CMSFinalise"/>

<!--
Normalise namespaces in the most general way. This will leave in a number
of unwanted namespace prefix declarations (e.g., xmlns:wayf) but that's
not really important for an aggregate we don't publish.
-->
<ref bean="normaliseNamespaces"/>

<ref bean="serializeCMSAggregate"/>
</list>
</property>
</bean>


<!--
*************************************
*** ***
Expand Down Expand Up @@ -922,8 +830,7 @@
-->

<!--
Fork new output pipelines for the registrar statistics and for
the CMS aggregate.
Fork a new output pipeline for the registrar statistics.
-->
<bean id="rawRegistrarDemux" parent="PipelineDemultiplexerStage">
<property name="pipelineAndSelectionStrategies">
Expand All @@ -932,10 +839,6 @@
<constructor-arg ref="uk_statisticsPipeline"/>
<constructor-arg ref="everythingSelector"/>
</bean>
<bean class="net.shibboleth.utilities.java.support.collection.Pair">
<constructor-arg ref="CMSPipeline"/>
<constructor-arg ref="everythingSelector"/>
</bean>
</list>
</property>
<property name="waitingForPipelines" value="true"/>
Expand Down
41 changes: 0 additions & 41 deletions mdx/uk/members-cms.xsl
View file

This file was deleted.

0 comments on commit 955a442

Please sign in to comment.