Skip to content

Commit 67df494

Browse files
authored
moved ldap related functionality to shared (#62)
1 parent 3e4f983 commit 67df494

File tree

7 files changed

+36
-98
lines changed

7 files changed

+36
-98
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 0.7.9
2+
- Moved ldap related functionality to shared
3+
14
## 0.7.8
25
- Added HttpStatus codes for generated ouput
36

build.gradle

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ repositories {
1818
maven { url "https://jitpack.io" }
1919
}
2020

21-
21+
ext {
22+
sprintBootVersion = "1.4.1.RELEASE"
23+
}
2224
//Adding dependencies and sub projects common build script
2325
subprojects {
2426
buildscript {
@@ -30,17 +32,13 @@ subprojects {
3032
}
3133
}
3234

33-
ext {
34-
sprintBootVersion = "1.4.1.RELEASE"
35-
}
36-
3735
apply plugin:'java'
3836

3937
sourceCompatibility = 1.8
4038
targetCompatibility = 1.8
4139

4240
//Latest version for generate
43-
version = "0.7.8"
41+
version = "0.7.9"
4442

4543
repositories {
4644
mavenCentral()
@@ -49,7 +47,7 @@ subprojects {
4947

5048
dependencies {
5149
//Injectable Message Library and its Implementation
52-
compile ('com.github.Ericsson:eiffel-remrem-shared:0.3.0')
50+
compile ('com.github.Ericsson:eiffel-remrem-shared:0.3.1')
5351
compile ('com.github.Ericsson:eiffel-remrem-semantics:0.2.3')
5452
compile ('com.github.Ericsson:eiffel-remrem-protocol-interface:0.0.1')
5553

service/src/main/java/com/ericsson/eiffel/remrem/generate/App.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,24 @@
66
import org.springframework.boot.web.support.SpringBootServletInitializer;
77
import org.springframework.context.ApplicationContext;
88
import org.springframework.context.annotation.ComponentScan;
9+
import org.springframework.context.annotation.PropertySource;
10+
import org.springframework.context.annotation.PropertySources;
911

1012
//import com.ericsson.eiffel.remrem.generate.config.SpringLoggingInitializer;
1113

1214
@SpringBootApplication
1315
@ComponentScan("com.ericsson.eiffel.remrem")
14-
public class App extends SpringBootServletInitializer{
16+
@PropertySources({ @PropertySource("classpath:config.properties"),
17+
@PropertySource(value = "file:${catalina.home}/conf/config.properties", ignoreResourceNotFound = true) })
18+
public class App extends SpringBootServletInitializer {
1519

1620
public static void main(String[] args) {
1721
startService(args);
1822
}
1923

2024
private static void startService(String[] args) {
2125
SpringApplication application = new SpringApplication(App.class);
22-
// application.addInitializers(new SpringLoggingInitializer());
26+
// application.addInitializers(new SpringLoggingInitializer());
2327
application.setBannerMode(Banner.Mode.OFF);
2428
application.setLogStartupInfo(false);
2529
application.setWebEnvironment(true);

service/src/main/java/com/ericsson/eiffel/remrem/generate/config/DisabledSecurityConfig.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

service/src/main/java/com/ericsson/eiffel/remrem/generate/config/SecurityConfig.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

service/src/main/resources/application.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#server.port=8080
2+
3+
debug: false
4+
5+
#Logging configurations
6+
7+
logging.level.root: ERROR
8+
logging.level.org.springframework.web: ERROR
9+
logging.level.com.ericsson.eiffel.remrem.producer: ERROR
10+
11+
#spring configurations
12+
13+
spring.http.converters.preferred-json-mapper: gson
14+
org.springframework.boot.logging.LoggingSystem: none
15+
16+
#Ldap authentication configurations
17+
18+
activedirectory.enabled:false
19+
activedirectory.ldapUrl :
20+
activedirectory.ldapPassword :
21+
activedirectory.managerDn:
22+
activedirectory.userSearchFilter:

0 commit comments

Comments
 (0)