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>

5 files changed, 7 insertions, 81 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

diff --git a/src/main/resources/bootstrap.properties b/src/main/resources/bootstrap.properties
deleted file mode 100644
index b0cfde570..000000000
--- a/src/main/resources/bootstrap.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-###
-# ============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.
-###
-
-spring.cloud.config.discovery.enabled=false
-spring.cloud.config.enabled=false
-
-# Allow Spring Cloud properties configuration to override properties set from System Properties and ENV Properties
-spring.cloud.config.overrideSystemProperties=true
-
-# Path to the file containing the dynamic logger levels
-com.att.ajsc.dynamic.logging.path=./logging.properties
-
-# File watcher polling frequency in milliseconds
-com.att.ajsc.dynamic.watcher.delay=5000
diff --git a/src/main/resources/clds/clds-reference.properties b/src/main/resources/clds/clds-reference.properties
index 998bf7c72..95ba919c8 100644
--- a/src/main/resources/clds/clds-reference.properties
+++ b/src/main/resources/clds/clds-reference.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");

@@ -88,7 +88,7 @@ sdc.artifactType=DCAE_INVENTORY_BLUEPRINT
 sdc.locationArtifactLabel=locationclampcockpit

 sdc.locationArtifactType=DCAE_INVENTORY_JSON

 sdc.InstanceID=X-ECOMP-InstanceID

-sdc.header.requestId=X-ECOMP-RequestID

+sdc.header.requestId = X-ECOMP-RequestID

 #

 #

 ui.location.default={"DC1":"Data Center 1","DC2":"Data Center 2","DC3":"Data Center 3"}

@@ -106,4 +106,3 @@ DCAE_INVENTORY_URL = http://dcae.api.simpledemo.onap.org:8080
 #DCAE Dispatcher Url Properties

 DCAE_DISPATCHER_URL = http://dcae.api.simpledemo.onap.org:8080

 dcae.header.requestId = X-ECOMP-RequestID
-

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index e02a320d3..b898998c8 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,5 +1,4 @@
 <configuration scan="true" scanPeriod="10 seconds" debug="false">
-		<contextName>${module.ajsc.namespace.name}</contextName>
 		<jmxConfigurator />
 		<property name="logDirectory" value="log" />
 		<!-- Example evaluator filter applied against console appender -->
@@ -149,29 +148,6 @@
 		<logger name="org.springframework.web" level="WARN" />
 		<logger name="com.blog.spring.jms" level="WARN" />
 
-		<!-- AJSC Services (bootstrap services) -->
-		<logger name="ajsc" level="WARN" />
-		<logger name="ajsc.RouteMgmtService" level="INFO" />
-		<logger name="ajsc.ComputeService" level="INFO" />
-		<logger name="ajsc.VandelayService" level="WARN" />
-		<logger name="ajsc.FilePersistenceService" level="WARN" />
-		<logger name="ajsc.UserDefinedJarService" level="WARN" />
-		<logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
-		<logger name="ajsc.LoggingConfigurationService" level="WARN" />
-
-		<!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet 
-				logging) -->
-		<logger name="ajsc.utils" level="WARN" />
-		<logger name="ajsc.utils.DME2Helper" level="INFO" />
-		<logger name="ajsc.filters" level="DEBUG" />
-		<logger name="ajsc.beans.interceptors" level="DEBUG" />
-		<logger name="ajsc.restlet" level="DEBUG" />
-		<logger name="ajsc.servlet" level="DEBUG" />
-		<logger name="com.att" level="WARN" />
-		<logger name="com.att.ajsc.csi.logging" level="DEBUG" />
-		<logger name="com.att.ajsc.filemonitor" level="WARN" />
-		<logger name="com.att.ajsc.introscope" level="info" />
-
 		<!-- Other Loggers that may help troubleshoot -->
 		<logger name="net.sf" level="WARN" />
 		<logger name="org.apache.commons.httpclient" level="WARN" />
diff --git a/src/main/resources/system.properties b/src/main/resources/system.properties
index 9d6386f47..08b9b19c8 100644
--- a/src/main/resources/system.properties
+++ b/src/main/resources/system.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"); 
@@ -29,8 +29,6 @@ com.att.eelf.logging.file=classpath:/logback.xml
 com.att.eelf.logging.path=./
 logging.config=classpath:/logback.xml
 
-com.att.ajsc.app.prop.path=./
-
 #
 # JVM SSL/TLS properties
 jdk.tls.client.protocols=TLSv1.1,TLSv1.2