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, 51 insertions, 54 deletions

diff --git a/src/main/config/ajsc-jetty.xml b/src/main/config/ajsc-jetty.xml
index f0f1e1f..dd612fa 100644
--- a/src/main/config/ajsc-jetty.xml
+++ b/src/main/config/ajsc-jetty.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0"  encoding="UTF-8"?>
 <!--
-  ============LICENSE_START=======================================================
-  MODEL LOADER SERVICE
-  ================================================================================
-  Copyright (C) 2017 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
-  
+
+         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=========================================================
+  ============LICENSE_END============================================
   -->
 
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
@@ -35,7 +36,7 @@
 				<Set name="startWithUnavailable">false</Set>
 			</New>
 		</Set>
-		<Set name="extraClasspath"><SystemProperty name="AJSC_HOME" />/extJars/httpclient-4.5.jar,<SystemProperty name="AJSC_HOME" />/extJars/httpcore-4.4.1.jar,<SystemProperty name="AJSC_HOME" />/extJars/json-20131018.jar</Set>

+		<Set name="extraClasspath"><SystemProperty name="AJSC_HOME" />/extJars/httpclient-4.5.jar,<SystemProperty name="AJSC_HOME" />/extJars/httpcore-4.4.1.jar,<SystemProperty name="AJSC_HOME" />/extJars/json-20131018.jar</Set>
 	</New>
 	
 	<Set name="handler">
diff --git a/src/main/config/ajsc-override-web.xml b/src/main/config/ajsc-override-web.xml
index b0d44f3..f5d7863 100644
--- a/src/main/config/ajsc-override-web.xml
+++ b/src/main/config/ajsc-override-web.xml
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>

 <!--

-  ============LICENSE_START=======================================================
-  MODEL LOADER SERVICE
-  ================================================================================
-  Copyright (C) 2017 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

-  

+

+         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=========================================================

+  limitations under the License.

+  ============LICENSE_END============================================

   -->

 

-<!-- 

- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.

--->

-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"

 	metadata-complete="false" version="3.0">

 

diff --git a/src/main/config/jul-redirect.properties b/src/main/config/jul-redirect.properties
index b94397e..d7406e3 100644
--- a/src/main/config/jul-redirect.properties
+++ b/src/main/config/jul-redirect.properties
@@ -1,21 +1,22 @@
 ###

-# ============LICENSE_START=======================================================
-# MODEL LOADER SERVICE
-# ================================================================================
-# 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=========================================================

+#  ============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============================================

 ###

 

 #  	Bridge JUL->slf4j Logging Configuration File

diff --git a/src/main/config/runner-web.xml b/src/main/config/runner-web.xml
index 99d9191..198e2e9 100644
--- a/src/main/config/runner-web.xml
+++ b/src/main/config/runner-web.xml
@@ -1,27 +1,25 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>

 <!--

-  ============LICENSE_START=======================================================
-  MODEL LOADER SERVICE
-  ================================================================================
-  Copyright (C) 2017 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

-  

+

+         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=========================================================

+  limitations under the License.

+  ============LICENSE_END============================================

   -->

 

-<!-- 

- Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.

--->

 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

 	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"

 	metadata-complete="false" version="3.0">