Project

General

Profile

« Previous | Next » 

Revision 58205

Added by Katerina Iatropoulou about 4 years ago

synchronizing beta shadow with beta versions

View differences:

modules/dnet-shadow-functionality-services/branches/beta/src/main/webapp/WEB-INF/applicationContext.xml
4 4 
	xmlns:context="http://www.springframework.org/schema/context"
5 5 
	xmlns="http://www.springframework.org/schema/beans"
6 6 
	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
7 
	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
7 
	http://www.springframework.org/schema/context
8 
		   http://www.springframework.org/schema/context/spring-context-4.0.xsd">
8 9 

  		




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


  		




  10
  11
  
    
	


  		




  ......




  15
  16
  
    
	<import resource="classpath*:/eu/dnetlib/soap/cxf/applicationContext-eprbuilders.xml"/>


  		




  16
  17
  
    
	<import resource="classpath*:/gr/uoa/di/driver/app/springContext-lookupFactory.xml" />


  		




  17
  18
  
    
	<import resource="classpath*:/gr/uoa/di/driver/app/springContext-lookupClients.xml" />


  		




  
  19
  
    
	<import resource="classpath*:/eu/dnetlib/enabling/hcm/springContext-hcmService.xml" />


  		




  18
  20
  
    

  		




  19
  
  
    
	<import resource="classpath*:/eu/dnetlib/enabling/hcm/springContext-hcmService.xml" />


  		




  20
  21
  
    
	<import resource="classpath*:/eu/dnetlib/data/search/solr/springContext-searchService-solr.xml" />


  		




  21
  22
  
    
	<import resource="classpath*:/eu/dnetlib/data/search/springContext-transformation.xml" />


  		




  22
  23
  
    
	<import resource="classpath*:/eu/dnetlib/data/search/springContext-searchService.xml" />


  		




  ......




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


  		




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


  		




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


  		




  
  44
  
    

  		




  43
  45
  
    
				<value>classpath*:/eu/**/springContext-searchService-solr.properties</value>


  		




  44
  46
  
    
				<value>classpath*:/eu/**/springContext-searchService.properties</value>


  		




  45
  47
  
    
				<value>classpath*:/eu/**/springContext-transformation.properties</value>


  		




  
  48
  
    

  		




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


  		




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


  		




  48
  51
  
    
				<value>classpath*:/uoa-shadow-override.properties</value>


  		




  ......




  51
  54
  
    
	</bean>


  		




  52
  55
  
    

  		




  53
  56
  
    
	<context:annotation-config />


  		




  54
  
  
    
	<context:component-scan base-package="eu.dnetlib.data.search.web.api">


  		




  
  57
  
    
	<context:component-scan base-package="eu.dnetlib.data.search">


  		




  55
  58
  
    
		<context:include-filter type="annotation" expression="org.springframework.web.bind.annotation.ControllerAdvice" />


  		




  56
  59
  
    
	</context:component-scan>


  		




  57
  60
  
    

  		












  

    
      modules/dnet-shadow-functionality-services/branches/beta/src/main/webapp/WEB-INF/log4j.properties
    
  





  1
  1
  
    
log4j.rootLogger = WARN, R


  		




  2
  2
  
    

  		




  3
  3
  
    
log4j.logger.eu.dnetlib = INFO


  		




  4
  
  
    
log4j.logger.gr.uoa = INFO, S


  		




  5
  
  
    
log4j.logger.org.apache.cxf.interceptor = FATAL, stdout


  		




  
  4
  
    
log4j.logger.gr.uoa.di.driver = INFO


  		




  
  5
  
    
log4j.logger.org.springframework = INFO, S


  		




  6
  6
  
    

  		




  7
  7
  
    
