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>

4 files changed, 14 insertions, 75 deletions

diff --git a/src/test/java/org/onap/clamp/clds/AbstractItCase.java b/src/test/java/org/onap/clamp/clds/AbstractItCase.java
index d3f64240d..2903248b6 100644
--- a/src/test/java/org/onap/clamp/clds/AbstractItCase.java
+++ b/src/test/java/org/onap/clamp/clds/AbstractItCase.java
@@ -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");
@@ -33,13 +33,12 @@ import org.springframework.test.context.ActiveProfiles;
 public abstract class AbstractItCase {
 
     @Autowired
-    protected RefProp      refProp;
+    protected RefProp refProp;
     @Autowired
     protected PolicyClient policyClient;
 
     @BeforeClass
     public static void oneTimeSetUp() {
-        System.setProperty("AJSC_CONF_HOME", System.getProperty("user.dir") + "/src/it/resources/");
         System.setProperty("CLDS_DCAE_URL", "http://localhost:13786/cl-dcae-services");
     }
 }
diff --git a/src/test/resources/application-no-camunda.properties b/src/test/resources/application-no-camunda.properties
index ece42484e..f7b2badef 100644
--- a/src/test/resources/application-no-camunda.properties
+++ b/src/test/resources/application-no-camunda.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");
@@ -35,7 +35,6 @@ server.port=10443
 server.ssl.key-store=classpath:https/keystore-test.jks
 server.ssl.key-store-password=testpass
 server.ssl.key-password=testpass
-spring.autoconfigure.exclude=com.att.ajsc.camunda.config.CamundaBpmWebappInitializer,com.att.ajsc.camunda.config.CamundaBpmWebappAutoConfiguration
 ### In order to be user friendly when HTTPS is enabled, 
 ### you can add another HTTP port that will be automatically redirected to HTTPS
 ### by enabling this parameter (server.http.port) and set it to another port (80 or 8080, 8090, etc ...)
@@ -62,7 +61,7 @@ spring.autoconfigure.exclude=com.att.ajsc.camunda.config.CamundaBpmWebappInitial
 
 server.contextPath=/
 #Modified engine-rest applicationpath
-spring.jersey.application-path=/engine-rest
+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 +71,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 +83,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
@@ -110,13 +102,16 @@ spring.datasource.camunda.ignoreExceptionOnPreLoad=true
 
 #Camunda application properties
 #Camunda history level
-camunda.bpm.history-level=auto
+camunda.bpm.history-level=none
 camunda.bpm.enabled=false
+camunda.bpm.jpa.enabled=false
 camunda.bpm.auto-deployment-enabled=false
 camunda.bpm.job-execution.active=false
 camunda.bpm.job-execution.enabled=false
 camunda.bpm.management.health.camunda.enabled=false
 camunda.bpm.metrics.enabled=false
+camunda.bpm.management.health.camunda.enabled=false
+camunda.bpm.database.schema-update=true
 
 #clds datasource connection details
 spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver
@@ -138,13 +133,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
diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
index bd84242ef..54005ef2c 100644
--- a/src/test/resources/https/https-test.properties
+++ b/src/test/resources/https/https-test.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,7 @@ server.http-to-https-redirection.port=10080
 
 server.contextPath=/
 #Modified engine-rest applicationpath
-spring.jersey.application-path=/engine-rest
+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 +72,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 +84,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
@@ -110,13 +103,16 @@ spring.datasource.camunda.ignoreExceptionOnPreLoad=true
 
 #Camunda application properties
 #Camunda history level
-camunda.bpm.history-level=auto
+camunda.bpm.history-level=none
 camunda.bpm.enabled=false
+camunda.bpm.jpa.enabled=false
 camunda.bpm.auto-deployment-enabled=false
 camunda.bpm.job-execution.active=false
 camunda.bpm.job-execution.enabled=false
 camunda.bpm.management.health.camunda.enabled=false
 camunda.bpm.metrics.enabled=false
+camunda.bpm.management.health.camunda.enabled=false
+camunda.bpm.database.schema-update=true
 
 #clds datasource connection details
 spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver
@@ -138,13 +134,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
diff --git a/src/test/resources/processes.xml b/src/test/resources/processes.xml
deleted file mode 100644
index fddc60d1b..000000000
--- a/src/test/resources/processes.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ONAP CLAMP
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-                              reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License"); 
-  you may not use this file except in compliance with the License. 
-  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software 
-  distributed under the License is distributed on an "AS IS" BASIS, 
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-  See the License for the specific language governing permissions and 
-  limitations under the License.
-  ============LICENSE_END============================================
-  ===================================================================
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
-  -->
-
-<process-application
-	xmlns="http://www.camunda.org/schema/1.0/ProcessApplication" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	<process-archive name="example-process-archive">
-		<process-engine>default</process-engine>
-		<resource>bpmn/log-message.bpmn</resource>		
-		<properties>
-			<property name="isDeleteUponUndeploy">true</property>
-			<property name="isScanForProcessDefinitions">false</property>
-		</properties>
-	</process-archive>
-
-</process-application>