MaDgIK
/
uoa-monitor-service
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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".
This commit is contained in:
Konstantina Galouni 2020-06-17 10:56:52 +00:00
parent 67cf2d9812
commit 8a3f97db13
4 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@ -62,10 +62,20 @@
<artifactId>gson</artifactId>
<version>2.8.2</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>eu.dnetlib</groupId>-->
<!-- <artifactId>uoa-help-texts-library</artifactId>-->
<!-- <version>2.0.0-SNAPSHOT</version>-->
<!-- </dependency>-->
<dependency>
<groupId>eu.dnetlib</groupId>
<artifactId>uoa-help-texts-library</artifactId>
<version>2.0.0-SNAPSHOT</version>
<artifactId>uoa-admin-tools-library</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

12
src/main/java/eu/dnetlib/uoamonitorservice/UoaMonitorServiceApplication.java
View File

@ -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})

4
src/main/java/eu/dnetlib/uoamonitorservice/configuration/mongo/MongoConnection.java
View File

@ -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

15
src/main/java/eu/dnetlib/uoamonitorservice/controllers/EmailController.java
View File

@ -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.*;