Commit 8cd20358 authored by cdanger's avatar cdanger

Merge branch 'release/5.4.0'

parents 77bcdfd4 269e7731
......@@ -2,6 +2,15 @@
All notable changes to this project are documented in this file following the [Keep a CHANGELOG](http://keepachangelog.com) conventions. This project adheres to [FIWARE Versioning](http://forge.fiware.org/plugins/mediawiki/wiki/fiware/index.php/Releases_and_Sprints_numbering).
## 5.4.0
### Changed
* Maven parent project version: 3.3.7 -> 4.1.1
* **Java version: 1.7 -> 1.8**
* authzforce-ce-atom-model: 3.3.7 -> 4.1.1
* authzforce-ce-xacml-model: 3.3.7 -> 4.1.1
* authzforce-ce-pdp-ext-model: 3.3.7 -> 4.1.1
## 5.3.1
### Fixed
- Some API operations missing JSON mediatype support
......
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wadl="http://wadl.dev.java.net/2009/02">
<!-- <xsl:output method="xml" encoding="UTF-8" indent="yes" saxon:indent-spaces="4" /> xmlns:saxon="http://saxon.sf.net/" -->
<xsl:output method="xml" encoding="UTF-8" indent="yes" />
<xsl:template match="wadl:representation[@mediaType='application/xml']">
<xsl:variable name="xmlElement" select="@element" />
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
<wadl:representation mediaType="application/fastinfoset">
<xsl:attribute name="element"><xsl:value-of select="$xmlElement" /></xsl:attribute>
</wadl:representation>
</xsl:template>
<!-- standard copy template -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
<!-- <xsl:output method="xml" encoding="UTF-8" indent="yes" saxon:indent-spaces="4" /> xmlns:saxon="http://saxon.sf.net/" -->
<xsl:output method="xml" encoding="UTF-8" indent="yes" />
<xsl:template match="wadl:representation[@mediaType='application/xml']">
<xsl:variable name="xmlElement" select="@element" />
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
<wadl:representation mediaType="application/fastinfoset">
<!-- If we specify an element again for 'application/json', CXF wadl2java plugin ignores the fact that it is the same and maps to generic java type 'javax.xml.transform.Source' -->
<!-- <xsl:attribute name="element"><xsl:value-of select="$xmlElement" /></xsl:attribute> -->
<!-- <xsl:attribute name="element"><xsl:value-of select="$xmlElement" /></xsl:attribute> -->
</wadl:representation>
</xsl:template>
<!-- standard copy template -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wadl="http://wadl.dev.java.net/2009/02">
<!-- <xsl:output method="xml" encoding="UTF-8" indent="yes" saxon:indent-spaces="4" /> xmlns:saxon="http://saxon.sf.net/" -->
<xsl:output method="xml" encoding="UTF-8" indent="yes" />
<xsl:template match="wadl:representation[@mediaType='application/xml']">
<xsl:variable name="xmlElement" select="@element" />
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
<wadl:representation mediaType="application/json">
<xsl:attribute name="element"><xsl:value-of select="$xmlElement" /></xsl:attribute>
</wadl:representation>
</xsl:template>
<!-- standard copy template -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
<!-- <xsl:output method="xml" encoding="UTF-8" indent="yes" saxon:indent-spaces="4" /> xmlns:saxon="http://saxon.sf.net/" -->
<xsl:output method="xml" encoding="UTF-8" indent="yes" />
<xsl:template match="wadl:representation[@mediaType='application/xml']">
<xsl:variable name="xmlElement" select="@element" />
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
<wadl:representation mediaType="application/json">
<!-- If we specify an element again for 'application/json', CXF wadl2java plugin ignores the fact that it is the same and maps to generic java type 'javax.xml.transform.Source' -->
<!-- <xsl:attribute name="element"><xsl:value-of select="$xmlElement" /></xsl:attribute> -->
</wadl:representation>
</xsl:template>
<!-- standard copy template -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
\ No newline at end of file
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2012-2016 Thales Services SAS.
Copyright (C) 2012-2017 Thales Services SAS.
This file is part of AuthZForce CE.
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2012-2016 Thales Services SAS.
Copyright (C) 2012-2017 Thales Services SAS.
This file is part of AuthZForce CE.
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2012-2016 Thales Services SAS.
Copyright (C) 2012-2017 Thales Services SAS.
This file is part of AuthZForce CE.
......
/**
* Copyright (C) 2012-2016 Thales Services SAS.
* Copyright (C) 2012-2017 Thales Services SAS.
*
* This file is part of AuthZForce CE.
*
......
<!--
Copyright (C) 2012-2016 Thales Services SAS.
Copyright (C) 2012-2017 Thales Services SAS.
This file is part of AuthZForce CE.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment