Merge branch 'release/7.0.0'

.gitignore

@@ -3,3 +3,4 @@
 /.settings/
 /.README.md.html
 /.CHANGELOG.md.html
+/.pmd

CHANGELOG.md

@@ -4,6 +4,30 @@ All notable changes to this project are documented in this file following the [K
 Issues reported on [GitHub](https://github.com/authzforce/server/issues) are referenced in the form of `[GH-N]`, where N is the issue number. Issues reported on [OW2](https://jira.ow2.org/browse/AUTHZFORCE/) are mentioned in the form of `[OW2-N]`, where N is the issue number.
 
 
+## 7.0.0
+### Changed
+- Version of AuthzForce dependencies:
+	- Parent project (authzforce-ce-parent): 5.0.0
+	- authzforce-ce-pap-dao-flat-file: 8.0.0
+	- authzforce-ce-core-pap-api: 6.3.0
+	- authzforce-ce-core: 7.1.0
+	- authzforce-ce-core-pdp-api: 9.0.0 
+		-> API changes (non-backward compatible) for PDP extensions:  DecisionCache, DecisionResultFilter
+		
+- Versions of third-party dependencies:
+	- SLF4J: 1.7.22
+	- Spring: 4.3.6
+	- Guava: 21.0
+	- CXF: 3.1.10
+	- Logback-classic: 1.1.9
+
+### Added
+- Class [RESTfulPdpBasedAuthzInterceptor](webapp/src/test/java/org/ow2/authzforce/web/test/pep/cxf/RESTfulPdpBasedAuthzInterceptor): an example of PEP using PDP's REST API in the form of a CXF interceptor. More info on the test scenario in the associated test class [RESTfulPdpBasedAuthzInterceptorTest](webapp/src/test/java/org/ow2/authzforce/web/test/pep/cxf/RESTfulPdpBasedAuthzInterceptorTest).
+
+### Fixed
+- [OW2-25] NullPointerException when parsing Apply expressions using invalid/unsupported Function ID. This is the final fix addressing higher-order functions. Initial fix in v7.0.0 only addressed first-order ones.
+
+
 ## 6.0.0
 ### Added
 - [GH-8] JSON support on the REST API using [*mapped* convention](http://cxf.apache.org/docs/json-support.html) with configurable namespace-to-JSON-prefix mappings (new configuration file `xmlns-to-json-key-prefix-map.properties`)

README.md

@@ -55,15 +55,25 @@ AuthzForce provides XACML PIP features in the form of *Attribute Providers*. Mor
 * Optional policy version rolling (when the maximum of versions per policy has been reached, oldest versions are automatically removed to make place).
 
 ### REST API
-* Defined in standard [Web Application Description Language and XML schema](https://github.com/authzforce/rest-api-model/tree/develop/src/main/resources) so that you can automatically generate client code. 
-* Provides access to all PAP/PDP features mentioned in previous sections.
+* Provides access to all PAP/PDP features mentioned in previous sections with possibility to have PDP-only instances (i.e. without PAP features).
 * Multi-tenant: allows to have multiple domains/tenants, each with its own PAP/PDP, in particular its own policy repository.
 * Conformance with [REST Profile of XACML v3.0 Version 1.0](http://docs.oasis-open.org/xacml/xacml-rest/v1.0/xacml-rest-v1.0.html) 
-* [Fast Infoset](http://www.itu.int/en/ITU-T/asn1/Pages/Fast-Infoset.aspx) support for requests/responses.
+* Supported data formats: JSON, XML, [Fast Infoset](http://www.itu.int/en/ITU-T/asn1/Pages/Fast-Infoset.aspx).
+* Defined in standard [Web Application Description Language and XML schema](https://github.com/authzforce/rest-api-model/tree/develop/src/main/resources) so that you can automatically generate client code. 
 
 ### High availability and load-balancing
 * Integration with file synchronization tools (e.g. [csync2](http://oss.linbit.com/csync2/)) or distributed filesystems (e.g. NFS and CIFS) to build clusters of AuthZForce Servers. 
 
+## Distribution (downloads)
+Every release is distributed as follows:
+- Ubuntu/Debian package (recommended option): `.deb`;
+- Other Linux distributions: `.tar.gz`;
+- Docker image.
+
+For download links, please go to the specific [release page](https://github.com/authzforce/server/releases).
+
+## Documentation
+For links to the documentation of a release, please go to the specific [release page](https://github.com/authzforce/server/releases).
 
 ## Support
 Use the *Issues* tab on the Github repository page.
@@ -84,16 +94,16 @@ The sources for the manuals are located in [fiware repository](http://github.com
 ### Releasing
 1. From the develop branch, prepare a release (example using a HTTP proxy):
 <pre><code>
-    $ mvn -Dhttps.proxyHost=proxyhostname -Dhttps.proxyPort=3128 jgitflow:release-start
+    $ mvn -Dhttps.proxyHost=proxyhostname -Dhttps.proxyPort=8080 jgitflow:release-start
 </code></pre>
 1. Update the CHANGELOG according to keepachangelog.com.
 1. To perform the release (example using a HTTP proxy):
 <pre><code>
-    $ mvn -Dhttps.proxyHost=proxyhostname -Dhttps.proxyPort=3128 jgitflow:release-finish
+    $ mvn -Dhttps.proxyHost=proxyhostname -Dhttps.proxyPort=8080 jgitflow:release-finish
 </code></pre>
     If, after deployment, the command does not succeed because of some issue with the branches. Fix the issue, then re-run the same command but with 'noDeploy' option set to true to avoid re-deployment:
 <pre><code>
-    $ mvn -Dhttps.proxyHost=proxyhostname -Dhttps.proxyPort=3128 -DnoDeploy=true jgitflow:release-finish
+    $ mvn -Dhttps.proxyHost=proxyhostname -Dhttps.proxyPort=8080 -DnoDeploy=true jgitflow:release-finish
 </code></pre>
   More info on jgitflow: http://jgitflow.bitbucket.org/
 1. Connect and log in to the OSS Nexus Repository Manager: https://oss.sonatype.org/

dist/.gitignore

@@ -2,3 +2,4 @@
 /.classpath
 /.project
 /CHANGES.txt
+/.pmd

dist/pom.xml

@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.ow2.authzforce</groupId>
       <artifactId>authzforce-ce-server</artifactId>
-      <version>6.0.0</version>
+      <version>7.0.0</version>
       <relativePath>..</relativePath>
    </parent>
    <artifactId>authzforce-ce-server-dist</artifactId>

pom.xml

@@ -4,21 +4,21 @@
    <parent>
       <groupId>org.ow2.authzforce</groupId>
       <artifactId>authzforce-ce-parent</artifactId>
-      <version>4.1.1</version>
+      <version>5.0.0</version>
    </parent>
    <artifactId>authzforce-ce-server</artifactId>
    <!-- FIWARE Versioning + Version must be equal or higher than 'authzforce-ce-rest-api-model' dependency in 'rest-service' module -->
-   <version>6.0.0</version>
+   <version>7.0.0</version>
    <packaging>pom</packaging>
    <name>${project.groupId}:${project.artifactId}</name>
    <description>AuthZForce CE Server</description>
    <url>https://github.com/authzforce/server</url>
    <properties>
       <git.url.base>https://github.com/authzforce/server</git.url.base>
-      <authzforce-ce-core.version>6.1.0</authzforce-ce-core.version>
-      <authzforce-ce-core-pap-api.version>6.2.0</authzforce-ce-core-pap-api.version>
+      <authzforce-ce-core.version>7.1.0</authzforce-ce-core.version>
+      <authzforce-ce-core-pap-api.version>6.3.0</authzforce-ce-core-pap-api.version>
       <!-- Version must be compatible with authzforce-ce-core and authzforce-ce-core-pap-api versions above. -->
-      <authzforce-ce-pap-dao-flat-file.version>7.0.0</authzforce-ce-pap-dao-flat-file.version>
+      <authzforce-ce-pap-dao-flat-file.version>8.0.0</authzforce-ce-pap-dao-flat-file.version>
    </properties>
    <scm>
       <connection>scm:git:${git.url.base}.git</connection>

rest-service/pom.xml

@@ -4,7 +4,7 @@
       <groupId>org.ow2.authzforce</groupId>
       <artifactId>authzforce-ce-server</artifactId>
       <!-- Version must be equal or higher than authzforce-ce-rest-api-model dependency -->
-      <version>6.0.0</version>
+      <version>7.0.0</version>
       <relativePath>..</relativePath>
    </parent>
    <artifactId>authzforce-ce-server-rest-service</artifactId>

rest-service/src/main/java/org/ow2/authzforce/rest/service/jaxrs/DomainResourceImpl.java

@@ -51,7 +51,7 @@
 import org.ow2.authzforce.core.pap.api.dao.ReadablePdpProperties;
 import org.ow2.authzforce.core.pap.api.dao.TooManyPoliciesException;
 import org.ow2.authzforce.core.pap.api.dao.WritablePdpProperties;
-import org.ow2.authzforce.core.pdp.api.PDP;
+import org.ow2.authzforce.core.pdp.api.PDPEngine;
 import org.ow2.authzforce.rest.api.jaxrs.AttributeProvidersResource;
 import org.ow2.authzforce.rest.api.jaxrs.DomainPropertiesResource;
 import org.ow2.authzforce.rest.api.jaxrs.DomainResource;
@@ -295,7 +295,7 @@ public DomainPropertiesResource getDomainPropertiesResource()
 	@Override
 	public Response requestPolicyDecision(final Request request)
 	{
-		final PDP pdp = domainDAO.getPDP();
+		final PDPEngine<?> pdp = domainDAO.getPDP();
 		if (pdp == null)
 		{
 			throw NULL_PDP_INTERNAL_SERVER_ERROR_EXCEPTION;

upgrader/pom.xml

@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.ow2.authzforce</groupId>
       <artifactId>authzforce-ce-server</artifactId>
-      <version>6.0.0</version>
+      <version>7.0.0</version>
       <relativePath>..</relativePath>
    </parent>
    <artifactId>authzforce-ce-server-upgrader</artifactId>