Author: ips
Date: 2008-11-06 15:35:25 -0500 (Thu, 06 Nov 2008)
New Revision: 34
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java
trunk/core/src/main/webapp/WEB-INF/classes/messages.properties
Log:
improve error reporting in GUI for failed EAR/WAR updates
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java
===================================================================
---
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2008-11-05
22:37:07 UTC (rev 33)
+++
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2008-11-06
20:35:25 UTC (rev 34)
@@ -139,7 +139,7 @@
return SUCCESS_OUTCOME;
default:
String cause = (createResourceResponse.getErrorMessage() != null) ?
- createResourceResponse.getErrorMessage() : "unknown";
+ createResourceResponse.getErrorMessage() : "unknown";
facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_ERROR,
"content.resourceInstance.create.failure",
getFileName(), cause);
return FAILURE_OUTCOME;
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java
===================================================================
---
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2008-11-05
22:37:07 UTC (rev 33)
+++
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2008-11-06
20:35:25 UTC (rev 34)
@@ -43,6 +43,8 @@
import org.rhq.core.domain.content.transfer.ContentDiscoveryReport;
import org.rhq.core.domain.content.transfer.DeployPackagesRequest;
import org.rhq.core.domain.content.transfer.ResourcePackageDetails;
+import org.rhq.core.domain.content.transfer.DeployPackagesResponse;
+import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pc.PluginContainer;
@@ -106,7 +108,7 @@
// NOTE: This check is necessary, because the "required" attribute
of the Seam FileUpload component doesn't
// work.
facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_ERROR,
- "content.resourceInstance.create.noFileSelected");
+ "content.resourceInstance.update.noFileSelected");
return FAILURE_OUTCOME;
}
if (!getFileName().equals(this.packageDetails.getFileName())) {
@@ -139,20 +141,32 @@
DeployPackagesRequest deployPackagesRequest = new DeployPackagesRequest(1,
this.resource.getId(), packageDetails);
ContentManager contentManager =
PluginContainer.getInstance().getContentManager();
+ DeployIndividualPackageResponse deployPackageResponse;
try {
- contentManager.deployPackagesImmediately(deployPackagesRequest);
+ DeployPackagesResponse deployPackagesResponse =
contentManager.deployPackagesImmediately(deployPackagesRequest);
+ deployPackageResponse =
deployPackagesResponse.getPackageResponses().iterator().next();
}
- catch (PluginContainerException e) {
- facesMessages.add(FacesMessage.SEVERITY_ERROR, e.getLocalizedMessage());
+ catch (Exception e) {
+ facesMessages.add(FacesMessage.SEVERITY_FATAL, e.getLocalizedMessage());
return FAILURE_OUTCOME;
}
- facesMessages.add(FacesMessage.SEVERITY_INFO, "{0} {1} updated.",
this.packageType.getDisplayName(),
- this.packageDetails.getFileName());
- return SUCCESS_OUTCOME;
+ switch (deployPackageResponse.getResult())
+ {
+ case SUCCESS:
+ facesMessages.add(FacesMessage.SEVERITY_INFO, "{0} {1}
updated.", this.packageType.getDisplayName(),
+ this.packageDetails.getFileName());
+ return SUCCESS_OUTCOME;
+ default:
+ String cause = (deployPackageResponse.getErrorMessage() != null) ?
+ deployPackageResponse.getErrorMessage() : "unknown";
+ facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_ERROR,
"content.resourceInstance.update.failure",
+ getFileName(), cause);
+ return FAILURE_OUTCOME;
+ }
}
- public ResourcePackageDetails getBackingPackage() throws Exception {
+ private ResourcePackageDetails getBackingPackage() throws Exception {
ContentDiscoveryReport report = null;
try {
report =
PluginContainer.getInstance().getContentManager().executeResourcePackageDiscoveryImmediately(
Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages.properties
===================================================================
--- trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2008-11-05 22:37:07 UTC
(rev 33)
+++ trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2008-11-06 20:35:25 UTC
(rev 34)
@@ -160,7 +160,10 @@
content.resourceInstance.create.failure=Failed to create Resource {0} - cause: {1}
#Messages for resourceInstanceContent.xhtml
+content.resourceInstance.update.noFileSelected=Please enter a file to upload.
content.resourceInstance.update.wrongFileName=The specified file must have the same name
as the existing deployed {0} ({1}).
+content.resourceInstance.update.success={0} {1} updated.
+content.resourceInstance.update.failure=Failed to update {0} ({1}).
exception.heading=Internal Error
exception.paragraph1=The application has encountered an error.
Show replies by date