Revision 59812
Added by Konstantina Galouni over 3 years ago
| UoaMonitorServiceApplication.java | ||
|---|---|---|
| 1 | 1 |
package eu.dnetlib.uoamonitorservice; |
| 2 | 2 |
|
| 3 |
import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration; |
|
| 3 | 4 |
import eu.dnetlib.uoamonitorservice.configuration.properties.MongoConfig; |
| 4 |
import eu.dnetlib.uoamonitorservice.configuration.properties.SecurityConfig; |
|
| 5 | 5 |
import org.springframework.boot.SpringApplication; |
| 6 | 6 |
import org.springframework.boot.autoconfigure.SpringBootApplication; |
| 7 | 7 |
import org.springframework.boot.context.properties.EnableConfigurationProperties; |
| 8 |
import org.springframework.context.annotation.Import; |
|
| 8 | 9 |
import org.springframework.context.annotation.PropertySource; |
| 9 | 10 |
import org.springframework.context.annotation.PropertySources; |
| 10 | 11 |
//uoahelptexts |
| 11 |
@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoamonitorservice", "eu.dnetlib.uoaadmintoolslibrary"})
|
|
| 12 |
@SpringBootApplication(scanBasePackages = {"eu.dnetlib.uoamonitorservice", "eu.dnetlib.uoaadmintoolslibrary"
|
|
| 13 |
// , "eu.dnetlib.uoaauthorizationlibrary" |
|
| 14 |
}) |
|
| 12 | 15 |
@PropertySources({
|
| 16 |
@PropertySource("classpath:authorization.properties"),
|
|
| 13 | 17 |
@PropertySource("classpath:monitorservice.properties"),
|
| 14 |
// @PropertySource(value = "file:/usr/share/tomcat7/lib/dnet-override.properties", ignoreResourceNotFound = true), |
|
| 15 |
// @PropertySource(value = "file:/var/lib/tomcat_dnet/8380/lib/dnet-override.properties", ignoreResourceNotFound = true), |
|
| 16 |
// @PropertySource(value = "file:/var/lib/tomcat8/lib/dnet-override.properties", ignoreResourceNotFound = true) |
|
| 17 |
@PropertySource("classpath:dnet-override.properties")
|
|
| 18 |
@PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true) |
|
| 18 | 19 |
}) |
| 19 | 20 |
|
| 20 |
@EnableConfigurationProperties({SecurityConfig.class, MongoConfig.class})
|
|
| 21 |
//SecurityConfig.class, |
|
| 22 |
@EnableConfigurationProperties({ MongoConfig.class})
|
|
| 21 | 23 |
|
| 24 |
@Import(AuthorizationConfiguration.class) |
|
| 22 | 25 |
public class UoaMonitorServiceApplication {
|
| 23 | 26 |
public static void main(String[] args) {
|
| 24 | 27 |
SpringApplication.run(UoaMonitorServiceApplication.class, args); |
Also available in: Unified diff
[Trunk | Monitor Service]: uoa-authorization-library dependency added:
1. pom.xml: Added dependencies for spring security and for uoa-authorization-library | [Bug fix] spring boot version set to 1.5.8 (it was accidentally set to 1.5.18 and library was not compatible).
2. UoaMonitorServiceApplication.java: Added authorization.properties | Remove SecurityConfig from configuration (done by authorization library) | import AuthorizationConfiguration.
3. ExceptionsHandler.java: Add handler for AccessDeniedException.
4. monitorservice.properties: Remove security properties (and add missing properties for mongodb).
5. UoaMonitorServiceConfiguration.java: Remove interceptor for AuthorizationHandler.
6. SecurityConfig.java & AuthorizationHandler.java & AuthorizationUtils.java: Removed unnecessary files (authorization is done via authorization library).