test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-11-30 18:27:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-7587 Update spring versions

Browse Source
This commit is contained in:
Maxim Gorbunkov 2016-07-25 15:03:10 +04:00
parent 3baf55d25f
commit a4a373a2e1
13 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -85,8 +85,8 @@ def clientTestsModule = project(':cuba-client-tests')
apply from: "$rootProject.projectDir/lib.gradle"
def springVersion = '4.2.5.RELEASE'
def springSecurityVersion = '4.0.4.RELEASE'
def springVersion = '4.3.1.RELEASE'
def springSecurityVersion = '4.1.1.RELEASE'
def servletApi = 'org.apache.tomcat:tomcat-servlet-api:8.0.26'
def groovyArtifact = 'org.codehaus.groovy:groovy-all:2.4.4'

4
modules/core/src/cuba-remoting-spring.xml
View File

@ -19,8 +19,8 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd"
>
<context:annotation-config/>

23
modules/core/src/cuba-spring.xml
View File

@ -22,12 +22,11 @@
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:task="http://www.springframework.org/schema/task"
xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.1.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.2.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
">
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd">
<bean class="com.haulmont.cuba.core.sys.CubaPropertyPlaceholderConfigurer"/>
@ -66,13 +65,15 @@
<!-- Various beans with non-standard configuration -->
<bean id="cuba_Security" name="cuba_PersistenceSecurity" class="com.haulmont.cuba.core.sys.PersistenceSecurityImpl"/>
<bean id="cuba_Security" name="cuba_PersistenceSecurity"
class="com.haulmont.cuba.core.sys.PersistenceSecurityImpl"/>
<bean id="cuba_PasswordEncryption" class="com.haulmont.cuba.core.sys.PasswordEncryptionImpl">
<property name="encryptionModule" ref="${cuba.passwordEncryptionModule}"/>
</bean>
<bean id="cuba_PersistentAttributesLoadChecker" class="com.haulmont.cuba.core.sys.CorePersistentAttributesLoadChecker">
<bean id="cuba_PersistentAttributesLoadChecker"
class="com.haulmont.cuba.core.sys.CorePersistentAttributesLoadChecker">
</bean>
<!-- AOP setup -->
@ -184,8 +185,10 @@
<task:scheduled-tasks scheduler="scheduler">
<task:scheduled ref="cuba_UserSessions" method="processEviction" fixed-rate="10000"/>
<task:scheduled ref="cuba_LockManager" method="expireLocks" fixed-rate="60000"/>
<task:scheduled ref="cuba_Scheduling" method="processScheduledTasks" fixed-rate="${cuba.schedulingInterval?:1000}"/>
<task:scheduled ref="cuba_TriggerFilesProcessor" method="process" fixed-delay="${cuba.triggerFilesCheckInterval?:5000}"/>
<task:scheduled ref="cuba_Scheduling" method="processScheduledTasks"
fixed-rate="${cuba.schedulingInterval?:1000}"/>
<task:scheduled ref="cuba_TriggerFilesProcessor" method="process"
fixed-delay="${cuba.triggerFilesCheckInterval?:5000}"/>
<task:scheduled ref="cuba_MiddlewareStatisticsAccumulator" method="gatherParameters" fixed-rate="5000"/>
<!--<task:scheduled ref="cuba_QueryResultsManager" method="deleteForInactiveSessions" fixed-rate="600000"/>-->
</task:scheduled-tasks>

2
modules/core/test/test-spring.xml
View File

@ -19,7 +19,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd">
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
<bean id="cuba_UserSessionSource" class="com.haulmont.cuba.testsupport.TestUserSessionSource"/>

6
modules/desktop/src/cuba-desktop-spring.xml
View File

@ -20,9 +20,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:task="http://www.springframework.org/schema/task"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.2.xsd">
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd">
<bean class="com.haulmont.cuba.core.sys.CubaPropertyPlaceholderConfigurer"/>

6
modules/portal/src/cuba-portal-dispatcher-spring.xml
View File

@ -18,12 +18,10 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd">
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd">
<bean class="com.haulmont.cuba.core.sys.CubaPropertyPlaceholderConfigurer"/>

4
modules/portal/src/cuba-portal-security-spring.xml
View File

@ -20,8 +20,8 @@
xmlns:beans="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-4.0.xsd">
http://www.springframework.org/schema/security/spring-security-4.1.xsd">
</beans:beans>

6
modules/portal/src/cuba-portal-spring.xml
View File

@ -19,9 +19,9 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd"
>
<bean class="com.haulmont.cuba.core.sys.CubaPropertyPlaceholderConfigurer"/>

3
modules/rest-api/src/com/haulmont/restapi/auth/CubaUserAuthenticationProvider.java
View File

@ -47,6 +47,9 @@ public class CubaUserAuthenticationProvider implements AuthenticationProvider, S
protected Logger log = LoggerFactory.getLogger(getClass());
public CubaUserAuthenticationProvider() {
}
@Inject
protected LoginService loginService;

4
modules/rest-api/src/rest-api-dispatcher-spring.xml
View File

@ -21,9 +21,9 @@
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.2.xsd
http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd">

8
modules/rest-api/src/rest-api-security-spring.xml
View File

@ -24,11 +24,11 @@
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2
http://www.springframework.org/schema/security/spring-security-oauth2.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-4.0.xsd
http://www.springframework.org/schema/security/spring-security-4.1.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.2.xsd">
http://www.springframework.org/schema/context/spring-context-4.3.xsd">
<context:annotation-config/>
@ -80,7 +80,7 @@
<oauth2:password authentication-manager-ref="userAuthenticationManager"/>
</oauth2:authorization-server>
<security:authentication-manager alias="userAuthenticationManager">
<security:authentication-manager id="userAuthenticationManager">
<security:authentication-provider ref="userAuthenticationProvider"/>
</security:authentication-manager>

4
modules/web/src/cuba-dispatcher-spring.xml
View File

@ -22,9 +22,9 @@
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.2.xsd
http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd">

8
modules/web/src/cuba-web-spring.xml
View File

@ -21,10 +21,10 @@
xmlns:context="http://www.springframework.org/schema/context"
xmlns:task="http://www.springframework.org/schema/task"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.2.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd">
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd">
<bean class="com.haulmont.cuba.core.sys.CubaPropertyPlaceholderConfigurer"/>