Remove AJSC container.

Remove AJSC container and adapt the dependencies & unit tests

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

1 files changed, 4 insertions, 17 deletions

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 321d88e17..1db0875a3 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================

 # ONAP CLAMP

 # ================================================================================

-# Copyright (C) 2017 AT&T Intellectual Property. All rights

+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights

 #                             reserved.

 # ================================================================================

 # Licensed under the Apache License, Version 2.0 (the "License");

@@ -62,7 +62,8 @@ server.port=8080
 

 server.contextPath=/

 #Modified engine-rest applicationpath

-spring.jersey.application-path=/engine-rest

+#camel.component.servlet.mapping.context-path=/restservices/clds/v1/*

+spring.jersey.application-path=/restservices/clds/v1

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

 

 #The max number of active threads in this pool

@@ -72,11 +73,6 @@ server.tomcat.min-Spare-Threads=25
 #The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads

 server.tomcat.max-idle-time=60000

 

-

-#Add this properties only if you want to change the URL, AJSC Framework interceptors will intercept

-#com.att.ajsc.common.interceptors.PreInterceptor.url=/**

-#com.att.ajsc.common.interceptors.PostInterceptor.url=/**

-

 #Servlet context parameters

 server.context_parameters.p-name=value #context parameter with p-name as key and value as value.

 

@@ -89,8 +85,6 @@ camel.defaultthreadpool.maxqueuesize=1000
 camel.defaultthreadpool.keepaliveTime=60

 camel.defaultthreadpool.rejectpolicy=CallerRuns

 

-kubernetes.namespace=com-att-ajsc

-

 #server.port=0

 #Camunda Process Engine DataSource connection Details

 spring.datasource.camunda.driverClassName=org.mariadb.jdbc.Driver

@@ -111,7 +105,7 @@ spring.datasource.camunda.ignoreExceptionOnPreLoad=true
 #Camunda history level

 camunda.bpm.history-level=auto

 camunda.bpm.database.type=mariadb

-camunda.bpm.database.schema-update=false

+camunda.bpm.database.schema-update=true

 

 #clds datasource connection details

 spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver

@@ -133,13 +127,6 @@ async.core.pool.size=10
 async.max.pool.size=20

 async.queue.capacity=500

 

-#GRM Edge endpoint details

-service.name=ajsc6camundademo

-service.version=1.0.0.0

-routeoffer=TEST

-#Update with your application name

-application.name=AJSC6CAMUNDA

-

 org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.properties

 org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties

 org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json