modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationValidationException.java
| 2 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java
| 20 ++--------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
| 2 -
3 files changed, 7 insertions(+), 17 deletions(-)
New commits:
commit a3654c9264048a7217eb1a825964db8f07739f7b
Author: John Sanda <john(a)localhost.localdomain>
Date: Tue Mar 2 13:53:54 2010 -0500
Making ConfigurationValidationException a checked exception so that the EJB container
treats it as an application exception
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationValidationException.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationValidationException.java
index 03628b7..913be20 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationValidationException.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationValidationException.java
@@ -21,7 +21,7 @@ package org.rhq.core.domain.configuration;
import java.util.Collections;
import java.util.Map;
-public class ConfigurationValidationException extends RuntimeException {
+public class ConfigurationValidationException extends Exception {
private static final long serialVersionUID = -6924768743906659205L;
/**
diff --git
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java
index 6460a81..d3907b2 100644
---
a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java
+++
b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java
@@ -196,21 +196,11 @@ public class ResourceConfigurationEditor extends
ResourceConfigurationViewer imp
return "nochange";
}
}
- } catch (EJBException e) {
- if (e.getCausedByException() != null &&
- e.getCausedByException() instanceof ConfigurationValidationException) {
- ConfigurationValidationException validationException =
- (ConfigurationValidationException) e.getCausedByException();
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
"Configuration update failed: " +
- validationException.getMessage());
- copyErrorMessages(validationException);
- return "failure";
- }
- else {
- FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Unable
to contact the remote agent.", e
- .getCause());
- return "failure";
- }
+ } catch (ConfigurationValidationException e) {
+ FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR,
"Configuration update failed: " +
+ e.getMessage());
+ copyErrorMessages(e);
+ return "failure";
}
// updateRequest will be null if there is no change to the configuration.
ConfigurationManagerBean checks to
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 37e4054..41cbf01 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -1026,7 +1026,7 @@ public class ConfigurationManagerBean implements
ConfigurationManagerLocal, Conf
@Nullable
public ResourceConfigurationUpdate updateResourceConfiguration(Subject subject, int
resourceId,
@XmlJavaTypeAdapter(ConfigurationAdapter.class) Configuration newConfiguration)
- throws ResourceNotFoundException {
+ throws ResourceNotFoundException, ConfigurationValidationException {
if (isStructuredAndRawSupported(resourceId)) {
throw new ConfigurationUpdateNotSupportedException("Cannot update a
resource configuration that "
Show replies by date