Merge "Update CMSO dev project to pass all Robot ETE test"

1 files changed, 7 insertions, 18 deletions

diff --git a/cmso-service/etc/config/cmso.properties b/cmso-service/etc/config/cmso.properties
index 6f50e60..f103c57 100644
--- a/cmso-service/etc/config/cmso.properties
+++ b/cmso-service/etc/config/cmso.properties
@@ -32,18 +32,11 @@
 ###

 

 ### MySQL DB.

-spring.datasource.url=jdbc:mariadb://localhost:3305/cmso

+spring.datasource.url=jdbc:mariadb://localhost:3306/cmso

 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver

-spring.datasource.username=cmso

-cmso.database.password=enc:bfodXf8qRfCqMvlxVBYNWQ==

-

-###

-###

-### H2 DB.

-#spring.datasource.url=jdbc:h2:file:./h2db;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=true;MODE=MYSQL

-#spring.datasource.driver-class-name=org.h2.Driver

-#spring.datasource.username=sa

-#spring.datasource.password=sa

+spring.datasource.username=root

+spring.datasource.password=beer

+cmso.database.password=beer

 

 spring.datasource.initialize=false

 spring.datasource.tomcat.max-wait=10000

@@ -51,23 +44,19 @@ spring.datasource.tomcat.initialSize=5
 spring.datasource.tomcat.max-active=25

 spring.datasource.tomcat.test-on-borrow=true

 

-spring.jpa.show-sql=false

+spring.jpa.show-sql=true

 spring.jpa.hibernate.ddl-auto=none

 spring.jpa.hibernate.naming.strategy=org.hibernate.cfg.EJB3NamingStrategy

 spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect

 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl

+spring.jpa.hibernate.id.new_generator_mappings=false

+hibernate.id.new_generator_mappings=false

 

 logging.level.org.hibernate.SQL=TRACE

 

 logging.level.org.hibernate=TRACE

 

 #

-#@BP.name="Enable AAF authentication"

-#@BP.description="Log level for 

-#@BP.type=enum(true,false)

-##BP.default=true

-#@BP.required=false

-#@BP.volatility=1

 cmso.aaf.enabled=false

 

 # Enable swagger - Enable in development and test only