modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java | 10 +++++----- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerRemote.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 75c3c13a68f88836da805eac2acea1deb722d422 Author: Joseph Marques joseph@redhat.com Date: Wed Aug 18 13:47:30 2010 -0400
modify ConfigurationServerServiceImpl to take into account new semantics for ResourceManagerBean.updateResource
* remove call to 'resource.setResourceConfiguration(configuration)', it was redundant with 'configurationManager.setResourceConfiguration(resource.getId(), configuration)' * update comments to accurately reflect what work is being done at which steps
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java index 6ae1e16..dfab090 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java @@ -81,10 +81,10 @@ public class ConfigurationServerServiceImpl implements ConfigurationServerServic }
Resource resource = update.getResource(); - // First clone the config, zeroing out all id's. - Configuration configuration = update.getConfiguration().deepCopy(false); - configurationManager.setResourceConfiguration(resource.getId(), configuration); - resource.setResourceConfiguration(configuration); - resourceManager.updateResource(overlord, resource); + Configuration configuration = update.getConfiguration().deepCopy(false); // clone the config, zeroing out ids + + resourceManager.updateResource(overlord, resource); // update simple properties, still need to merge config + configurationManager.setResourceConfiguration(resource.getId(), configuration); // now merge latest config + } } \ No newline at end of file
commit 563c5f32e5212488904e0c52b28b879af0b36f08 Author: Joseph Marques joseph@redhat.com Date: Wed Aug 18 10:48:16 2010 -0400
fix ResourceManagerRemote to use naming conventions established for remote API
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerRemote.java index 01ed5a1..8f8604d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerRemote.java @@ -109,8 +109,8 @@ public interface ResourceManagerRemote { */ @WebMethod Resource updateResource( // - @WebParam(name = "subject") Subject user, // - @WebParam(name = "resource") Resource resource); + @WebParam(name = "subject") Subject subject, // + @WebParam(name = "resource") Resource resource);
/** * Removes these resources from inventory. The resources may subsequently be rediscovered. Note that for