diff --git a/pom.xml b/pom.xml
index aca3231..56ffd53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,52 +15,6 @@
war
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.1
-
-
- 1.8
- UTF-8
-
-
-
-
- maven-war-plugin
- 2.6
-
- false
-
-
-
-
-
-
@@ -231,8 +185,13 @@
LATEST
+
+ commons-fileupload
+ commons-fileupload
+ LATEST
+
-
+
-
- biz.paluch.redis
- lettuce
- 3.5.0.Final
- -->
-
+ redis.clients
+ jedis
+ 2.9.0
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.1
+
+
+ 1.8
+ UTF-8
+
+
+
+
+ maven-war-plugin
+ 2.6
+
+ false
+
+
+
+
+ com.googlecode.maven-download-plugin
+ download-maven-plugin
+ 1.3.0
+
+
+ process-resources
+
+ wget
+
+
+
+ https://github.com/ostranme/swagger-ui-themes/archive/v3.0.0.zip
+
+ true
+ ${project.build.directory}
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.8
+
+
+ prepare-package
+
+
+
+
+ Add theme
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/utils/Config.java b/src/main/java/eu/dnetlib/repo/manager/service/config/Config.java
similarity index 57%
rename from src/main/java/eu/dnetlib/repo/manager/service/utils/Config.java
rename to src/main/java/eu/dnetlib/repo/manager/service/config/Config.java
index e5e2c39..53b15bb 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/utils/Config.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/config/Config.java
@@ -1,28 +1,28 @@
-/*
-package eu.dnetlib.repo.manager.service.utils;
+package eu.dnetlib.repo.manager.service.config;
+import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
import org.springframework.session.web.http.CookieSerializer;
import org.springframework.session.web.http.DefaultCookieSerializer;
import javax.annotation.PostConstruct;
-import java.util.logging.Logger;
@Configuration
@EnableRedisHttpSession
-@PropertySource(value = { "classpath:eu/dnetlib/repo/manager/service/application.properties", "classpath:application.properties"} )
-@ComponentScan(basePackages = "eu.dnetlib.repo.manager")
+@PropertySource(value = { "classpath:eu/dnetlib/repo/manager/service/application.properties"} )
+@ComponentScan(basePackages = "eu.dnetlib.repo.manager.service.controllers")
+
public class Config {
- private static Logger LOGGER = Logger.getLogger(String.valueOf(Config.class));
+ private static Logger LOGGER = Logger.getLogger(Config.class);
- @Value("${redis.host}")
+ @Value("${redis.host:194.177.192.121}")
private String host;
@Value("${redis.port:6379}")
@@ -37,11 +37,13 @@ public class Config {
}
@Bean
- public LettuceConnectionFactory connectionFactory() {
- LOGGER.info(String.format("Redis connection listens to %s:%s",host,port));
- LettuceConnectionFactory factory = new LettuceConnectionFactory(host,Integer.parseInt(port));
- if(password != null) factory.setPassword(password);
- return factory;
+ JedisConnectionFactory connectionFactory() {
+ LOGGER.info(String.format("Redis : %s Port : %s Password : %s",host,port,password));
+ JedisConnectionFactory jedisConnectionFactory = new JedisConnectionFactory();
+ jedisConnectionFactory.setHostName(host);
+ jedisConnectionFactory.setPort(Integer.parseInt(port));
+ if(password != null) jedisConnectionFactory.setPassword(password);
+ return jedisConnectionFactory;
}
@Bean
@@ -49,8 +51,8 @@ public class Config {
DefaultCookieSerializer serializer = new DefaultCookieSerializer();
serializer.setCookieName("SESSION"); // <1>
serializer.setCookiePath("/"); // <2>
+ LOGGER.info("Serializer : " + serializer);
return serializer;
}
}
-*/
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/utils/FrontEndLinkURIAuthenticationSuccessHandler.java b/src/main/java/eu/dnetlib/repo/manager/service/config/FrontEndLinkURIAuthenticationSuccessHandler.java
similarity index 76%
rename from src/main/java/eu/dnetlib/repo/manager/service/utils/FrontEndLinkURIAuthenticationSuccessHandler.java
rename to src/main/java/eu/dnetlib/repo/manager/service/config/FrontEndLinkURIAuthenticationSuccessHandler.java
index c5de3be..9890080 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/utils/FrontEndLinkURIAuthenticationSuccessHandler.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/config/FrontEndLinkURIAuthenticationSuccessHandler.java
@@ -1,10 +1,11 @@
-/*
-package eu.dnetlib.repo.manager.service.utils;
+package eu.dnetlib.repo.manager.service.config;
+import org.apache.log4j.Logger;
import org.mitre.openid.connect.model.OIDCAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import javax.annotation.PostConstruct;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@@ -15,8 +16,20 @@ public class FrontEndLinkURIAuthenticationSuccessHandler implements Authenticati
private String frontEndURI;
+ private static final Logger LOGGER = Logger
+ .getLogger(FrontEndLinkURIAuthenticationSuccessHandler.class);
+
+ @PostConstruct
+ public void init(){
+ LOGGER.debug(frontEndURI);
+ }
+
@Override
public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
+
+ LOGGER.info(request);
+ LOGGER.info(response);
+
OIDCAuthenticationToken authOIDC = (OIDCAuthenticationToken) authentication;
Cookie sessionCookie = new Cookie("currentUser", authOIDC.getSub());
int expireSec = -1;
@@ -35,4 +48,3 @@ public class FrontEndLinkURIAuthenticationSuccessHandler implements Authenticati
}
}
-*/
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/controllers/RepositoryApi.java b/src/main/java/eu/dnetlib/repo/manager/service/controllers/RepositoryApi.java
index 0321348..04bddf5 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/controllers/RepositoryApi.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/controllers/RepositoryApi.java
@@ -94,6 +94,11 @@ public interface RepositoryApi {
@ResponseBody
List getTimezones();
+ @RequestMapping(value = "/updateRepository", method = RequestMethod.POST,
+ produces = MediaType.APPLICATION_JSON_VALUE)
+ @ResponseBody
+ Repository updateRepository(Repository repository);
+
@RequestMapping(value = "/updateManagedStatus", method = RequestMethod.POST,
produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/controllers/RepositoryApiImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/controllers/RepositoryApiImpl.java
index a63ef55..039196c 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/controllers/RepositoryApiImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/controllers/RepositoryApiImpl.java
@@ -337,12 +337,15 @@ public class RepositoryApiImpl implements RepositoryApi {
return repository;
}
- private void updateRepository(Repository repository) {
- this.updateRegisteredByValue(repository.getId(),repository.getRegisteredBy());
- this.updateEnglishName(repository.getId(),repository.getOfficialName(),repository.getEnglishName());
- this.updateLogoUrl(repository.getId(),repository.getLogoUrl());
- this.updateTimezone(repository.getId(), String.valueOf(repository.getTimezone()));
- //TODO update datasource type
+ @Override
+ public Repository updateRepository(@RequestBody Repository repository) {
+ /*UriComponents uriComponents = UriComponentsBuilder
+ .fromHttpUrl(baseAddress + "/ds/update/")
+ .build()
+ .encode();*/
+ return null;
+
+
}
private void updateRegisteredByValue(String id, String registeredBy) {
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/controllers/UserApi.java b/src/main/java/eu/dnetlib/repo/manager/service/controllers/UserApi.java
index 37e3ac5..475fddc 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/controllers/UserApi.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/controllers/UserApi.java
@@ -1,23 +1,18 @@
-/*
package eu.dnetlib.repo.manager.service.controllers;
import io.swagger.annotations.Api;
+import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@RestController
@RequestMapping(value = "/user")
@Api(description = "User API", tags = {"user"})
public interface UserApi {
@RequestMapping(value = "/login" , method = RequestMethod.GET)
- void login(HttpServletRequest req,
- HttpServletResponse resp);
+ ResponseEntity