Revisions made to the Model Loader to use Babel

Change the Model Loader to use the Babel micro service.
Responsibility for transformation of ASDC TOSCA models,
the yaml files, has been moved from ASDC and placed into
the Bable microservice. Model Loader will forward any
CSAR received from ASDC and delegate transformation to
Babel. Babel will return the transformed TOSCA models
to Model Loader which will then ingest them into the
A&AI Inventory.

Issue-ID: AAI-987

Change-Id: I99594770b51b00cb7dcc0f30706060ae27cd94c5
Signed-off-by: Blackwell, Ian (ib733q) <IanB@amdocs.com>

4 files changed, 40 insertions, 21 deletions

diff --git a/ajsc-shared-config/etc/aft.properties b/ajsc-shared-config/etc/aft.properties
index 1d9229c..ab6d84e 100644
--- a/ajsc-shared-config/etc/aft.properties
+++ b/ajsc-shared-config/etc/aft.properties
@@ -1,4 +1,23 @@
-#Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.
+###
+#  ============LICENSE_START==========================================
+#  org.onap.aai
+#  ===================================================================
+#  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+#  Copyright © 2017-2018 Amdocs
+#  ===================================================================
+#  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============================================
+###
 # Flow test 319
 # The DEFAULT setup for this file is for deployment to soa cloud node which will use the "bundleconfig/etc/spm2.jks" location
 # For Testing Locally, you can set the system property, csiEnable=true, found within bundleconfig-local/etc/sysprops/sys-props.properties
diff --git a/ajsc-shared-config/etc/basic-logback_root_logger_level_off.xml b/ajsc-shared-config/etc/basic-logback_root_logger_level_off.xml
index 4ebe2db..f1dcfee 100644
--- a/ajsc-shared-config/etc/basic-logback_root_logger_level_off.xml
+++ b/ajsc-shared-config/etc/basic-logback_root_logger_level_off.xml
@@ -1,6 +1,23 @@
-<!-- 
- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.
--->
+<!--
+  ============LICENSE_START==========================================
+  org.onap.aai
+  ===================================================================
+  Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+  Copyright © 2017-2018 Amdocs
+  ===================================================================
+  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============================================
+  -->
 <configuration scan="true" scanPeriod="3 seconds" debug="true">
 	<property name="logDirectory" value="${AJSC_HOME}/log" />
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/ajsc-shared-config/etc/logback.xml b/ajsc-shared-config/etc/logback.xml
index d596247..68c805e 100644
--- a/ajsc-shared-config/etc/logback.xml
+++ b/ajsc-shared-config/etc/logback.xml
@@ -55,7 +55,6 @@
 		<appender-ref ref="EELF" />
 	</appender>
 
-
 	<appender name="EELFAudit"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${logDirectory}/${auditLogName}.log</file>
@@ -72,7 +71,6 @@
 		<appender-ref ref="EELFAudit" />
 	</appender>
 
-
 	<appender name="EELFMetrics"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${logDirectory}/${metricsLogName}.log</file>
@@ -89,7 +87,6 @@
 		<appender-ref ref="EELFMetrics" />
 	</appender>
 
-
 	<appender name="EELFDebug"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${logDirectory}/${debugLogName}.log</file>
@@ -107,7 +104,6 @@
 		<includeCallerData>true</includeCallerData>
 	</appender>
 
-
 	<!-- ============================================================================ -->
 	<!-- EELF loggers -->
 	<!-- ============================================================================ -->
@@ -115,19 +111,6 @@
 		<appender-ref ref="asyncEELF" />
 		<appender-ref ref="asyncEELFDebug" />
 	</logger>
-
-	<logger name="com.att.eelf.security" level="info" additivity="false">
-		<appender-ref ref="asyncEELFSecurity" />
-	</logger>
-	<logger name="com.att.eelf.perf" level="info" additivity="false">
-		<appender-ref ref="asyncEELFPerformance" />
-	</logger>
-	<logger name="com.att.eelf.server" level="info" additivity="false">
-		<appender-ref ref="asyncEELFServer" />
-	</logger>
-	<logger name="com.att.eelf.policy" level="info" additivity="false">
-		<appender-ref ref="asyncEELFPolicy" />
-	</logger>
 	<logger name="com.att.eelf.audit" level="info" additivity="false">
 		<appender-ref ref="asyncEELFAudit" />
 	</logger>
diff --git a/ajsc-shared-config/etc/spm2.jks b/ajsc-shared-config/etc/spm2.jks
new file mode 100644
index 0000000..8ff2a00
--- /dev/null
+++ b/ajsc-shared-config/etc/spm2.jks