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>

5 files changed, 66 insertions, 60 deletions

diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy b/src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy
index 32379f7..2fadedd 100644
--- a/src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy
+++ b/src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy
@@ -1,21 +1,22 @@
-/*-

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

  */

 

 beans{

diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/docs/README.txt b/src/main/ajsc/model-loader_v1/model-loader/v1/docs/README.txt
index 508361d..b642878 100644
--- a/src/main/ajsc/model-loader_v1/model-loader/v1/docs/README.txt
+++ b/src/main/ajsc/model-loader_v1/model-loader/v1/docs/README.txt
@@ -1,21 +1,22 @@
-/*-

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

  */

 

 Place any docs here that you want to access within the ajsc upon deployment of your service.

diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/lib/README.txt b/src/main/ajsc/model-loader_v1/model-loader/v1/lib/README.txt
index f80be9b..002a511 100644
--- a/src/main/ajsc/model-loader_v1/model-loader/v1/lib/README.txt
+++ b/src/main/ajsc/model-loader_v1/model-loader/v1/lib/README.txt
@@ -1,21 +1,22 @@
-/*-

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

  */

 

 3rd party JAR's needed by your jars (if any) for a ajsc deployment package go here...

diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/props/module.props b/src/main/ajsc/model-loader_v1/model-loader/v1/props/module.props
index aab4afa..acee82b 100644
--- a/src/main/ajsc/model-loader_v1/model-loader/v1/props/module.props
+++ b/src/main/ajsc/model-loader_v1/model-loader/v1/props/module.props
@@ -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============================================

 ###

 

 EXAMPLE.PROPERTY=EXAMLE_VALUE

diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/routes/modelLoader.route b/src/main/ajsc/model-loader_v1/model-loader/v1/routes/modelLoader.route
index 170c466..0d9f5eb 100644
--- a/src/main/ajsc/model-loader_v1/model-loader/v1/routes/modelLoader.route
+++ b/src/main/ajsc/model-loader_v1/model-loader/v1/routes/modelLoader.route
@@ -1,23 +1,25 @@
 <!--

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

   -->

 

+

 <route xmlns="http://camel.apache.org/schema/spring" trace="true">

   <from uri="att-dme2-servlet:///__module_ajsc_namespace_name__/__module_ajsc_namespace_version__/model-service?matchOnUriPrefix=true" />

   <to uri="cxfbean:modelLoaderServices" />