From 5a6a6de6f1a26a1897e4917a0df613e25a24eb70 Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Mon, 30 Jul 2018 15:56:09 -0400
Subject: Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../src/main/resources/AllottedResource.hbm.xml    | 52 -------------
 .../AllottedResourceCustomization.hbm.xml          | 71 ------------------
 mso-catalog-db/src/main/resources/ArRecipe.hbm.xml | 62 ---------------
 .../src/main/resources/HeatEnvironment.hbm.xml     | 50 -------------
 .../src/main/resources/HeatFiles.hbm.xml           | 49 ------------
 .../src/main/resources/HeatNestedTemplate.hbm.xml  | 38 ----------
 .../src/main/resources/HeatTemplate.hbm.xml        | 85 ---------------------
 .../src/main/resources/ModelRecipe.hbm.xml         | 87 ----------------------
 .../src/main/resources/NetworkRecipe.hbm.xml       | 61 ---------------
 .../src/main/resources/NetworkResource.hbm.xml     | 55 --------------
 .../resources/NetworkResourceCustomization.hbm.xml | 46 ------------
 mso-catalog-db/src/main/resources/Service.hbm.xml  | 63 ----------------
 .../src/main/resources/ServiceRecipe.hbm.xml       | 54 --------------
 .../resources/ServiceToAllottedResources.hbm.xml   | 41 ----------
 .../src/main/resources/ServiceToNetworks.hbm.xml   | 41 ----------
 .../ServiceToResourceCustomization.hbm.xml         | 39 ----------
 .../TempNetworkHeatTemplateLookup.hbm.xml          | 41 ----------
 .../src/main/resources/ToscaCsar.hbm.xml           | 45 -----------
 mso-catalog-db/src/main/resources/VfModule.hbm.xml | 44 -----------
 .../main/resources/VfModuleCustomization.hbm.xml   | 59 ---------------
 .../src/main/resources/VfModuleToHeatFiles.hbm.xml | 36 ---------
 .../src/main/resources/VnfComponent.hbm.xml        | 43 -----------
 .../src/main/resources/VnfComponentsRecipe.hbm.xml | 55 --------------
 .../src/main/resources/VnfRecipe.hbm.xml           | 68 -----------------
 .../resources/VnfResCustomToVfModuleCustom.hbm.xml | 39 ----------
 .../src/main/resources/VnfResource.hbm.xml         | 56 --------------
 .../resources/VnfResourceCustomization.hbm.xml     | 53 -------------
 .../resources/hibernate-catalog-core-mysql.cfg.xml | 65 ----------------
 28 files changed, 1498 deletions(-)
 delete mode 100644 mso-catalog-db/src/main/resources/AllottedResource.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/ArRecipe.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/HeatFiles.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/Service.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/ServiceToResourceCustomization.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/VfModule.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/VfModuleCustomization.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/VnfComponent.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/VnfResource.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
 delete mode 100644 mso-catalog-db/src/main/resources/hibernate-catalog-core-mysql.cfg.xml

(limited to 'mso-catalog-db/src/main/resources')

