Project

General

Profile

« Previous | Next » 

Revision 50273

1. Bug fix on repository convert
2. Update pom with postgres dependency

View differences:

modules/uoa-repository-manager-service/trunk/src/main/java/eu/dnetlib/repo/manager/service/utils/Converter.java
82 82
        repository.setQualityManagementKind(datasource.get("qualitymanagementkind").toString());
83 83
        repository.setRegisteredBy(datasource.get("registeredby").toString());
84 84

  
85
        if(repository.getRegisteredBy() != null)
85
        if(Objects.equals(repository.getRegisteredBy(),"null"))
86 86
            repository.setRegistered(true);
87 87

  
88 88
        repository.setReleaseEndDate(convertStringToDate(datasource.get("releaseenddate").toString()));
modules/uoa-repository-manager-service/trunk/src/main/resources/application-context.xml
9 9
	http://www.springframework.org/schema/context/spring-context-4.0.xsd
10 10
	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
11 11

  
12
   <!-- <import resource="classpath:META-INF/cxf/cxf.xml"/>
12
    <!--<import resource="classpath:META-INF/cxf/cxf.xml"/>
13 13
    <import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml"/>
14 14
    <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
15 15
    <import resource="classpath*:/cxf.xml"/>
......
24 24
    <import resource="classpath*:/gr/uoa/di/driver/app/springContext-commons.xml"/>
25 25
    <import resource="classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml"/>
26 26
    <import resource="classpath*:/eu/dnetlib/repos/springContext-repos-dms-cached.xml"/>-->
27
    <context:property-placeholder location="classpath*:/eu/**/application.properties" /> 
27
    <context:property-placeholder location="classpath*:/eu/**/application.properties" />
28 28
    <tx:annotation-driven transaction-manager="txManager"/>
29 29

  
30 30
    <bean class="eu.dnetlib.repo.manager.service.config.CascadingPropertyLoader" id="propertyLoader">
modules/uoa-repository-manager-service/trunk/pom.xml
223 223
            <artifactId>typescript-generator-maven-plugin</artifactId>
224 224
            <version>1.29.366</version>
225 225
        </dependency>
226
        <!-- https://mvnrepository.com/artifact/postgresql/postgresql -->
227
        <dependency>
228
            <groupId>postgresql</groupId>
229
            <artifactId>postgresql</artifactId>
230
            <version>9.1-901.jdbc3</version>
231
        </dependency>
226 232

  
227 233

  
234

  
228 235
    </dependencies>
229 236

  
230 237
</project>

Also available in: Unified diff