Project

General

Profile

« Previous | Next » 

Revision 47597

Added by Katerina Iatropoulou almost 7 years ago

Finalizing migration to java8 dnet45

View differences:

modules/dnet-claims-service/trunk/src/main/webapp/WEB-INF/applicationContext.xml
1 1 
<?xml version="1.0" encoding="UTF-8"?>
2 2 

  		




  3
  
  
    
<beans xmlns="http://www.springframework.org/schema/beans"


  		




  4
  
  
    
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"


  		




  
  3
  
    
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"


  		




  5
  4
  
    
	xmlns:context="http://www.springframework.org/schema/context"


  		




  6
  
  
    
	xmlns:cxf="http://cxf.apache.org/core"


  		




  7
  
  
    
	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd


  		




  
  5
  
    
	xmlns="http://www.springframework.org/schema/beans"


  		




  
  6
  
    
	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd


  		




  8
  7
  
    
	http://www.springframework.org/schema/context


  		




  9
  
  
    
           http://www.springframework.org/schema/context/spring-context-2.5.xsd


  		




  10
  
  
    
           http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">


  		




  
  8
  
    
		   http://www.springframework.org/schema/context/spring-context-4.0.xsd">


  		




  11
  9
  
    

  		




  12
  10
  
    
	<import resource="classpath:META-INF/cxf/cxf.xml" />


  		




  13
  11
  
    
