From 8a3f97db139338d6aa826e05de5b002cff324c61 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 17 Jun 2020 10:56:52 +0000 Subject: [PATCH] [Trunk | Monitor Service]: 1. pom.xml: Comment dependency of "uoa-help-texts-library" and add dependency of "uoa-admin-tools-library" | Add dependency of "spring-boot-starter-test". 2. MongoConnection.java: Replace basePackage "eu.dnetlib.uoahelptexts.dao" with "eu.dnetlib.uoaadmintoolslibrary.dao". 3. EmailController.java: Import from " eu.dnetlib.uoaadmintoolslibrary" instead of "eu.dnetlib.uoahelptexts". 4. UoaMonitorServiceApplication.java: Replace scanBasePackage "eu.dnetlib.uoahelptexts" with "eu.dnetlib.uoaadmintoolslibrary" | Add @PropertySource("classpath:dnet-override.properties". --- pom.xml | 14 ++++++++++++-- .../UoaMonitorServiceApplication.java | 12 ++++++------ .../configuration/mongo/MongoConnection.java | 4 ++-- .../controllers/EmailController.java | 15 ++++++++++----- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index f0ff326..99ea91b 100644 --- a/pom.xml +++ b/pom.xml @@ -62,10 +62,20 @@ gson 2.8.2 + + + + + eu.dnetlib - uoa-help-texts-library - 2.0.0-SNAPSHOT + uoa-admin-tools-library + 1.0.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-test + test diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java b/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java index 1b0b5ce..56ac5b7 100644 --- a/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java +++ b/src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java @@ -7,14 +7,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.PropertySources; - -@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoamonitorservice", "eu.dnetlib.uoahelptexts"}) +//uoahelptexts +@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoamonitorservice", "eu.dnetlib.uoaadmintoolslibrary"}) @PropertySources({ @PropertySource("classpath:monitorservice.properties"), - @PropertySource(value = "file:/usr/share/tomcat7/lib/dnet-override.properties", ignoreResourceNotFound = true), - @PropertySource(value = "file:/var/lib/tomcat_dnet/8380/lib/dnet-override.properties", ignoreResourceNotFound = true), - @PropertySource(value = "file:/var/lib/tomcat8/lib/dnet-override.properties", ignoreResourceNotFound = true) - +// @PropertySource(value = "file:/usr/share/tomcat7/lib/dnet-override.properties", ignoreResourceNotFound = true), +// @PropertySource(value = "file:/var/lib/tomcat_dnet/8380/lib/dnet-override.properties", ignoreResourceNotFound = true), +// @PropertySource(value = "file:/var/lib/tomcat8/lib/dnet-override.properties", ignoreResourceNotFound = true) + @PropertySource("classpath:dnet-override.properties") }) @EnableConfigurationProperties({SecurityConfig.class, MongoConfig.class}) diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/configuration/mongo/MongoConnection.java b/src/main/java/eu/dnetlib/uoamonitorservice/configuration/mongo/MongoConnection.java index f208afd..42c31fd 100644 --- a/src/main/java/eu/dnetlib/uoamonitorservice/configuration/mongo/MongoConnection.java +++ b/src/main/java/eu/dnetlib/uoamonitorservice/configuration/mongo/MongoConnection.java @@ -14,9 +14,9 @@ import org.springframework.data.mongodb.core.SimpleMongoDbFactory; import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; import java.util.Collections; - +//"uoahelptexts" @Configuration -@EnableMongoRepositories(basePackages = {"eu.dnetlib.uoamonitorservice.dao", "eu.dnetlib.uoahelptexts.dao"}) +@EnableMongoRepositories(basePackages = {"eu.dnetlib.uoamonitorservice.dao", "eu.dnetlib.uoaadmintoolslibrary.dao"}) public class MongoConnection { @Autowired diff --git a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/EmailController.java b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/EmailController.java index 53c54ce..23e0534 100644 --- a/src/main/java/eu/dnetlib/uoamonitorservice/controllers/EmailController.java +++ b/src/main/java/eu/dnetlib/uoamonitorservice/controllers/EmailController.java @@ -1,10 +1,15 @@ package eu.dnetlib.uoamonitorservice.controllers; -import eu.dnetlib.uoahelptexts.emailSender.EmailSender; -import eu.dnetlib.uoahelptexts.entities.EmailRecaptcha; -import eu.dnetlib.uoahelptexts.entities.Email; -import eu.dnetlib.uoahelptexts.handlers.InvalidReCaptchaException; -import eu.dnetlib.uoahelptexts.recaptcha.VerifyRecaptcha; +//import eu.dnetlib.uoahelptexts.emailSender.EmailSender; +//import eu.dnetlib.uoahelptexts.entities.EmailRecaptcha; +//import eu.dnetlib.uoahelptexts.entities.Email; +//import eu.dnetlib.uoahelptexts.handlers.InvalidReCaptchaException; +//import eu.dnetlib.uoahelptexts.recaptcha.VerifyRecaptcha; +import eu.dnetlib.uoaadmintoolslibrary.emailSender.EmailSender; +import eu.dnetlib.uoaadmintoolslibrary.entities.email.Email; +import eu.dnetlib.uoaadmintoolslibrary.entities.email.EmailRecaptcha; +import eu.dnetlib.uoaadmintoolslibrary.handlers.InvalidReCaptchaException; +import eu.dnetlib.uoaadmintoolslibrary.recaptcha.VerifyRecaptcha; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*;