Merge branch 'feature/move-to-7-1-cuba'

Author: zaharchenko

build.gradle

@@ -15,7 +15,7 @@
  */
 
 buildscript {
-    ext.cubaVersion = '7.0.4'
+    ext.cubaVersion = '7.1-SNAPSHOT'
     repositories {
         mavenLocal()
 
@@ -58,7 +58,7 @@ apply(plugin: 'addon-gradle-plugin')
 cuba {
     artifact {
         group = 'com.haulmont.addon.admintools'
-        version = "1.3"
+        version = "1.4"
         isSnapshot = true
     }
     tomcat {
@@ -118,6 +118,9 @@ configure([globalModule, coreModule, guiModule, webModule]) {
                 srcDirs = ['test-unit']
             }
         }
+
+        sourceSets.main.output.classesDir = new File(project.buildDir, "classes/main")
+        sourceSets.test.output.classesDir = new File(project.buildDir, "classes/test")
     }
 
     dependencies {

modules/core/src/com/haulmont/addon/admintools/app.properties

@@ -44,3 +44,4 @@ cuba.localeSelectVisible = false
 
 cuba.restApiUrl = http://localhost:8080/cuba-at-portal/api
 cuba.webAppUrl = http://localhost:8080/cuba-at
+cuba.dataManagerBeanValidation=false

modules/core/src/de/diedavids/cuba/runtimediagnose/core/messages.properties

@@ -29,11 +29,11 @@ import net.sf.jsqlparser.statement.Statements
 import org.apache.commons.lang3.StringUtils
 import org.eclipse.persistence.internal.jpa.EJBQueryImpl
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 
 import javax.inject.Inject
 import javax.persistence.EntityManager
 import javax.sql.DataSource
-import javax.transaction.Transactional
 
 @Service(DbDiagnoseService.NAME)
 class DbDiagnoseServiceBean implements DbDiagnoseService {

modules/core/src/de/diedavids/cuba/runtimediagnose/db/DbDiagnoseServiceBean.groovy

@@ -61,5 +61,7 @@ cuba.web.theme = hover
 cuba.web.foldersPaneEnabled=false
 cuba.availableLocales = English|en
 cuba.localeSelectVisible = false
-cuba.restApiUrl = http://localhost:8080/cuba-at-portal/api
 cuba.webAppUrl = http://localhost:8080/cuba-at
+cuba.web.loginScreenId=loginWindow
+cuba.web.mainScreenId=mainWindow
+cuba.gui.genericFilterApplyImmediately=false

modules/web/src/com/haulmont/addon/admintools/web-app.properties

@@ -52,11 +52,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>
@@ -65,10 +60,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>
@@ -78,20 +69,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>