<!-- 	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> -->


  		




  ......




  29
  27
  
    
	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">


  		




  30
  28
  
    
                <property name="order" value="2" />


  		




  31
  29
  
    
                <property name="ignoreUnresolvablePlaceholders" value="true" />


  		




  32
  
  
    
                <property name="locations">


  		




  33
  
  
    
                        <bean class="eu.dnetlib.conf.WebappContextPropertyLocationFactory">


  		




  34
  
  
    
                		<property name="locations">


  		




  35
  
  
    
                        		<list>


  		




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


  		




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


  		




  38
  
  
    
                      				<value>classpath*:/gr/**/springContext-commons.properties</value>


  		




  39
  
  
    
                        	        	<value>classpath*:/gr/**/springContext-registrator.properties</value>


  		




  40
  
  
    
                        	        	<value>classpath*:/gr/**/springContext-locators.properties</value>


  		




  
  30
  
    
				<property name="properties">


  		




  
  31
  
    
					<bean class="eu.dnetlib.conf.WebappContextProperyFactory">


  		




  
  32
  
    
						<property name="propertyFetcher">


  		




  
  33
  
    
							<bean class="eu.dnetlib.conf.PropertyFetcher" />


  		




  
  34
  
    
						</property>


  		




  
  35
  
    
					</bean>


  		




  
  36
  
    
				</property>


  		




  
  37
  
    
				<property name="locations">


  		




  
  38
  
    
						<list>


  		




  
  39
  
    
							<value>classpath*:/eu/**/applicationContext*.properties</value>


  		




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


  		




  
  41
  
    
							<value>classpath*:/gr/**/springContext-commons.properties</value>


  		




  
  42
  
    
								<value>classpath*:/gr/**/springContext-registrator.properties</value>


  		




  
  43
  
    
								<value>classpath*:/gr/**/springContext-locators.properties</value>


  		




  41
  44
  
    

  		




  42
  
  
    
										<value>classpath*:/eu/dnetlib/data/claims/migration/springContext-claimsDemo.properties</value>


  		




  43
  
  
    
                        	        	<value>classpath*:/gr/uoa/di/driver/app/springContext-lookupFactory.properties</value>


  		




  44
  
  
    
                        	        	<value>classpath*:/eu/dnetlib/enabling/hcm/springContext-hcmService.properties</value>


  		




  
  45
  
    
								<value>classpath*:/eu/dnetlib/data/claims/migration/springContext-claimsDemo.properties</value>


  		




  
  46
  
    
								<value>classpath*:/gr/uoa/di/driver/app/springContext-lookupFactory.properties</value>


  		




  
  47
  
    
								<value>classpath*:/eu/dnetlib/enabling/hcm/springContext-hcmService.properties</value>


  		




  45
  48
  
    

  		




  46
  
  
    
                          				<value>classpath*:/eu/dnetlib/openaire/applicationContext-openaire.properties</value>


  		




  47
  
  
    
        	                	        <value>classpath*:/eu/dnetlib/openaire/thrift/springContext-openaire-thrift.properties</value>


  		




  
  49
  
    
								<value>classpath*:/eu/dnetlib/openaire/applicationContext-openaire.properties</value>


  		




  
  50
  
    
								<value>classpath*:/eu/dnetlib/openaire/thrift/springContext-openaire-thrift.properties</value>


  		




  48
  51
  
    

  		




  49
  52
  
    

  		




  50
  
  
    
                                        <value>classpath*:dnet-site-override.properties</value>


  		




  51
  
  
    
                                        <value>classpath*:dnet-dnet-openaire-connector-wizard.properties</value>


  		




  52
  
  
    
                                        <value>classpath*:dnet-dnet-openaire-connector-override.properties</value>


  		




  
  53
  
    
								<value>classpath*:dnet-site-override.properties</value>


  		




  
  54
  
    
								<value>classpath*:dnet-dnet-openaire-connector-wizard.properties</value>


  		




  
  55
  
    
								<value>classpath*:dnet-dnet-openaire-connector-override.properties</value>


  		




  53
  56
  
    

  		




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


  		




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


  		




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


  		




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


  		




  56
  59
  
    

  		




  57
  
  
    
                                        <value>classpath*:dnet-force-override.properties</value>


  		




  
  60
  
    
								<value>classpath*:dnet-force-override.properties</value>


  		




  58
  61
  
    

  		




  59
  
  
    
	                        	</list>


  		




  60
  
  
    
	             		</property>


  		




  61
  
  
    
			</bean>


  		




  62
  
  
    
		</property>


  		




  63
  
  
    
		<property name="properties">


  		




  64
  
  
    
			<bean class="eu.dnetlib.conf.WebappContextProperyFactory">


  		




  65
  
  
    
				<property name="propertyFetcher">


  		




  66
  
  
    
					<bean class="eu.dnetlib.conf.PropertyFetcher" />


  		




  
  62
  
    
						</list>


  		




  67
  63
  
    
				</property>


  		




  68
  64
  
    
			</bean>


  		




  69
  
  
    
                </property>


  		




  70
  
  
    
        </bean>


  		




  71
  65
  
    

  		




  72
  66
  
    
	<context:annotation-config />


  		




  73
  67
  
    
	<context:component-scan base-package="eu.dnetlib.openaire.rest"/>


  		












  

    
      modules/dnet-claims-service/trunk/pom.xml
    
  





  3
  3
  
    
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">


  		




  4
  4
  
    
	<parent>


  		




  5
  5
  
    
		<groupId>eu.dnetlib</groupId>


  		




  6
  
  
    
		<artifactId>dnet-parent</artifactId>


  		




  
  6
  
    
		<artifactId>dnet45-parent</artifactId>


  		




  7
  7
  
    
		<version>1.0.0-SNAPSHOT</version>


  		




  8
  8
  
    
	</parent>


  		




  9
  9
  
    
	<modelVersion>4.0.0</modelVersion>


  		




  10
  10
  
    
	<groupId>eu.dnetlib</groupId>


  		




  11
  
  
    
	<artifactId>dnet-openaire-connector-service</artifactId>


  		




  
  11
  
    
	<artifactId>dnet-claims-service</artifactId>


  		




  12
  12
  
    
	<packaging>war</packaging>


  		




  13
  13
  
    
	<version>2.0.0-SNAPSHOT</version>


  		




  14
  14
  
    
	<build>


  		




  ......




  32
  32
  
    
	<dependencies>


  		




  33
  33
  
    
		<dependency>


  		




  34
  34
  
    
			<groupId>eu.dnetlib</groupId>


  		




  35
  
  
    
			<artifactId>uoa-openaire-connector</artifactId>


  		




  36
  
  
    
			<version>[1.0.0,)</version>


  		




  
  35
  
    
			<artifactId>uoa-claims-api</artifactId>


  		




  
  36
  
    
			<version>[2.0.0-SNAPSHOT,)</version>


  		




  37
  37
  
    
		</dependency>


  		




  38
  38
  
    
		<dependency>


  		




  39
  39
  
    
			<groupId>eu.dnetlib</groupId>


  		




  40
  40
  
    
			<artifactId>uoa-clients</artifactId>


  		




  41
  
  
    
			<version>[1.0.0-SNAPSHOT,)</version>


  		




  
  41
  
    
			<version>[2.0.0-SNAPSHOT,)</version>


  		




  42
  42
  
    
		</dependency>


  		




  43
  43
  
    
		<dependency>


  		




  44
  44
  
    
			<groupId>eu.dnetlib</groupId>


  		




  45
  45
  
    
			<artifactId>uoa-hcm</artifactId>


  		




  46
  
  
    
			<version>[1.0.0-SNAPSHOT,)</version>


  		




  
  46
  
    
			<version>[2.0.0-SNAPSHOT,)</version>


  		




  47
  47
  
    
		</dependency>


  		




  48
  48
  
    
		<dependency>


  		




  49
  49
  
    
			<groupId>org.apache.cxf</groupId>


  		




  50
  50
  
    
			<artifactId>cxf-rt-transports-http</artifactId>


  		




  51
  51
  
    
			<version>${cxf.version}</version>


  		




  52
  52
  
    
		</dependency>


  		




  53
  
  
    
		<dependency>


  		




  54
  
  
    
			<groupId>eu.dnetlib</groupId>


  		




  55
  
  
    
			<artifactId>dnet-runtime</artifactId>


  		




  56
  
  
    
			<version>[1.0.0-SNAPSHOT,)</version>


  		




  57
  
  
    
		</dependency>


  		




  
  53
  
    
 		<!--dependency>


  		




  
  54
  
    
                        <groupId>eu.dnetlib</groupId>


  		




  
  55
  
    
                        <artifactId>uoa-hcm</artifactId>


  		




  
  56
  
    
                        <version>[1.1.0, 2.0.0)</version>


  		




  
  57
  
    
                </dependency-->


  		




  
  58
  
    
                <dependency>


  		




  
  59
  
    
                        <groupId>eu.dnetlib</groupId>


  		




  
  60
  
    
                        <artifactId>dnet-runtime</artifactId>


  		




  
  61
  
    
                        <version>[1.0.0-SNAPSHOT, 2.0.0)</version>


  		




  
  62
  
    
                </dependency>


  		




  58
  63
  
    
	</dependencies>


  		




  59
  64
  
    
</project>


  		












Also available in:  Unified diff