Filter wadl on security before normalizing.

Some security attrs can be lost when going to path format,
resulting in elements not being profiled that should be.

Change-Id: Ic92602a20239ff72c06e8e563445c7062161a6d8
This commit is contained in:
dcramer
2014-01-09 21:30:59 -06:00
parent 33cc28f8d2
commit 65166359b1

View File

@@ -605,22 +605,10 @@ setting failOnValidationError to no in your pom.
<p:load name="wadl">
<p:with-option name="href" select="$href"/>
</p:load>
<p:xslt name="normalize-wadl">
<p:input port="source">
<p:pipe port="result" step="wadl"/>
</p:input>
<p:input port="stylesheet">
<p:document href="classpath:///cloud/normalizeWadl/normalizeWadl.xsl"/>
</p:input>
<p:with-param name="checksum" select="$checksum"/>
<p:input port="parameters">
<p:pipe step="normalize-wadls-step" port="parameters"/>
</p:input>
</p:xslt>
<p:xslt>
<p:xslt name="filter-wadl">
<!-- Filter normalized wadl based on security attr -->
<p:input port="source">
<p:pipe port="result" step="normalize-wadl"/>
<p:pipe port="result" step="wadl"/>
</p:input>
<p:input port="stylesheet">
<p:inline>
@@ -642,6 +630,18 @@ setting failOnValidationError to no in your pom.
<p:pipe step="normalize-wadls-step" port="parameters"/>
</p:input>
</p:xslt>
<p:xslt name="normalize-wadl">
<p:input port="source">
<p:pipe port="result" step="filter-wadl"/>
</p:input>
<p:input port="stylesheet">
<p:document href="classpath:///cloud/normalizeWadl/normalizeWadl.xsl"/>
</p:input>
<p:with-param name="checksum" select="$checksum"/>
<p:input port="parameters">
<p:pipe step="normalize-wadls-step" port="parameters"/>
</p:input>
</p:xslt>
<p:store encoding="utf-8" indent="true" omit-xml-declaration="false">
<p:with-option name="href" select="$newhref"/>
</p:store>