modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationDefinition.java
| 1 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java
| 6 ------
2 files changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 1e97f6285b5f17b6d254f17d2b790eb769a6171b
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Mon Mar 29 19:54:04 2010 -0400
add CascadeType.DELETE_ORPHAN to propertyDefinitions field in ConfigurationDefinition
so removals from the propertyDefinitions Map are propogated to the DB when merge is called
on the parent ConfigurationDefinition
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationDefinition.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationDefinition.java
index 5c28844..d38b302 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationDefinition.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationDefinition.java
@@ -93,6 +93,7 @@ public class ConfigurationDefinition implements Serializable {
@MapKey(name = "name")
@OneToMany(mappedBy = "configurationDefinition", cascade = CascadeType.ALL,
fetch = FetchType.EAGER)
+
@org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN)
@OrderBy
private Map<String, PropertyDefinition> propertyDefinitions = new
LinkedHashMap<String, PropertyDefinition>();
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java
index 24c9148..a3ea7ea 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java
@@ -204,11 +204,6 @@ public class ConfigurationMetadataManagerBean implements
ConfigurationMetadataMa
return updateReport;
}
- /**
- * Updates a template
- * @param existingDT
- * @param newDT
- */
private void updateTemplate(ConfigurationTemplate existingDT, ConfigurationTemplate
newDT) {
try {
@@ -295,7 +290,6 @@ public class ConfigurationMetadataManagerBean implements
ConfigurationMetadataMa
for (PropertyDefinition propDef : propDefsToDelete) {
existingConfigDef.getPropertyDefinitions().remove(propDef.getName());
existingProperties.remove(propDef); // does not operate on original
list!!
- entityManager.remove(propDef);
}
entityManager.merge(existingConfigDef);
}
Show replies by date