modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 4 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java | 4 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 16 +++------- 3 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 4629ee6ce064e487c2b1adab06ad7e2524f63d05 Merge: 88ab6d9 67f853a Author: John Mazzitelli mazz@redhat.com Date: Thu Mar 17 12:28:09 2011 -0400
Merge commit 'origin/master'
commit 88ab6d906ca33bfa8136b451c7c18f2e94ca713c Author: John Mazzitelli mazz@redhat.com Date: Thu Mar 17 12:05:32 2011 -0400
in the gui ui - we are losing the plugin exception message that tells us why the manual add failed don't wrap an exception in an exception - just throw the original, the gwt service impl will handle scrubbing the exception so gwt ui can handle it
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index b4d092d..84ae777 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -339,16 +339,12 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
Resource result = null;
- try { - ResourceType resourceType = this.resourceTypeManager.getResourceTypeById(subject, resourceTypeId); - // the subsequent call to manuallyAddResource requires a detached ResourceType param so clear - entityManager.clear(); - MergeResourceResponse response = manuallyAddResource(subject, resourceType, parentResourceId, - pluginConfiguration); - result = this.resourceManager.getResourceById(subject, response.getResourceId()); - } catch (Exception e) { - throw new Exception(e.getMessage()); - } + ResourceType resourceType = this.resourceTypeManager.getResourceTypeById(subject, resourceTypeId); + // the subsequent call to manuallyAddResource requires a detached ResourceType param so clear + entityManager.clear(); + MergeResourceResponse response = manuallyAddResource(subject, resourceType, parentResourceId, + pluginConfiguration); + result = this.resourceManager.getResourceById(subject, response.getResourceId());
return result; }
commit 79d201ae9f77c9f48d4b121275d05d3be0c67720 Author: John Mazzitelli mazz@redhat.com Date: Thu Mar 17 11:46:11 2011 -0400
manually adding a resource may take some time to complete, give 5m max
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java index 63014aa..fd9e3ed 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java @@ -66,6 +66,10 @@ public class GWTServiceLookup { return secure(ResourceGWTServiceAsync.Util.getInstance()); }
+ public static ResourceGWTServiceAsync getResourceService(int timeout) { + return secure(ResourceGWTServiceAsync.Util.getInstance(), timeout); + } + public static ResourceGroupGWTServiceAsync getResourceGroupService() { return secure(ResourceGroupGWTServiceAsync.Util.getInstance()); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java index 2723440..8e45760 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java @@ -79,8 +79,8 @@ public class ResourceFactoryImportWizard extends AbstractResourceFactoryWizard { int createTypeId = getChildType().getId(); Configuration newConfiguration = this.getNewResourceConfiguration();
- GWTServiceLookup.getResourceService().manuallyAddResource(createTypeId, parentResourceId, newConfiguration, - new AsyncCallback<Resource>() { + GWTServiceLookup.getResourceService(300000).manuallyAddResource(createTypeId, parentResourceId, + newConfiguration, new AsyncCallback<Resource>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError(MSG.widget_resourceFactoryWizard_importFailure(), caught); getView().closeDialog();