Project

General

Profile

« Previous | Next » 

Revision 54842

Meerge dev-api to trunk ( -r50861:54841 )

View differences:

spring-servlet.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<beans:beans xmlns="http://www.springframework.org/schema/mvc"
3
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
             xmlns:beans="http://www.springframework.org/schema/beans"
5
             xmlns:task="http://www.springframework.org/schema/task"
6
             xmlns:mvc="http://www.springframework.org/schema/mvc"
7
             xmlns:context="http://www.springframework.org/schema/context"
8
             xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
9
		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
10
		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
2
<beans xmlns="http://www.springframework.org/schema/beans"
3
       xmlns:mvc="http://www.springframework.org/schema/mvc"
4
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5
       xmlns:context="http://www.springframework.org/schema/context"
6
       xmlns:security="http://www.springframework.org/schema/security"
7
       xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
8
		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
9
		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
10
		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
11
      >
11 12

  
12
    <context:property-placeholder location="classpath*:/eu/**/application.properties" />
13
    <security:global-method-security pre-post-annotations="enabled" proxy-target-class="true"
14
                                     authentication-manager-ref="authenticationManager">
15
    </security:global-method-security>
16

  
17
    <bean id="webexpressionHandler"
18
          class="org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler"/>
19

  
13 20
    <context:annotation-config/>
14
    <context:component-scan base-package="eu.dnetlib.repo.manager.service.controllers"/>
15
    <mvc:annotation-driven/>
16
</beans:beans>
21
    <mvc:annotation-driven />
22

  
23
</beans>

Also available in: Unified diff