Merge remote-tracking branch 'origin/master'

crss-admin/crss-admin-pemc-ldap.yml

@@ -0,0 +1,13 @@
+crss:
+  ldap:
+    protocol: "ldap"
+    host: "192.168.1.105"
+    port: 389
+    root-dn: "dc=wesmlocal,dc=dev"
+    user-search-base: ""
+    admin-user: "WESMDEV\\crssadmin"
+    admin-password: "Pemc1234"
+    username-field: "userPrincipalName"
+    domain: "wesmlocal.dev"
+    embedded: false
+    passwordOpEnabled: false

crss-admin/crss-admin-pemc-staging.yml

@@ -1,4 +1,5 @@
 spring:
+  profiles.include: embedded-ldap
   jpa:
     database: ORACLE
     properties:
@@ -12,17 +13,4 @@ spring:
     driverClassName: oracle.jdbc.OracleDriver
     hikari:
       connectionTimeout: 10000
-      maximumPoolSize: 20
-crss:
-  ldap:
-    protocol: "ldap"
-    host: "192.168.1.105"
-    port: 389
-    root-dn: "dc=wesmlocal,dc=dev"
-    user-search-base: ""
-    admin-user: "WESMDEV\\crssadmin"
-    admin-password: "Pemc1234"
-    username-field: "userPrincipalName"
-    domain: "wesmlocal.dev"
-    embedded: false
-    passwordOpEnabled: false
+      maximumPoolSize: 20

crss-sched/crss-sched.yml

@@ -57,4 +57,22 @@ spring:
     database: POSTGRESQL
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQL94Dialect
+        dialect: org.hibernate.dialect.PostgreSQL94Dialect
+
+---
+spring:
+  profiles: pemc-staging
+  jpa:
+    database: ORACLE
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.Oracle10gDialect
+  datasource:
+    platform: oracle
+    url: jdbc:oracle:thin:@//192.168.43.62:1522/STLDB1
+    username: crss_scheduler
+    password: crss_scheduler
+    driverClassName: oracle.jdbc.OracleDriver
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 20