1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
diff --git a/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml b/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml
new file mode 100644
index 0000000..77d1dfe
--- /dev/null
+++ b/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml
@@ -0,0 +1,39 @@
+<?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://hibernate.sourceforge.net/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" >

+       	      <column name="CREATION_TIMESTAMP" not-null="true"/>

+       	</property>

+				

+	</class>

+	

+</hibernate-mapping>