From 20e60c893bbed7f68a9475a3886b58d150d92b57 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 12 Oct 2017 11:32:34 -0400 Subject: Update hibernate files to initialize timestamp Updated the hibernate hbm.xml files to correct the following issues: 1) Timestamps had generated="insert" but hibernate was not auto-populating the timestamp value thus the DB was generating an exception. Modified the definition of this field to cause hibernate to provide the default value of CURRENT_TIMESTAMP. This impacted most of the hbm.xml files. 2) While running junit tests, the following message appeared in the log underneath most of the hbm.xml files: Recognized obsolete hibernate namespace http://hibernate.sourceforge.net/. Use namespace http://www.hibernate.org/dtd/ instead. Refer to Hibernate 3.6 Migration Guide! Updated most of the hbm.xml files, changing the namespace per the guide. Note: a couple of the files were already correctly configured. Change-Id: Id96775b7bd7a42da0c00e208e33aed6fa96ab996 Issue-Id: SO-215 Signed-off-by: Jim Hahn --- mso-catalog-db/src/main/resources/AllottedResource.hbm.xml | 8 ++++---- .../src/main/resources/AllottedResourceCustomization.hbm.xml | 8 ++++---- mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml | 8 ++++---- mso-catalog-db/src/main/resources/HeatFiles.hbm.xml | 6 +++--- mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml | 2 +- mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml | 6 +++--- mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml | 12 ++++++------ mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml | 6 +++--- mso-catalog-db/src/main/resources/NetworkResource.hbm.xml | 4 +++- .../src/main/resources/NetworkResourceCustomization.hbm.xml | 6 +++--- mso-catalog-db/src/main/resources/Service.hbm.xml | 4 +++- mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml | 4 +++- .../src/main/resources/ServiceToAllottedResources.hbm.xml | 8 ++++---- mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml | 8 ++++---- .../main/resources/ServiceToResourceCustomization.hbm.xml | 4 +++- .../src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml | 2 +- mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml | 4 +++- mso-catalog-db/src/main/resources/VfModule.hbm.xml | 6 ++++-- .../src/main/resources/VfModuleCustomization.hbm.xml | 8 ++++---- .../src/main/resources/VfModuleToHeatFiles.hbm.xml | 2 +- mso-catalog-db/src/main/resources/VnfComponent.hbm.xml | 4 ++-- .../src/main/resources/VnfComponentsRecipe.hbm.xml | 4 +++- mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml | 4 +++- .../src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml | 8 ++++---- mso-catalog-db/src/main/resources/VnfResource.hbm.xml | 4 +++- .../src/main/resources/VnfResourceCustomization.hbm.xml | 4 +++- 26 files changed, 82 insertions(+), 62 deletions(-) (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 index 15fe12f9b6..0c61b5f614 100644 --- a/mso-catalog-db/src/main/resources/AllottedResource.hbm.xml +++ b/mso-catalog-db/src/main/resources/AllottedResource.hbm.xml @@ -19,7 +19,7 @@ ============LICENSE_END========================================================= --> +"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> @@ -45,8 +45,8 @@ - - - + + + diff --git a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml index 7720a933ad..0cf50166ea 100644 --- a/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml +++ b/mso-catalog-db/src/main/resources/AllottedResourceCustomization.hbm.xml @@ -19,7 +19,7 @@ ============LICENSE_END========================================================= --> +"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - - - + + + \ No newline at end of file diff --git a/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml b/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml index 711b73a336..b2c94e8776 100644 --- a/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml +++ b/mso-catalog-db/src/main/resources/HeatEnvironment.hbm.xml @@ -20,7 +20,7 @@ --> +"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> @@ -40,9 +40,9 @@ - - - + + + diff --git a/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml b/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml index 252649c4df..4674239a99 100644 --- a/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml +++ b/mso-catalog-db/src/main/resources/HeatFiles.hbm.xml @@ -19,7 +19,7 @@ ============LICENSE_END========================================================= --> +"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> @@ -39,8 +39,8 @@ - - + + diff --git a/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml b/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml index b89a93cd96..a2c590f563 100644 --- a/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml +++ b/mso-catalog-db/src/main/resources/HeatNestedTemplate.hbm.xml @@ -19,7 +19,7 @@ ============LICENSE_END========================================================= --> - + diff --git a/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml b/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml index c1866e9530..2fb64aa20d 100644 --- a/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml +++ b/mso-catalog-db/src/main/resources/HeatTemplate.hbm.xml @@ -43,9 +43,9 @@ - - - + + + diff --git a/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml index e59bb5c23b..2332324370 100644 --- a/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml +++ b/mso-catalog-db/src/main/resources/ModelRecipe.hbm.xml @@ -45,9 +45,9 @@ - - - + + + @@ -80,8 +80,8 @@ - - - + + + \ No newline at end of file diff --git a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml index 25c5ccd827..1ed9c7c392 100644 --- a/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml +++ b/mso-catalog-db/src/main/resources/NetworkRecipe.hbm.xml @@ -53,9 +53,9 @@ - - - + + + \ No newline at end of file diff --git a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml index b8c2f39943..7f4698e82b 100644 --- a/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml +++ b/mso-catalog-db/src/main/resources/NetworkResource.hbm.xml @@ -44,7 +44,9 @@ - + + + diff --git a/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml index 37bb77fe77..236da547e2 100644 --- a/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml +++ b/mso-catalog-db/src/main/resources/NetworkResourceCustomization.hbm.xml @@ -18,7 +18,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + @@ -39,8 +39,8 @@ - - + + diff --git a/mso-catalog-db/src/main/resources/Service.hbm.xml b/mso-catalog-db/src/main/resources/Service.hbm.xml index b48c55dec7..5bdb0f62bd 100644 --- a/mso-catalog-db/src/main/resources/Service.hbm.xml +++ b/mso-catalog-db/src/main/resources/Service.hbm.xml @@ -33,7 +33,9 @@ - + + + diff --git a/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml b/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml index 0003c37ad2..75be1c71b0 100644 --- a/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml +++ b/mso-catalog-db/src/main/resources/ServiceRecipe.hbm.xml @@ -40,7 +40,9 @@ - + + + diff --git a/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml b/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml index 1d471ca193..dca21886be 100644 --- a/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml +++ b/mso-catalog-db/src/main/resources/ServiceToAllottedResources.hbm.xml @@ -18,7 +18,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + @@ -33,9 +33,9 @@ - - - + + + \ 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 index 1c96f7ba95..5e2caa9840 100644 --- a/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml +++ b/mso-catalog-db/src/main/resources/ServiceToNetworks.hbm.xml @@ -18,7 +18,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + @@ -33,9 +33,9 @@ - - - + + + \ 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 index dde156c89d..d806b48b45 100644 --- a/mso-catalog-db/src/main/resources/ServiceToResourceCustomization.hbm.xml +++ b/mso-catalog-db/src/main/resources/ServiceToResourceCustomization.hbm.xml @@ -30,7 +30,9 @@ - + + + diff --git a/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml b/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml index d5d210864e..3a00c89523 100644 --- a/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml +++ b/mso-catalog-db/src/main/resources/TempNetworkHeatTemplateLookup.hbm.xml @@ -18,7 +18,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + diff --git a/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml b/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml index 9ffb7824cf..3529620ec9 100644 --- a/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml +++ b/mso-catalog-db/src/main/resources/ToscaCsar.hbm.xml @@ -33,7 +33,9 @@ - + + + diff --git a/mso-catalog-db/src/main/resources/VfModule.hbm.xml b/mso-catalog-db/src/main/resources/VfModule.hbm.xml index 16f3d399ee..a08e4d1ce2 100644 --- a/mso-catalog-db/src/main/resources/VfModule.hbm.xml +++ b/mso-catalog-db/src/main/resources/VfModule.hbm.xml @@ -20,7 +20,7 @@ --> +"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> @@ -36,7 +36,9 @@ - + + + \ 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 index 2bf5be2501..eb918501f7 100644 --- a/mso-catalog-db/src/main/resources/VfModuleCustomization.hbm.xml +++ b/mso-catalog-db/src/main/resources/VfModuleCustomization.hbm.xml @@ -19,7 +19,7 @@ ============LICENSE_END========================================================= --> +"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> @@ -32,9 +32,9 @@ - - - + + + diff --git a/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml b/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml index b8498be13b..d2c523e413 100644 --- a/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml +++ b/mso-catalog-db/src/main/resources/VfModuleToHeatFiles.hbm.xml @@ -19,7 +19,7 @@ ============LICENSE_END========================================================= --> - + diff --git a/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml b/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml index 3cda770e63..c629f00960 100644 --- a/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml +++ b/mso-catalog-db/src/main/resources/VnfComponent.hbm.xml @@ -34,8 +34,8 @@ - - + + diff --git a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml index 69a3a456a1..20b9cab252 100644 --- a/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml +++ b/mso-catalog-db/src/main/resources/VnfComponentsRecipe.hbm.xml @@ -48,6 +48,8 @@ - + + + diff --git a/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml b/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml index 4c471edfee..4dc7f968b4 100644 --- a/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml +++ b/mso-catalog-db/src/main/resources/VnfRecipe.hbm.xml @@ -61,6 +61,8 @@ - + + + diff --git a/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml b/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml index 77d1dfe64f..f07af814cb 100644 --- a/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml +++ b/mso-catalog-db/src/main/resources/VnfResCustomToVfModuleCustom.hbm.xml @@ -18,7 +18,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + @@ -30,9 +30,9 @@ - - - + + + diff --git a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml index 85b9e2a751..2647a0fcc2 100644 --- a/mso-catalog-db/src/main/resources/VnfResource.hbm.xml +++ b/mso-catalog-db/src/main/resources/VnfResource.hbm.xml @@ -37,7 +37,9 @@ - + + + diff --git a/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml index e22b67ca8b..f0af7cb97c 100644 --- a/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml +++ b/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml @@ -38,7 +38,9 @@ - + + +