Configuration cleanup

- Specified explicitly dialect. Used latest compatible dialect for orcl 11g
- Rearrange configurations related to devoracle profile usually used for debugging reported bugs
- Cleaned up redundant configurations
- Muted sql log as it is very noisy. Should be enabled back temporarily to investigate and fix bugs.

crss-admin/crss-admin-dev.yml

@@ -7,10 +7,12 @@ spring:
     driverClassName: org.postgresql.Driver
   jpa:
     database: POSTGRESQL
-    show-sql: true
+    show-sql: false
     hibernate:
       ddl-auto: update
     properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQL94Dialect
       jadira.usertype.autoRegisterUserTypes: true
       javax.persistence.schema-generation.database.action: none
       javax.persistence.schema-generation.create-source: metadata

crss-admin/crss-admin-devoracle.yml

@@ -1,15 +1,49 @@
 spring:
   datasource:
     platform: oracle
-    url: jdbc:oracle:thin:@localhost:1521/xe
-    username: pemccrss
-    password: secretpassword
+    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
+    username: crss_admin
+    password: crss_admin
     driverClassName: oracle.jdbc.OracleDriver
-  jpa:
-    database: ORACLE
-    show-sql: true
-    hibernate:
-      ddl-auto: update
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 20
+  rabbitmq:
+    username: guest
+    password: guest
+    host: localhost
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+
+server:
+  port: 8082
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8082/oauth/authorize
+    resource:
+      userInfoUri: http://localhost:8082/user
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
 
 graylog:
-  host: pemc.integration.exist.com
+  host: localhost
+
+crss:
+  ldap:
+    embedded: true
+    protocol: "ldap"
+    host: "localhost"
+    port: 33389
+    root-dn: "dc=wesmsys,dc=local"
+    ldif: "classpath:embedded-ldap.ldif"
+    user-search-base: ""
+    admin-user: "uid=crssadmin,ou=Administrators,dc=wesmsys,dc=local"
+    admin-password: "1qaz@WSX"
+    username-field: "uid"
+    domain: "wesmsys.local"

crss-admin/crss-admin-staging.yml

@@ -8,8 +8,6 @@ spring:
     hikari:
       connectionTimeout: 10000
       maximumPoolSize: 20
-  jpa:
-    database: ORACLE
   rabbitmq:
       host: pemc-oracle.ss.exist.com
       ports:

crss-admin/crss-admin.yml

@@ -1,8 +1,11 @@
 spring:
   jpa:
+    database: ORACLE
     properties:
+      hibernate:
+        dialect: org.hibernate.dialect.Oracle10gDialect
+        integration.envers.enabled: true
       jadira.usertype.autoRegisterUserTypes: true
-      hibernate.integration.envers.enabled: true
   http:
     multipart:
       maxFileSize: "25Mb"

crss-metering/crss-metering-dev.yml

@@ -7,6 +7,11 @@ spring:
     hikari:
       connectionTimeout: 10000
       maximumPoolSize: 20
+  jpa:
+    database: POSTGRESQL
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQL94Dialect
   rabbitmq:
     username: guest
     password: guest

crss-metering/crss-metering.yml

@@ -8,6 +8,11 @@ spring:
     hikari:
       connectionTimeout: 10000
       maximumPoolSize: 20
+  jpa:
+    database: ORACLE
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.Oracle10gDialect
   rabbitmq:
     host: pemc-oracle.ss.exist.com
     ports:

crss-reg/crss-reg-dev.yml

@@ -7,10 +7,12 @@ spring:
     driverClassName: org.postgresql.Driver
   jpa:
     database: POSTGRESQL
-    show-sql: true
+    show-sql: false
     hibernate:
       ddl-auto: none
     properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQL94Dialect
       jadira.usertype.autoRegisterUserTypes: true
       javax.persistence.schema-generation.database.action: none
       javax.persistence.schema-generation.create-source: metadata

crss-reg/crss-reg-devoracle.yml

@@ -1,16 +1,52 @@
 spring:
-  profiles: devoracle
   datasource:
     platform: oracle
-    url: jdbc:oracle:thin:@localhost:1521/xe
-    username: pemccrss
-    password: secretpassword
+    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
+    username: crss_reg
+    password: crss_reg
     driverClassName: oracle.jdbc.OracleDriver
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 20
   jpa:
-    database: ORACLE
-    show-sql: true
-    hibernate:
-      ddl-auto: update
+    show-sql: false
+  rabbitmq:
+    username: guest
+    password: guest
+    host: localhost
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+  mail:
+    host: smtp.gmail.com
+    port: 587
+    username: demo.exist.pemc@gmail.com
+    # please provide the password
+    password: $pockTest
+    properties:
+      mail.smtp.auth: true
+      mail.debug: true
+      mail.smtp.starttlls.enable: true
+      mail.smtp.starttls.required: true
+  #we dont need spring mvc here
+  freemarker:
+    enabled: false
+    template-loader-path: classpath:/mail/templates
+
+server:
+  port: 8081
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8082/oauth/authorize
+    resource:
+      userInfoUri: http://localhost:8082/user
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
 
 graylog:
-  host: pemc.integration.exist.com
+  host: localhost

crss-reg/crss-reg-staging.yml

@@ -8,8 +8,6 @@ spring:
     hikari:
       connectionTimeout: 10000
       maximumPoolSize: 20
-  jpa:
-    database: ORACLE
   http:
     multipart:
       maxFileSize: "25Mb"

crss-reg/crss-reg.yml

@@ -1,8 +1,12 @@
 spring:
   jpa:
+    database: ORACLE
+    show-sql: false
     properties:
       jadira.usertype.autoRegisterUserTypes: true
-      hibernate.integration.envers.enabled: true
+      hibernate:
+        dialect: org.hibernate.dialect.Oracle10gDialect
+        integration.envers.enabled: true
   http:
     multipart:
       maxFileSize: "25Mb"