1710 Rebase - Second Attempt

[so.git] / mso-catalog-db / src / main / resources / Service.hbm.xml

diff --git a/mso-catalog-db/src/main/resources/Service.hbm.xml b/mso-catalog-db/src/main/resources/Service.hbm.xml
index f604996..b48c55d 100644 (file)
--- a/mso-catalog-db/src/main/resources/Service.hbm.xml
+++ b/mso-catalog-db/src/main/resources/Service.hbm.xml
@@ -27,67 +27,28 @@
                        This class describes a Service that may be orchestrated
                </meta>
 
-               <id name="id" type="int" column="id">
-                       <generator class="native"/>
-               </id>
-
-               <properties name="uk" unique="true">
-                       <property name="serviceNameVersionId" type="string" >
-                               <column name="SERVICE_NAME_VERSION_ID" length="50" not-null="true" default="'MANUAL_RECORD'" />
-                       </property>
-                       <property name="serviceName" column="SERVICE_NAME" type="string" length="40"/>
-               </properties>
-
-               <property name="version"  type="string" >
-                               <column name="VERSION_STR" length="20" not-null="true"/>
-               </property>
+               <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="serviceVersion" column="SERVICE_VERSION" type="string" length="10"/>
-               <property name="httpMethod" column="HTTP_METHOD" type="string" length="50"/>
-               <property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-                  <column name="CREATION_TIMESTAMP" not-null="true"/>
-               </property>
+               <property name="created" type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/>
                <property name="modelInvariantUUID" type="string">
            <column name="MODEL_INVARIANT_UUID" default="'MANUAL_RECORD'" not-null="true" length="200"/>
         </property>
-
-               <map name="recipes" cascade="all">
-                       <key column="SERVICE_ID"/>
+        <property name="serviceType"                           column="SERVICE_TYPE"                           type="string"           length="20"/>
+        <property name="serviceRole"                           column="SERVICE_ROLE"                           type="string"           length="20"/>
+        
+               <map name="recipes" inverse="true" cascade="all">
+                       <key column="SERVICE_MODEL_UUID"/>
                        <map-key column="action" type="string"/>
                        <one-to-many class="ServiceRecipe"/>
                </map>
-       </class>
-
-       <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="serviceId" type="int">
-                            <column name="SERVICE_ID" not-null="true" length="11"/>
-                       </property>
-                       <property name="action" type="string" >
-                            <column name="ACTION" not-null="true" length="40"/>
-                       </property>
-               </properties>
-               <property name="version" type="string">
-                       <column name="VERSION_STR" not-null="false" length="20" 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="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"/>
-               <property name="created" type="timestamp" generated="insert" update="false" insert="false" >
-                   <column name="CREATION_TIMESTAMP" not-null="true"/>
-               </property>
+               <set name="serviceResourceCustomizations" inverse="true" cascade="all">
+            <key column="SERVICE_MODEL_UUID" not-null="true" />
+            <one-to-many class="ServiceToResourceCustomization" />
+        </set>
        </class>
-</hibernate-mapping>
+</hibernate-mapping>
\ No newline at end of file