Project

General

Profile

« Previous | Next » 

Revision 57921

Added by Katerina Iatropoulou over 4 years ago

MERGE login branch 56991:57920 using uoa-login-core

View differences:

applicationContext.xml
9 9 
		   http://www.springframework.org/schema/context/spring-context-4.2.xsd">
10 10 

  		




  11
  11
  
    

  		




  
  12
  
    
    <import resource="classpath*:/eu/dnetlib/openaire/user/springContext-userManagementService.xml" />


  		




  
  13
  
    
    <import resource="classpath*:/eu/dnetlib/openaire/user/login/springContext-userLoginCore.xml" />


  		




  
  14
  
    

  		




  12
  15
  
    
    <context:component-scan base-package="eu.dnetlib.openaire.usermanagement.*"/>


  		




  13
  16
  
    
    <context:annotation-config />


  		




  14
  17
  
    

  		




  15
  
  
    
    <import resource="classpath*:/eu/dnetlib/openaire/user/springContext-userManagementService.xml" />


  		




  16
  
  
    

  		




  17
  18
  
    
    <!--<bean id="webexpressionHandler"-->


  		




  18
  19
  
    
          <!--class="org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler"/>-->


  		




  19
  20
  
    

  		




  20
  
  
    
    <bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"/>


  		




  21
  
  
    
    <bean class="org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory"/>


  		




  22
  
  
    

  		




  23
  
  
    

  		




  24
  21
  
    
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">


  		




  25
  22
  
    
        <property name="order" value="2" />


  		




  26
  23
  
    
        <property name="ignoreUnresolvablePlaceholders" value="true" />


  		




  ......




  36
  33
  
    
                <value>classpath*:/eu/**/applicationContext*.properties</value>


  		




  37
  34
  
    
                <value>classpath*:/eu/dnetlib/applicationContext-defaultProperties.properties</value>


  		




  38
  35
  
    
                <value>classpath*:/eu/**/springContext-userManagementService.properties</value>


  		




  39
  
  
    
		        <value>classpath*:/eu/**/springContext-dnetOpenaireUsersService.properties</value>


  		




  40
  
  
    
                <value>classpath*:/eu/**/redis.properties</value>


  		




  
  36
  
    
                <value>classpath*:/eu/**/springContext-userLoginCore.properties</value>


  		




  
  37
  
    
                <value>classpath*:/eu/**/springContext-dnetOpenaireUsersService.properties</value>


  		




  41
  38
  
    
                <value>classpath*:/uoa-override.properties</value>


  		




  42
  39
  
    
                <value>classpath*:/dnet-override.properties</value>


  		




  43
  40
  
    
            </list>


  		












Also available in:  Unified diff