Restore Swagger

Restore swagger generation at runtime, + Clamp versioning rework + log
level set differently

Issue-ID: CLAMP-169
Change-Id: Ibf9eedb7028dedc610b36546f57ee5b3095cd20d
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

2 files changed, 21 insertions, 5 deletions

diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 7d6ba511f..d9d0f0eed 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -60,7 +60,7 @@ server.port=8080
 ### server.ssl.key-password=mypass

 ### server.http-to-https-redirection.port=8090  <-- The HTTP port

 

-server.contextPath=/

+server.servlet.context-path=/

 #Modified engine-rest applicationpath

 spring.profiles.active=clamp-default,clamp-spring-authentication,clamp-sdc-controller

 

@@ -76,14 +76,16 @@ server.context_parameters.p-name=value #context parameter with p-name as key and
 

 camel.springboot.consumer-template-cache-size=1000

 camel.springboot.producer-template-cache-size=1000

-camel.springboot.jmx-enabled=false

+# JMX enabled to have Camel Swagger runtime working

+camel.springboot.jmx-enabled=true

 camel.defaultthreadpool.poolsize=10

 camel.defaultthreadpool.maxpoolsize=20

 camel.defaultthreadpool.maxqueuesize=1000

 camel.defaultthreadpool.keepaliveTime=60

 camel.defaultthreadpool.rejectpolicy=CallerRuns

 #camel.springboot.xmlRoutes = false

-camel.springboot.xmlRoutes=classpath:/clds/camel/*.xml

+camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml

+camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml

 #camel.springboot.typeConversion = false

 

 #clds datasource connection details

diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
index c503b531f..853466e1a 100644
--- a/src/test/resources/https/https-test.properties
+++ b/src/test/resources/https/https-test.properties
@@ -55,9 +55,9 @@ server.http-to-https-redirection.port=10080
 ### server.ssl.key-password=mypass
 ### server.http-to-https-redirection.port=8090  <-- The HTTP port
 
-server.contextPath=/
+server.servlet.context-path=/
 #Modified engine-rest applicationpath
-spring.profiles.active=clamp-default,clamp-spring-authentication
+spring.profiles.active=clamp-default,clamp-default-user
 
 #clds datasource connection details
 spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver
@@ -73,3 +73,17 @@ spring.datasource.cldsdb.initialSize=0
 # Automatically test whether a connection provided is good or not
 spring.datasource.cldsdb.testOnBorrow=true
 spring.datasource.cldsdb.ignoreExceptionOnPreLoad=true
+
+camel.springboot.consumer-template-cache-size=1000
+camel.springboot.producer-template-cache-size=1000
+# JMX enabled to have Camel Swagger runtime working
+camel.springboot.jmx-enabled=true
+camel.defaultthreadpool.poolsize=10
+camel.defaultthreadpool.maxpoolsize=20
+camel.defaultthreadpool.maxqueuesize=1000
+camel.defaultthreadpool.keepaliveTime=60
+camel.defaultthreadpool.rejectpolicy=CallerRuns
+#camel.springboot.xmlRoutes = false
+camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
+camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
+#camel.springboot.typeConversion = false