diff --git a/mso-catalog-db/src/main/resources/AllottedResource.hbm.xml b/mso-catalog-db/src/main/resources/AllottedResource.hbm.xml
deleted file mode 100644
index 0c61b5f614..0000000000
--- a/mso-catalog-db/src/main/resources/AllottedResource.hbm.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated Mar 29, 2017 4:25:31 PM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-    <class name="org.openecomp.mso.db.catalog.beans.AllottedResource" table="ALLOTTED_RESOURCE">
-        <id name="modelUuid" type="java.lang.String"  length="200">
-            <column name="MODEL_UUID" />
-            <generator class="assigned" />
-        </id>
-        <property name="modelInvariantUuid" type="java.lang.String" length="200" not-null="true">
-            <column name="MODEL_INVARIANT_UUID" />
-        </property>
-        <property name="modelVersion" type="java.lang.String" length="20" not-null="true">
-            <column name="MODEL_VERSION" />
-        </property>
-        <property name="modelName" type="java.lang.String" length="200" not-null="true">
-            <column name="MODEL_NAME" />
-        </property>
-        <property name="toscaNodeType" type="java.lang.String" length="200">
-            <column name="TOSCA_NODE_TYPE" />
-        </property>
-        <property name="subcategory" type="java.lang.String" length="200">
-            <column name="SUBCATEGORY" />
-        </property>
-        <property name="description" type="java.lang.String" length="1200">
-            <column name="DESCRIPTION" />
-        </property>
-        <property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-    </class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
deleted file mode 100644
index 2154928a84..0000000000
--- a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated Dec 14, 2016 10:57:53 AM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-    <class name="org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization"
-    table="ALLOTTED_RESOURCE_CUSTOMIZATION">
-        <id name="modelCustomizationUuid" type="java.lang.String">
-            <column name="MODEL_CUSTOMIZATION_UUID" length="200"/>
-            <generator class="assigned" />
-        </id>
-        <property name="modelInstanceName" type="java.lang.String" length="200" not-null="true">
-            <column name="MODEL_INSTANCE_NAME" />
-        </property>
-        <property name="arModelUuid" type="java.lang.String" length="200" not-null="true">
-            <column name="AR_MODEL_UUID" />
-        </property>
-        <property name="providingServiceModelInvariantUuid" type="java.lang.String" length="200">
-            <column name="PROVIDING_SERVICE_MODEL_INVARIANT_UUID" />
-        </property>
-        <property name="targetNetworkRole" type="java.lang.String" length="200">
-            <column name="TARGET_NETWORK_ROLE" />
-        </property>
-        <property name="nfFunction" type="java.lang.String" length="200">
-            <column name="NF_FUNCTION" />
-        </property>
-        <property name="nfType" type="java.lang.String" length="200">
-            <column name="NF_TYPE" />
-        </property>
-        <property name="nfRole" type="java.lang.String" length="200">
-            <column name="NF_ROLE" />
-        </property>
-        <property name="nfNamingCode" type="java.lang.String" length="200">
-            <column name="NF_NAMING_CODE" />
-        </property>
-        <property name="minInstances" type="java.lang.Integer">
-            <column name="MIN_INSTANCES" />
-        </property>
-        <property name="maxInstances" type="java.lang.Integer">
-            <column name="MAX_INSTANCES" />
-        </property>
-        <property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-        <property name="providingServiceModelUuid" type="java.lang.String" length="200">
-            <column name="PROVIDING_SERVICE_MODEL_UUID" />
-        </property>
-        <property name="providingServiceModelName" type="java.lang.String" length="200">
-            <column name="PROVIDING_SERVICE_MODEL_NAME" />
-        </property>
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/ArRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ArRecipe.hbm.xml
deleted file mode 100644
index a840093561..0000000000
--- a/mso-catalog-db/src/main/resources/ArRecipe.hbm.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 Huawei Technologies Co., Ltd. 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=========================================================
- */
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="ArRecipe" table="AR_RECIPE">
-		<meta attribute="class-description">
-			This class describes a AR recipe
-		</meta>
-		
-		<id name="id" type="int" column="id">
-			<generator class="native"/>
-		</id>
-
-		<properties name="uk_ar_recipe" unique="true">
-			<property name="modelName" type="string" >
-			     <column name="MODEL_NAME" not-null="true" length="20"/>
-			</property>
-			<property name="action" type="string" >
-			     <column name="ACTION" not-null="true" length="40"/>
-			</property>
-			<property name="version" type="string">
-			     <column name="VERSION_STR" not-null="true" length="20"/>
-			</property>
-			
-		</properties>
-		
-		<property name="serviceType" type="string" length="45">
-                 <column name="SERVICE_TYPE" not-null="false" length="45"/>
-        </property>
-		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-		<property name="orchestrationUri" type="string">
-		  <column name="ORCHESTRATION_URI" not-null="true" length="256"/>
-		</property>
-		<property name="paramXSD" column="AR_PARAM_XSD" type="string" length="2048"/>
-		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-	</class>
-	
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml b/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
deleted file mode 100644
index b2c94e8776..0000000000
--- a/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated Aug 6, 2015 1:11:38 PM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-    <class name="org.openecomp.mso.db.catalog.beans.HeatEnvironment" table="HEAT_ENVIRONMENT">
-		<meta attribute="class-description">
-			This class describes a HEAT Environment
-		</meta>
-		<id name="artifactUuid" type="string" column="ARTIFACT_UUID" length="200">
-		    <generator class="assigned" />
-		</id>
-			<property name="name" type="string" >
-			     <column name="NAME" length="100" not-null="true"/>
-			</property>
-			<property name="version" type="string" >
-			      <column name="VERSION" length="20" not-null="true"/>
-			</property>
-		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-		<property name="environment" type="text">
-		      <column name="BODY" not-null="true"/>
-		</property>
-		<property name="created" type="timestamp" generated="insert" insert="false" update="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-		<property name="artifactChecksum" type="string">
-		  <column name="ARTIFACT_CHECKSUM" length="200" default="'MANUAL RECORD'" not-null="false"/>
-		</property>
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml b/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml
deleted file mode 100644
index 5a2c4aa537..0000000000
--- a/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated Mar 31, 2017 3:39:01 PM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-    <class name="org.openecomp.mso.db.catalog.beans.HeatFiles" table="HEAT_FILES">
-        <id name="artifactUuid" type="java.lang.String" length="200">
-            <column name="ARTIFACT_UUID" />
-            <generator class="assigned" />
-        </id>
-        <property name="description" type="java.lang.String" length="1200">
-            <column name="DESCRIPTION" />
-        </property>
-        <property name="fileName" type="java.lang.String" length="200" not-null="true">
-            <column name="NAME" />
-        </property>
-        <property name="version" type="java.lang.String" length="20" not-null="true">
-            <column name="VERSION" />
-        </property>
-        <property name="fileBody" type="text" not-null="true">
-            <column name="BODY" />
-        </property>
-        <property name="created" type="java.sql.Timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-        <property name="artifactChecksum" type="java.lang.String" length="200" not-null="true">
-            <column name="ARTIFACT_CHECKSUM"/>
-        </property>
-    </class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml b/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml
deleted file mode 100644
index a2c590f563..0000000000
--- a/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="HeatNestedTemplate" table="HEAT_NESTED_TEMPLATE">
-		<meta attribute="class-description">
-			This class describes a nested HEAT template relationship
-		</meta>
-		
-		<composite-id>
-			<key-property name="parentTemplateId" column="PARENT_HEAT_TEMPLATE_UUID" type="string" length="200"/>
-			<key-property name="childTemplateId" column="CHILD_HEAT_TEMPLATE_UUID" type="string" length="200"/>
-		</composite-id> 
-				
-		<property name="providerResourceFile" column="PROVIDER_RESOURCE_FILE" type="string" length="100"/>
-		
-	</class>
-	
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml b/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
deleted file mode 100644
index 2fb64aa20d..0000000000
--- a/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="HeatTemplate" table="HEAT_TEMPLATE">
-		<meta attribute="class-description">
-			This class describes a HEAT template
-		</meta>
-
-		<id name="artifactUuid" type="string" column="ARTIFACT_UUID" length="200">
-		            <generator class="assigned" />
-		</id>
-
-			<property name="templateName" type="string" >
-			<column name="NAME" length="200" not-null="true"/>
-			</property>
-			<property name="version" type="string" >
-			     <column name="VERSION" length="20" not-null="true"/>
-			</property>
-
-		<property name="templateBody" type="text">
-		   <column name="BODY" not-null="true"/>
-		</property>
-		<property name="timeoutMinutes" column="TIMEOUT_MINUTES" type="int"/>
-		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-		<property name="artifactChecksum" type="string">
-		  <column name="ARTIFACT_CHECKSUM" length="200" default="'MANUAL RECORD'" not-null="true"/>
-		</property>
-		<set name="parameters" inverse="true" cascade="all">
-			<key column="HEAT_TEMPLATE_ARTIFACT_UUID"/>
-			<one-to-many class="HeatTemplateParam"/>
-		</set>
-		
-
-	</class>
-
-	<class name="HeatTemplateParam" table="HEAT_TEMPLATE_PARAMS">
-		<meta attribute="class-description">
-			This class describes an input parameter to a heat template
-		</meta>
-
-		<composite-id>
-			<key-property name="heatTemplateArtifactUuid" column="HEAT_TEMPLATE_ARTIFACT_UUID" type="string" />
-			<key-property name="paramName" column="PARAM_NAME" type="string" />
-		</composite-id> 
-
-		<properties name="uk_heat_params" unique="true">
-			<property name="heatTemplateArtifactUuid" type="string" insert="false" update="false">
-			     <column name="HEAT_TEMPLATE_ARTIFACT_UUID" not-null="true"/>
-			</property>
-			<property name="paramName" type="string"  insert="false" update="false">
-			     <column name="PARAM_NAME" length="100" not-null="true" />
-			</property>
-		</properties>
-		<property name="required" type="boolean">
-		  <column name="IS_REQUIRED" not-null="true"/>
-		</property>
-		<property name="paramType" column="PARAM_TYPE" type="string" length="20"/>
-		<property name="paramAlias" column="PARAM_ALIAS" type="string" length="45"/>
-	</class>
-	
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
deleted file mode 100644
index 4a0b5fbf2a..0000000000
--- a/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="Model" table="MODEL">
-		<meta attribute="class-description">
-			This class describes a Model that may be orchestrated
-		</meta>
-
-		<id name="id" type="int" column="id">
-			<generator class="native"/>
-		</id>
-
-		<properties name="uk1_model" unique="true">
-			<property name="modelType" type="string">
-			     <column name="MODEL_TYPE" not-null="true" length="20"/>
-			</property>
-			<property name="modelVersionId" type="string">
-			     <column name="MODEL_VERSION_ID" not-null="true" length="40"/>
-			</property>
-		</properties>
-		<property name="modelInvariantId" column="MODEL_INVARIANT_ID" type="string" length="40"/>
-		<property name="modelName" type="string">
-          <column name="MODEL_NAME" not-null="true" length="40"/>
-        </property>
-		<property name="modelVersion" column="MODEL_VERSION" type="string" length="20"/>
-		<property name="modelCustomizationId" column="MODEL_CUSTOMIZATION_ID" type="string" length="40"/>
-		<property name="modelCustomizationName" column="MODEL_CUSTOMIZATION_NAME" type="string" length="40"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-
-		<map name="recipes" cascade="all">
-			<key column="MODEL_ID"/>
-			<map-key column="action" type="string"/>
-			<one-to-many class="ModelRecipe"/>
-		</map>
-	</class>
-
-	<class name="ModelRecipe" table="MODEL_RECIPE">
-		<meta attribute="class-description">
-			This class describes a Model recipe
-		</meta>
-
-		<id name="id" type="int" column="id">
-			<generator class="native"/>
-		</id>
-
-		<properties name="uk1_model_recipe" unique="true">
-			<property name="modelId" type="int">
-			     <column name="MODEL_ID" not-null="true"/>
-			</property>
-			<property name="action" type="string" >
-			     <column name="ACTION" not-null="true" length="40"/>
-			</property>
-		</properties>
-		<property name="schemaVersion" column="SCHEMA_VERSION" type="string" length="20"/>
-		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-		<property name="orchestrationUri" type="string">
-          <column name="ORCHESTRATION_URI" not-null="true" length="256"/>
-        </property>
-		<property name="modelParamXSD" column="MODEL_PARAM_XSD" type="string" length="2048"/>
-		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-	</class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
deleted file mode 100644
index 9081bb8732..0000000000
--- a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="NetworkRecipe" table="NETWORK_RECIPE">
-		<meta attribute="class-description">
-			This class describes a Network recipe
-		</meta>
-		
-		<id name="id" type="int" column="id">
-			<generator class="native"/>
-		</id>
-
-		<properties name="uk_network_recipe" unique="true">
-			<property name="modelName" type="string" >
-			     <column name="MODEL_NAME" not-null="true" length="20"/>
-			</property>
-			<property name="action" type="string" >
-			     <column name="ACTION" not-null="true" length="40"/>
-			</property>
-			<property name="version" type="string">
-			     <column name="VERSION_STR" not-null="true" length="20"/>
-			</property>
-			
-		</properties>
-		
-		<property name="serviceType" type="string" length="45">
-                 <column name="SERVICE_TYPE" not-null="false" length="45"/>
-        </property>
-		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-		<property name="orchestrationUri" type="string">
-		  <column name="ORCHESTRATION_URI" not-null="true" length="256"/>
-		</property>
-		<property name="paramXSD" column="NETWORK_PARAM_XSD" type="string" length="2048"/>
-		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-	</class>
-	
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
deleted file mode 100644
index 41e049ad8d..0000000000
--- a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="NetworkResource" table="NETWORK_RESOURCE">
-		<meta attribute="class-description">
-			This class describes a Network Resource
-		</meta>
-
-		<id 	  name="modelUUID" 					column="MODEL_UUID" 					type="string" 	length="200"/>
-		<property name="modelName" 					column="MODEL_NAME" 					type="string" 	length="200"	not-null="true" />
-		<property name="modelInvariantUUID" 		column="MODEL_INVARIANT_UUID" 			type="string" 	length="200"/>
-		<property name="modelVersion" 				column="MODEL_VERSION" 					type="string" 	length="20"/>
-		<property name="toscaNodeType" 				column="TOSCA_NODE_TYPE" 				type="string" 	length="200"/>
-		<property name="neutronNetworkType" 		column="NEUTRON_NETWORK_TYPE" 			type="string" 	length="20"/>
-		<property name="description" 				column="DESCRIPTION" 					type="string" 	length="1200"/>
-		<property name="orchestrationMode" 			column="ORCHESTRATION_MODE" 			type="string" 	length="20"/>
-		<property name="category" 				    column="RESOURCE_CATEGORY"              type="string" 	length="20"/>
-		<property name="subCategory" 				column="RESOURCE_SUB_CATEGORY" 	        type="string" 	length="20"/>
-		<property name="heatTemplateArtifactUUID"	column="HEAT_TEMPLATE_ARTIFACT_UUID" 	type="string"	length="200"	not-null="true" />
-
-		<property name="aicVersionMin" type="string" >
-			<column name="AIC_VERSION_MIN" not-null="true" default="2.5" length="20" />
-		</property>
-		<property name="aicVersionMax" type="string">
-			<column name="AIC_VERSION_MAX" not-null="false" default="2.5" length="20"/>
-		</property>
-		
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-
-	</class>
-
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
deleted file mode 100644
index 236da547e2..0000000000
--- a/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping>
-    <class name="org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization" table="NETWORK_RESOURCE_CUSTOMIZATION"> 
-		<id name="modelCustomizationUuid" column="MODEL_CUSTOMIZATION_UUID" type="java.lang.String" length="200"/>
-		<property name="networkResourceModelUuid" column="NETWORK_RESOURCE_MODEL_UUID" type="java.lang.String" length="200" not-null="true"/>
-        <property name="modelInstanceName" type="java.lang.String" length="200" not-null="true">
-            <column name="MODEL_INSTANCE_NAME" />
-        </property>
-        <property name="networkTechnology" type="java.lang.String" length="45">
-            <column name="NETWORK_TECHNOLOGY" />
-        </property>
-        <property name="networkType" type="java.lang.String" length="45">
-            <column name="NETWORK_TYPE" />
-        </property>
-        <property name="networkScope" type="java.lang.String" length="45">
-            <column name="NETWORK_SCOPE" />
-        </property>
-        <property name="networkRole" type="java.lang.String" length="200">
-            <column name="NETWORK_ROLE" />
-        </property>
-        <property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-    </class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/Service.hbm.xml b/mso-catalog-db/src/main/resources/Service.hbm.xml
deleted file mode 100644
index 2344432056..0000000000
--- a/mso-catalog-db/src/main/resources/Service.hbm.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="Service" table="SERVICE">
-		<meta attribute="class-description">
-			This class describes a Service that may be orchestrated
-		</meta>
-
-		<id name="modelUUID"  					column="MODEL_UUID"					type="string"		length="200"/>
-		<property name="modelName" 				column="MODEL_NAME" 				type="string" 		length="200"	not-null="true"/>
-		<property name="version" 				column="MODEL_VERSION" 				type="string" 		length="20"		not-null="true"/>
-		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-		<property name="toscaCsarArtifactUUID" 	column="TOSCA_CSAR_ARTIFACT_UUID" 	type="string" 		length="200" />
-
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-		<property name="modelInvariantUUID" type="string">
-           <column name="MODEL_INVARIANT_UUID" default="'MANUAL_RECORD'" not-null="true" length="200"/>
-        </property>
-        <property name="category" 				column="SERVICE_CATEGORY" 				type="string" 		length="20"/>
-        <property name="serviceType" 				column="SERVICE_TYPE" 				type="string" 		length="20"/>
-        <property name="serviceRole" 				column="SERVICE_ROLE" 				type="string" 		length="20"/>
-        <property name="environmentContext" 		type="string" 		length="200">
-          <column name="ENVIRONMENT_CONTEXT" default="null"/>
-        </property>
-        <property name="workloadContext" 			type="string" 		length="200">
-          <column name="WORKLOAD_CONTEXT" default="null"/>
-        </property>
-        
-		<map name="recipes" inverse="true" cascade="all">
-			<key column="SERVICE_MODEL_UUID"/>
-			<map-key column="action" type="string"/>
-			<one-to-many class="ServiceRecipe"/>
-		</map>
-
-		<set name="serviceResourceCustomizations" inverse="true" cascade="all">
-            <key column="SERVICE_MODEL_UUID" not-null="true" />
-            <one-to-many class="ServiceToResourceCustomization" />
-        </set>
-	</class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml
deleted file mode 100644
index bdd54f7832..0000000000
--- a/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="ServiceRecipe" table="SERVICE_RECIPE">
-		<meta attribute="class-description">
-			This class describes a Service recipe
-		</meta>
-		
-		<id name="id" type="int" column="id">
-			<generator class="native"/>
-		</id>
-
-		<properties name="uk1_service_recipe" unique="true">
-			<property name="serviceModelUUID" type="string" >
-			     <column name="SERVICE_MODEL_UUID" not-null="true" length="200" />
-			</property>
-			<property name="action" type="string" >
-			     <column name="ACTION" not-null="true" length="40" />
-			</property>
-		</properties>
-		
-		<property name="orchestrationUri" type="string" column="ORCHESTRATION_URI" not-null="true" length="256"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-
-		<property name="action" 				column="ACTION" 					type="string" 			length="40" insert="false" update="false" />
-		<property name="version" 				column="VERSION_STR" 				type="string" 			length="20"/>
-		<property name="description" 			column="DESCRIPTION" 				type="string" 			length="1200"/>
-		<property name="serviceParamXSD" 		column="SERVICE_PARAM_XSD" 			type="string" 			length="2048"/>
-		<property name="recipeTimeout" 			column="RECIPE_TIMEOUT" 			type="int"/>
-		<property name="serviceTimeoutInterim" 	column="SERVICE_TIMEOUT_INTERIM" 	type="java.lang.Integer"/>
-	</class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml b/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml
deleted file mode 100644
index dca21886be..0000000000
--- a/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="ServiceToAllottedResources" table="SERVICE_TO_ALLOTTED_RESOURCES">
-		<meta attribute="class-description">
-			This class describes a Service to Allotted Resource Customization relationship
-		</meta>
-
-		<composite-id>
-			<key-property name="serviceModelUuid" type="string" >
-				<column name="SERVICE_MODEL_UUID" length="200" not-null="true"/>
-			</key-property>
-			<key-property name="arModelCustomizationUuid" type="string">
-				<column name="AR_MODEL_CUSTOMIZATION_UUID" length="200" not-null="true"/>
-			</key-property>
-		</composite-id>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-	</class>
-
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml b/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml
deleted file mode 100644
index 5e2caa9840..0000000000
--- a/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="ServiceToNetworks" table="SERVICE_TO_NETWORKS">
-		<meta attribute="class-description">
-			This class describes a Service to a Network Resource Customization relationship
-		</meta>
-
-		<composite-id>
-			<key-property name="serviceModelUuid" type="string">
-				<column name="SERVICE_MODEL_UUID" not-null="true" length="200"/>
-			</key-property>
-			<key-property name="networkModelCustomizationUuid" type="string">
-				<column name="NETWORK_MODEL_CUSTOMIZATION_UUID" not-null="true" length="200"/>
-			</key-property>
-		</composite-id>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-	</class>
-
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/ServiceToResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/ServiceToResourceCustomization.hbm.xml
deleted file mode 100644
index cd37fc9a99..0000000000
--- a/mso-catalog-db/src/main/resources/ServiceToResourceCustomization.hbm.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="ServiceToResourceCustomization" table="SERVICE_TO_RESOURCE_CUSTOMIZATIONS">
-		<meta attribute="class-description">
-			This class describes a Service To Resource Customization
-		</meta>
-		
-		<composite-id>
-			<key-property name="modelType"  					type="string" column="MODEL_TYPE" length="20" />
-			<key-property name="resourceModelCustomizationUUID" type="string" column="RESOURCE_MODEL_CUSTOMIZATION_UUID" length="200" />
-			<key-property name="serviceModelUUID" 				type="string" column="SERVICE_MODEL_UUID" length="200" />
-		</composite-id>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-
-	</class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml b/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml
deleted file mode 100644
index 3a00c89523..0000000000
--- a/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="TempNetworkHeatTemplateLookup" table="TEMP_NETWORK_HEAT_TEMPLATE_LOOKUP">
-		<meta attribute="class-description">
-			This class describes a VF Module to HEAT Files Entry
-		</meta>
-		
-		<id name="networkResourceModelName" column="NETWORK_RESOURCE_MODEL_NAME" type="java.lang.String"  length="200"/>
-		
-		<property name="heatTemplateArtifactUuid" column="HEAT_TEMPLATE_ARTIFACT_UUID" type="java.lang.String" length="200" not-null="true"/>
-		<property name="aicVersionMin" type="string" >
-		  <column name="AIC_VERSION_MIN" not-null="true" length="20"/>
-		</property>
-		<property name="aicVersionMax" type="string" >
-		  <column name="AIC_VERSION_MAX" not-null="false" length="20"/>
-		</property>
-		
-				
-	</class>
-	
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml b/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml
deleted file mode 100644
index 3529620ec9..0000000000
--- a/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="ToscaCsar" table="TOSCA_CSAR">
-		<meta attribute="class-description">
-			This class describes a Tosca Csar
-		</meta>
-		
-		<id name="artifactUUID"  				column="ARTIFACT_UUID"			type="string"			length="200"/>
-		<property name="name" 					column="NAME" 					type="string" 			length="200" 	not-null="true"/>
-		<property name="version" 				column="VERSION" 				type="string" 			length="20" 	not-null="true"/>
-		<property name="artifactChecksum" 		column="ARTIFACT_CHECKSUM" 		type="string" 			length="200"	not-null="true"/>
-		<property name="url" 					column="URL" 					type="string" 			length="200" 	not-null="true"/>
-		<property name="description" 			column="DESCRIPTION" 			type="string" 			length="1200"/>
-		
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-		  <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-		</property>
-	
-		<set name="services" inverse="true" cascade="all">
-            <key column="TOSCA_CSAR_ARTIFACT_UUID" not-null="true" />
-            <one-to-many class="Service" />
-        </set>
-	</class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/VfModule.hbm.xml b/mso-catalog-db/src/main/resources/VfModule.hbm.xml
deleted file mode 100644
index a08e4d1ce2..0000000000
--- a/mso-catalog-db/src/main/resources/VfModule.hbm.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<!-- Generated Apr 28, 2016 2:44:06 PM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-    <class name="VfModule" table="VF_MODULE">
-
-        <id name="modelUUID" 				type="string" 				column="MODEL_UUID" 				length="200" />
-
-        <property name="vnfResourceModelUUId" 			type="string" 			column="VNF_RESOURCE_MODEL_UUID"	length="200" />
-        <property name="modelInvariantUUID" 			type="string" 			column="MODEL_INVARIANT_UUID"				length="200"/>
-        <property name="version" 						type="string" 			column="MODEL_VERSION" 						length="20"		not-null="true"/>
-        <property name="modelName" 						type="string" 			column="MODEL_NAME"							length="200"	not-null="true" />
-        <property name="description" 					type="string" 			column="DESCRIPTION" 						length="1200"/>
-        <property name="isBase" 						type="int" 				column="IS_BASE" 											not-null="true"/>
-        <property name="heatTemplateArtifactUUId" 		type="string" 			column="HEAT_TEMPLATE_ARTIFACT_UUID" 		length="200"	not-null="true" />
-        <property name="volHeatTemplateArtifactUUId"	type="string" 			column="VOL_HEAT_TEMPLATE_ARTIFACT_UUID" 	length="200" />
-       	
-       	<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-
-    </class>
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/VfModuleCustomization.hbm.xml b/mso-catalog-db/src/main/resources/VfModuleCustomization.hbm.xml
deleted file mode 100644
index eb918501f7..0000000000
--- a/mso-catalog-db/src/main/resources/VfModuleCustomization.hbm.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-    <class name="VfModuleCustomization" table="VF_MODULE_CUSTOMIZATION">
-    
-    	<id name="modelCustomizationUuid" type="string" column="MODEL_CUSTOMIZATION_UUID" length="200">
-		</id>
-    
-		<property name="vfModuleModelUuid" column="VF_MODULE_MODEL_UUID" type="java.lang.String" length="200" not-null="true"/>
-        
-        <property name="volEnvironmentArtifactUuid" type="java.lang.String">
-            <column name="VOL_ENVIRONMENT_ARTIFACT_UUID" length="200" not-null="false" />
-        </property>
-
-       	<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-        
-        <property name="heatEnvironmentArtifactUuid" type="java.lang.String">
-            <column name="HEAT_ENVIRONMENT_ARTIFACT_UUID" length="200" not-null="false" />
-        </property>
-        <property name="minInstances" type="java.lang.Integer" >
-            <column name="MIN_INSTANCES" not-null="false"/>
-        </property>
-        <property name="maxInstances" type="java.lang.Integer" >
-            <column name="MAX_INSTANCES" not-null="false"/>
-        </property>
-        <property name="initialCount" type="java.lang.Integer" >
-            <column name="INITIAL_COUNT" not-null="false"/>
-        </property>
-        <property name="availabilityZoneCount" type="java.lang.Integer" >
-            <column name="AVAILABILITY_ZONE_COUNT" not-null="false"/>
-        </property>
-        <property name="label" type="java.lang.String" >
-            <column name="LABEL" not-null="false" length="200"/>
-        </property>
-
-    </class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml b/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml
deleted file mode 100644
index d2c523e413..0000000000
--- a/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="VfModuleToHeatFiles" table="VF_MODULE_TO_HEAT_FILES">
-		<meta attribute="class-description">
-			This class describes a VF Module to HEAT Files Entry
-		</meta>
-		
-		<composite-id>
-			<key-property name="vfModuleModelUuid" column="VF_MODULE_MODEL_UUID" type="java.lang.String" length="200"/>
-			<key-property name="heatFilesArtifactUuid" column="HEAT_FILES_ARTIFACT_UUID" type="java.lang.String" length="200"/>
-		</composite-id> 
-				
-	</class>
-	
-</hibernate-mapping>
\ No newline at end of file
diff --git a/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml b/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml
deleted file mode 100644
index c629f00960..0000000000
--- a/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-  
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-    <class name="VnfComponent" table="VNF_COMPONENTS">
-        <meta attribute="class-description">
-            VnfComponent describes a table of components for a VNF_RESOURCE
-        </meta>
-           
-		<composite-id>
-			<key-property name="vnfId" column="VNF_ID" type="int" />
-			<key-property name="componentType" column="COMPONENT_TYPE" type="string" length="20"/>
-		</composite-id> 
-            
-        <property name="heatTemplateId" column="HEAT_TEMPLATE_ID" type="int" />
-        <property name="heatEnvironmentId" column="HEAT_ENVIRONMENT_ID" type="int" />
-        <property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-
-    </class>
-    
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
deleted file mode 100644
index 8bb138a313..0000000000
--- a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="VnfComponentsRecipe" table="VNF_COMPONENTS_RECIPE">
-		<meta attribute="class-description">
-			This class describes a VNF Components Recipe
-		</meta>
-
-		<id name="id" type="int" column="id">
-			<generator class="native"/>
-		</id>
-		<properties name="uk_vnf_component_recipe" unique="true">
-			<property name="vnfType" column="VNF_TYPE" type="string" length="200"/>
-			<property name="vfModuleModelUUId" column="VF_MODULE_MODEL_UUID" type="string" length="100" not-null="false"/>
-			<property name="vnfComponentType" type="string">
-				<column name="VNF_COMPONENT_TYPE" not-null="true" length="45"/>
-			</property>
-			<property name="action" type="string">
-			     <column name="ACTION" not-null="true" length="40"/>
-			</property>
-			<property name="serviceType" column="SERVICE_TYPE" type="string" length="45"/>
-			<property name="version" column="VERSION" type="string" length="20"/>
-		</properties>
-		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-		<property name="orchestrationUri" type="string">
-          <column name="ORCHESTRATION_URI" not-null="true" length="256"/>
-        </property>
-		<property name="paramXSD" column="VNF_COMPONENT_PARAM_XSD" type="string" length="2048"/>
-		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-	</class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
deleted file mode 100644
index 08570708dd..0000000000
--- a/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="VnfRecipe" table="VNF_RECIPE">
-		<meta attribute="class-description">
-			This class describes a VNF Recipe
-		</meta>
-
-		<id name="id" type="int" column="id">
-			<generator class="native"/>
-		</id>
-
-        <properties name="uk_vnf_recipe" unique="true">
-
-	        <property name="vfModuleId" type="string">
-	            <column name="VF_MODULE_ID" not-null="false" length="100" />
-	        </property>
-	        <property name="action" type="string">
-	            <column name="ACTION" not-null="true" length="40" />
-	        </property>
-	        <property name="version" type="string">
-                <column name="VERSION_STR" not-null="true" length="20" />
-            </property>
-
-        </properties>
-
-		<property name="vnfType" type="string">
-			<column name="VNF_TYPE" not-null="false" length="200" />
-		</property>
-
-		<property name="serviceType" type="string">
-			<column name="SERVICE_TYPE" not-null="false" length="45" default="null"/>
-		</property>
-
-		<property name="description" column="DESCRIPTION" type="string" length="1200"/>
-
-		<property name="orchestrationUri" type="string">
-          <column name="ORCHESTRATION_URI" not-null="true" length="256"/>
-        </property>
-
-		<property name="paramXSD" column="VNF_PARAM_XSD" type="string" length="2048"/>
-		<property name="recipeTimeout" column="RECIPE_TIMEOUT" type="int"/>
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-	</class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml b/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml
deleted file mode 100644
index f07af814cb..0000000000
--- a/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="VnfResCustomToVfModuleCustom" table="VNF_RES_CUSTOM_TO_VF_MODULE_CUSTOM">
-		<meta attribute="class-description">
-			This class maps two UUIDs
-		</meta>
-		
-		<composite-id>
-			<key-property name="vnfResourceCustModelCustomizationUuid" column="VNF_RESOURCE_CUST_MODEL_CUSTOMIZATION_UUID" type="java.lang.String" length="200"/>
-			<key-property name="vfModuleCustModelCustomizationUuid" column="VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID" type="java.lang.String" length="200"/>
-		</composite-id> 
-		
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-				
-	</class>
-	
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
deleted file mode 100644
index 03d1de544c..0000000000
--- a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="VnfResource" table="VNF_RESOURCE">
-		<meta attribute="class-description">
-			This class describes a VNF Resource
-		</meta>
-
-		<id name="modelUuid" 						type="string" 		column="MODEL_UUID" 					length="200"/>
-		<property name="modelInvariantUuid" 		type="string" 		column="MODEL_INVARIANT_UUID" 			length="200"/>
-		<property name="version" 					type="string" 		column="MODEL_VERSION" 					length="20"		not-null="true"/>
-		<property name="modelName"  				type="string" 		column="MODEL_NAME"						length="200"/>
-		<property name="toscaNodeType" 				type="string" 		column="TOSCA_NODE_TYPE" 				length="200"/>
-		<property name="description" 				type="string" 		column="DESCRIPTION" 					length="1200"/>
-		<property name="orchestrationMode" 			type="string" 		column="ORCHESTRATION_MODE" 			length="20"		not-null="true"/>
-		<property name="aicVersionMin" 				type="string" 		column="AIC_VERSION_MIN" 				length="20"/>
-		<property name="aicVersionMax" 				type="string" 		column="AIC_VERSION_MAX" 				length="20"/>
-		<property name="category" 				    type="string" 		column="RESOURCE_CATEGORY" 				length="20"/>
-		<property name="subCategory" 				type="string" 		column="RESOURCE_SUB_CATEGORY" 			length="20"/>
-		<property name="heatTemplateArtifactUUId" 	type="string" 		column="HEAT_TEMPLATE_ARTIFACT_UUID" 	length="200" />
-		<property name="created" 					type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-		
-		<set name="vnfResourceCustomizations" inverse="true" access="field" cascade="all">
-            <key column="VNF_RESOURCE_MODEL_UUID" not-null="true" />
-            <one-to-many class="VnfResourceCustomization" />
-        </set>
-        
-        <set name="vfModules" inverse="true" cascade="all">
-            <key column="VNF_RESOURCE_MODEL_UUID" not-null="true" />
-            <one-to-many class="VfModule" />
-        </set>
-	</class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
deleted file mode 100644
index 78ed9c5ff6..0000000000
--- a/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.openecomp.mso.db.catalog.beans">
-	<class name="VnfResourceCustomization" table="VNF_RESOURCE_CUSTOMIZATION">
-		<meta attribute="class-description">
-			This class describes a VNF Resource Customization
-		</meta>
-		
-        <id name="modelCustomizationUuid"  			column="MODEL_CUSTOMIZATION_UUID"		type="string"		length="200"/>
-		
-		<property name="modelInstanceName" 			column="MODEL_INSTANCE_NAME" 			type="string" 		length="200"	not-null="true"/>
-		<property name="minInstances" 				column="MIN_INSTANCES" 					type="int" 			length="11"/>
-		<property name="maxInstances" 				column="MAX_INSTANCES" 					type="int" 			length="11"/>
-		<property name="availabilityZoneMaxCount"	column="AVAILABILITY_ZONE_MAX_COUNT" 	type="int" 			length="11"/>
-		<property name="nfFunction" 				column="NF_FUNCTION" 					type="string" 		length="200"/>
-		<property name="nfType" 					column="NF_TYPE" 						type="string" 		length="200"/>
-		<property name="nfRole" 					column="NF_ROLE" 						type="string" 		length="200"/>
-		<property name="nfNamingCode" 				column="NF_NAMING_CODE" 				type="string"		length="200"/>
-		<property name="multiStageDesign" 			column="MULTI_STAGE_DESIGN" 			type="string"		length="200"/>
-		<property name="vnfResourceModelUuid" 		column="VNF_RESOURCE_MODEL_UUID" 		type="string" 		length="200"	not-null="true"  />
-		
-		<property name="created" type="timestamp" generated="insert" update="false" insert="false" not-null="true">
-          <column name="CREATION_TIMESTAMP" default="CURRENT_TIMESTAMP"/>
-        </property>
-		
-<!--
-		<set name="vfModuleCustomizations" inverse="true" cascade="all">
-			<key column="VF_MODULE_CUST_MODEL_CUSTOMIZATION_UUID" not-null="true" />
-			<one-to-many class="VnfResCustomToVfModuleCustom" />
-		</set>
--->
-	</class>
-</hibernate-mapping>
diff --git a/mso-catalog-db/src/main/resources/hibernate-catalog-core-mysql.cfg.xml b/mso-catalog-db/src/main/resources/hibernate-catalog-core-mysql.cfg.xml
deleted file mode 100644
index dd470a5442..0000000000
--- a/mso-catalog-db/src/main/resources/hibernate-catalog-core-mysql.cfg.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  ECOMP MSO
-  ================================================================================
-  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=========================================================
-  -->
-
-
-<!DOCTYPE hibernate-configuration SYSTEM "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-	<session-factory>
-		<!-- <property name="hibernate.dialect">org.hibernate.dialect.Oracle10gDialect</property> -->
-        <property name="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</property>
-        <property name="hibernate.show_sql">false</property>
-        <property name="hibernate.format_sql">true</property>
-        <property name="connection.datasource">java:jboss/datasources/mso-catalog</property> 
-		<property name="hibernate.c3p0.min_size">5</property>
-		<property name="hibernate.c3p0.max_size">50</property>
-		<property name="hibernate.c3p0.timeout">1800</property>
-		<property name="hibernate.c3p0.max_statements">50</property>
-		
-<!-- 		<property name="hibernate.hbm2ddl.auto">create</property> -->
-		<mapping resource="AllottedResource.hbm.xml"/>
-		<mapping resource="AllottedResourceCustomization.hbm.xml"/>
-		<mapping resource="HeatEnvironment.hbm.xml"/>
-		<mapping resource="HeatFiles.hbm.xml"/>
-		<mapping resource="HeatNestedTemplate.hbm.xml"/>
-		<mapping resource="HeatTemplate.hbm.xml"/>
-		<mapping resource="ModelRecipe.hbm.xml"/>
-		<mapping resource="NetworkRecipe.hbm.xml"/>
-		<mapping resource="NetworkResource.hbm.xml"/>
-		<mapping resource="NetworkResourceCustomization.hbm.xml"/>
-		<mapping resource="Service.hbm.xml"/>
-		<mapping resource="ServiceRecipe.hbm.xml"/>
-		<mapping resource="ServiceToAllottedResources.hbm.xml"/>
-		<mapping resource="ServiceToNetworks.hbm.xml"/>
-		<mapping resource="ServiceToResourceCustomization.hbm.xml"/>
-		<mapping resource="TempNetworkHeatTemplateLookup.hbm.xml"/>
-		<mapping resource="ToscaCsar.hbm.xml"/>
-		<mapping resource="VfModule.hbm.xml"/>
-		<mapping resource="VfModuleCustomization.hbm.xml"/>
-		<mapping resource="VfModuleToHeatFiles.hbm.xml"/>
-		<mapping resource="VnfComponent.hbm.xml"/>
-		<mapping resource="VnfComponentsRecipe.hbm.xml"/>
-		<mapping resource="VnfRecipe.hbm.xml"/>
-		<mapping resource="VnfResCustomToVfModuleCustom.hbm.xml"/>
-		<mapping resource="VnfResource.hbm.xml"/>
-		<mapping resource="VnfResourceCustomization.hbm.xml"/>
-	</session-factory>
-</hibernate-configuration>
-- 
cgit 1.2.3-korg