Commit bffeda83 authored by cdanger's avatar cdanger

Merge branch 'release/6.0.0'

parents cc1bcf74 bf787107
......@@ -2,6 +2,11 @@
All notable changes to this project are documented in this file following the [Keep a CHANGELOG](http://keepachangelog.com) conventions.
## 6.0.0
### Removed
- Removed timeToLiveSec, timeToIdleSec and memoryStoreEvictionPolicy attributes from the XML schema definition of PDP Decision cache (AbstractDecisionCache type), because we learnt that mainstream decision cache implementations do not support all these, e.g. Guava cache as of v20.0 does not support other memoryStoreEvictionPolicy than LRU. It is now up to DecisionCache implementations to add these attributes in their configuration schema if necessary.
## 5.1.0
### Changed
- License: GPL v3.0 replaced by Apache License v2.0
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>5.1.0</version>
<version>6.0.0</version>
</parent>
<artifactId>authzforce-ce-atom-model</artifactId>
<packaging>jar</packaging>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>5.1.0</version>
<version>6.0.0</version>
</parent>
<artifactId>authzforce-ce-pdp-ext-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
......
......@@ -50,31 +50,6 @@
<xs:extension base="tns:AbstractPdpExtension" />
</xs:complexContent>
</xs:complexType>
<xs:simpleType name="CacheMemoryStoreEvictionPolicy">
<xs:annotation>
<xs:documentation>
Policy to be enforced when reaching the maximum allowed number of cached
elements in memory.
</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
<xs:enumeration value="LRU">
<xs:annotation>
<xs:documentation>Least Recently Used</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="FIFO">
<xs:annotation>
<xs:documentation>First In First Out</xs:documentation>
</xs:annotation>
</xs:enumeration>
<xs:enumeration value="LFU">
<xs:annotation>
<xs:documentation>Less Frequently Used</xs:documentation>
</xs:annotation>
</xs:enumeration>
</xs:restriction>
</xs:simpleType>
<xs:complexType abstract="true" name="AbstractDecisionCache">
<xs:annotation>
<xs:documentation>
......@@ -86,35 +61,6 @@
</xs:annotation>
<xs:complexContent>
<xs:extension base="tns:AbstractPdpExtension">
<xs:attribute name="timeToLiveSec" use="required">
<xs:annotation>
<xs:documentation>The maximum number of seconds an element can exist in the cache regardless
of use. The element expires at this limit and will no longer be returned from the cache. The
default
value is 0, which means no timeToLive (TTL) eviction takes place (infinite lifetime).
</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:nonNegativeInteger">
<xs:maxInclusive value="1800" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="timeToIdleSec" use="required">
<xs:annotation>
<xs:documentation>The maximum number of seconds an element can exist in the cache without
being accessed. The element expires at this limit and will no longer be returned from the
cache. The
default value is 0, which means no timeToIdle (TTI) eviction takes place (infinite
lifetime).
</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:nonNegativeInteger">
<xs:maxInclusive value="1800" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute default="100" name="maxElementsInMemory" type="xs:nonNegativeInteger" use="optional">
<xs:annotation>
<xs:documentation>the maximum number of elements in memory, before they are evicted. Value
......@@ -122,14 +68,6 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute default="LRU" name="memoryStoreEvictionPolicy" type="tns:CacheMemoryStoreEvictionPolicy" use="optional">
<xs:annotation>
<xs:documentation>
Policy that will be enforced upon reaching the maxElementsInMemory limit.
Default policy is LRU.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
......
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>5.1.0</version>
<version>6.0.0</version>
<packaging>pom</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>Authzforce - Parent of all AuthzForce components</description>
......@@ -166,25 +166,25 @@
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-xmlns-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>5.1.0</version>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-atom-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>5.1.0</version>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-xacml-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>5.1.0</version>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${artifactId.prefix}-pdp-ext-model</artifactId>
<!-- Version updated automatically by maven jgitflow:release-start -->
<version>5.1.0</version>
<version>6.0.0</version>
</dependency>
<!-- /Common AuthZForce CE dependencies -->
</dependencies>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>5.1.0</version>
<version>6.0.0</version>
</parent>
<artifactId>authzforce-ce-xacml-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.ow2.authzforce</groupId>
<artifactId>authzforce-ce-parent</artifactId>
<version>5.1.0</version>
<version>6.0.0</version>
</parent>
<artifactId>authzforce-ce-xmlns-model</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
......
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