Merge pull request #14 from mariodavid/cuba-7.1-support

CUBA 7.1 support

Author: bresche

.travis.yml

@@ -1,9 +1,11 @@
 language: groovy
 jdk:
-  - oraclejdk8
+  - openjdk8
 cache:
   directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
+    - "$HOME/.gradle/caches/"
+    - "$HOME/.gradle/wrapper/"
+before_install:
+  - "chmod +x ./gradlew"
 script:
- - ./gradlew check
+  - "./gradlew --no-daemon check --info"

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.9.0] - 18.09.2019
+
+### Dependencies
+- CUBA 7.1.x
+
 ## [0.8.0] - 01.02.2019
 
 ### Added

README.md

@@ -14,6 +14,7 @@ CUBA component that allows to write generic features for a Controller and use th
 
 | Platform Version | Add-on Version |
 | ---------------- | -------------- |
+| 7.1.x            | 0.9.x          |
 | 7.0.x            | 0.8.x          |
 | 6.10.x           | 0.7.x          |
 | 6.9.x            | 0.6.x          |

build.gradle

@@ -1,6 +1,6 @@
 
 buildscript {
-    ext.cubaVersion = '7.0.0'
+    ext.cubaVersion = '7.1.0'
     repositories {
         maven {
             url 'https://repo.cuba-platform.com/content/groups/work'
@@ -34,7 +34,7 @@ apply(plugin: 'cuba')
 cuba {
     artifact {
         group = 'de.balvi.cuba.declarativecontrollers'
-        version = "0.8.0"
+        version = "0.9.0"
         isSnapshot = false
     }
     tomcat {
@@ -50,7 +50,7 @@ dependencies {
 
 }
 
-def hsql = 'org.hsqldb:hsqldb:2.2.9'
+def hsql = 'org.hsqldb:hsqldb:2.4.1'
 
 
 allprojects {

modules/core/src/de/balvi/cuba/declarativecontrollers/core/messages.properties

@@ -45,3 +45,6 @@ cuba.availableLocales = English|en
 cuba.localeSelectVisible = false
 cuba.restApiUrl = http://localhost:8080/declarativecontrollers-portal/api
 cuba.webAppUrl = http://localhost:8080/declarativecontrollers
+cuba.web.loginScreenId=loginWindow
+cuba.web.mainScreenId=mainWindow
+cuba.gui.genericFilterApplyImmediately=false

modules/web/src/de/balvi/cuba/declarativecontrollers/web-app.properties

@@ -31,11 +31,6 @@
         <servlet-class>com.haulmont.cuba.web.sys.CubaDispatcherServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <servlet>
-        <servlet-name>rest_api</servlet-name>
-        <servlet-class>com.haulmont.restapi.sys.CubaRestApiServlet</servlet-class>
-        <load-on-startup>2</load-on-startup>
-    </servlet>
     <servlet-mapping>
         <servlet-name>dispatcher</servlet-name>
         <url-pattern>/dispatch/*</url-pattern>
@@ -44,10 +39,6 @@
         <servlet-name>app_servlet</servlet-name>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>rest_api</servlet-name>
-        <url-pattern>/rest/*</url-pattern>
-    </servlet-mapping>
     <filter>
         <filter-name>cuba_filter</filter-name>
         <filter-class>com.haulmont.cuba.web.sys.CubaHttpFilter</filter-class>
@@ -57,20 +48,4 @@
         <filter-name>cuba_filter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
-    <filter>
-        <filter-name>restSpringSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-        <init-param>
-            <param-name>contextAttribute</param-name>
-            <param-value>org.springframework.web.servlet.FrameworkServlet.CONTEXT.rest_api</param-value>
-        </init-param>
-        <init-param>
-            <param-name>targetBeanName</param-name>
-            <param-value>springSecurityFilterChain</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>restSpringSecurityFilterChain</filter-name>
-        <url-pattern>/rest/*</url-pattern>
-    </filter-mapping>
 </web-app>