log4j.additivity.org.springframework = false


  		




  8
  8
  
    

  		












  

    
      modules/dnet-shadow-functionality-services/branches/beta/src/main/webapp/WEB-INF/web.xml
    
  





  100
  100
  
    
                <filter-name>encodingFilter</filter-name>


  		




  101
  101
  
    
                <url-pattern>/*</url-pattern>


  		




  102
  102
  
    
        </filter-mapping>


  		




  
  103
  
    

  		




  
  104
  
    

  		




  
  105
  
    
	<filter>


  		




  
  106
  
    
		<filter-name>headerFilter</filter-name>


  		




  
  107
  
    
		<filter-class>eu.dnetlib.data.search.HeaderFilter</filter-class>


  		




  
  108
  
    
	</filter>


  		




  
  109
  
    

  		




  
  110
  
    
	<filter-mapping>


  		




  
  111
  
    
		<filter-name>headerFilter</filter-name>


  		




  
  112
  
    
		<url-pattern>/*</url-pattern>


  		




  
  113
  
    
	</filter-mapping>


  		




  
  114
  
    

  		




  103
  115
  
    
</web-app>


  		












  

    
      modules/dnet-shadow-functionality-services/branches/beta/pom.xml
    
  





  12
  12
  
    
	<packaging>war</packaging>


  		




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


  		




  14
  14
  
    
  	<scm>


  		




  15
  
  
    
                <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-shadow-functionality-services/trunk</developerConnection>


  		




  
  15
  
    
                <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/dnet-shadow-functionality-services/branches/beta</developerConnection>


  		




  16
  16
  
    
        </scm>


  		




  
  17
  
    

  		




  
  18
  
    
	<build>


  		




  
  19
  
    
		<plugins>


  		




  
  20
  
    
			<plugin>


  		




  
  21
  
    
				<groupId>org.apache.maven.plugins</groupId>


  		




  
  22
  
    
				<artifactId>maven-war-plugin</artifactId>


  		




  
  23
  
    
				<version>2.1.1</version>


  		




  
  24
  
    
				<configuration>


  		




  
  25
  
    
					<archive>


  		




  
  26
  
    
						<manifestEntries>


  		




  
  27
  
    
							<version>3.5.9</version>


  		




  
  28
  
    
						</manifestEntries>


  		




  
  29
  
    
					</archive>


  		




  
  30
  
    
				</configuration>


  		




  
  31
  
    
			</plugin>


  		




  
  32
  
    
		</plugins>


  		




  
  33
  
    

  		




  
  34
  
    
		<finalName>shadowSearch</finalName>


  		




  
  35
  
    

  		




  
  36
  
    
	</build>


  		




  
  37
  
    

  		




  17
  38
  
    
	<dependencies>


  		




  18
  39
  
    
		<dependency>


  		




  19
  40
  
    
			<groupId>eu.dnetlib</groupId>


  		




  20
  41
  
    
			<artifactId>uoa-search</artifactId>


  		




  21
  
  
    
			<version>[3.0.0-SNAPSHOT, 4.0.0)</version>


  		




  
  42
  
    
			<version>[3.5.9]</version>


  		




  22
  43
  
    
		</dependency>


  		




  23
  44
  
    
		<dependency>


  		




  24
  45
  
    
			<groupId>eu.dnetlib</groupId>


  		




  ......




  70
  91
  
    
		<dependency>


  		




  71
  92
  
    
			<groupId>eu.dnetlib</groupId>


  		




  72
  93
  
    
			<artifactId>cnr-service-common</artifactId>


  		




  73
  
  
    
			<version>[2.1.6-SNAPSHOT, 3.0.0)</version>


  		




  
  94
  
    
			<version>[2.1.6, 3.0.0)</version>


  		




  74
  95
  
    
			<exclusions>


  		




  75
  96
  
    
				<exclusion>


  		




  76
  97
  
    
					<groupId>xml-apis</groupId>


  		




  ......




  88
  109
  
    

  		




  89
  110
  
    
    </dependencies>


  		




  90
  111
  
    

  		




  91
  
  
    
<build>


  		




  92
  
  
    
    <finalName>shadowSearch</finalName>


  		




  93
  
  
    
</build>


  		




  
  112
  
    

  		




  94
  113
  
    
</project>


  		












Also available in:  Unified diff