Project

General

Profile

« Previous | Next » 

Revision 59470

[Trunk | Admin Tools]: Merging branch 'use-UoaAdminToolsLibrary' into trunk for revisions 58365:59468

View differences:

UoaAdminToolsApplication.java
1 1
package eu.dnetlib.uoaadmintools;
2 2

  
3
import eu.dnetlib.uoaadmintools.configuration.properties.GoogleConfig;
4
import eu.dnetlib.uoaadmintools.configuration.properties.MailConfig;
5 3
import eu.dnetlib.uoaadmintools.configuration.properties.MongoConfig;
6 4
import eu.dnetlib.uoaadmintools.configuration.properties.SecurityConfig;
5
//import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration;
7 6
import org.springframework.boot.SpringApplication;
8 7
import org.springframework.boot.autoconfigure.SpringBootApplication;
9 8
import org.springframework.boot.context.properties.EnableConfigurationProperties;
9
import org.springframework.context.annotation.Import;
10 10
import org.springframework.context.annotation.PropertySource;
11 11
import org.springframework.context.annotation.PropertySources;
12 12

  
13
@SpringBootApplication
13
@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoaadmintools", "eu.dnetlib.uoaadmintoolslibrary"})
14 14
@PropertySources({
15 15
        @PropertySource("classpath:admintools.properties"),
16 16
        @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
17 17
})
18
@EnableConfigurationProperties({SecurityConfig.class, MailConfig.class, GoogleConfig.class, MongoConfig.class})
18
@EnableConfigurationProperties({SecurityConfig.class, MongoConfig.class})
19
//@Import(AuthorizationConfiguration.class)
19 20
public class UoaAdminToolsApplication {
20 21

  
21 22
    public static void main(String[] args) {

Also available in: Unified diff