You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2009/03/06 19:05:05 UTC
svn commit: r751010 - in
/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main:
java/org/apache/geronimo/console/jmsmanager/wizard/
webapp/WEB-INF/view/jmswizard/
Author: dwoods
Date: Fri Mar 6 18:05:04 2009
New Revision: 751010
URL: http://svn.apache.org/viewvc?rev=751010&view=rev
Log:
GERONIMO-4550 No error message displays in console when fail to create jms resource. Patch from Gang Yin.
Modified:
geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp
Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java?rev=751010&r1=751009&r2=751010&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java Fri Mar 6 18:05:04 2009
@@ -26,16 +26,21 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
import javax.enterprise.deploy.model.DDBean;
import javax.enterprise.deploy.model.DDBeanRoot;
import javax.enterprise.deploy.spi.DeploymentConfiguration;
import javax.enterprise.deploy.spi.DeploymentManager;
import javax.enterprise.deploy.spi.Target;
import javax.enterprise.deploy.spi.TargetModuleID;
+import javax.enterprise.deploy.spi.status.DeploymentStatus;
+import javax.enterprise.deploy.spi.status.ProgressEvent;
+import javax.enterprise.deploy.spi.status.ProgressListener;
import javax.enterprise.deploy.spi.status.ProgressObject;
import javax.portlet.ActionResponse;
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.connector.deployment.jsr88.AdminObjectDCB;
@@ -461,7 +466,7 @@
return configs[Integer.parseInt(num)].getName();
}
- protected static String save(PortletRequest request, ActionResponse response, JMSResourceData data, boolean planOnly) throws IOException {
+ protected static String save(PortletRequest request, final ActionResponse response, JMSResourceData data, boolean planOnly) throws IOException {
JMSProviderData provider = JMSProviderData.getProviderData(data.rarURI, request);
if(data.objectName == null || data.objectName.equals("")) { // we're creating a new pool
//data.instanceName = data.instanceName.replaceAll("\\s", "");
@@ -624,6 +629,19 @@
targets = new Target[] {targets[0]};
ProgressObject po = mgr.distribute(targets, rarFile, tempFile);
+ po.addProgressListener(new ProgressListener() {
+
+ public void handleProgressEvent(ProgressEvent event) {
+ DeploymentStatus status = event.getDeploymentStatus();
+ String msg = status.getMessage();
+ if (status.isCompleted()) {
+ response.setRenderParameter("successMsg", msg);
+ } else if (status.isFailed()) {
+ response.setRenderParameter("errorMsg", msg);
+ }
+ }
+
+ });
waitForProgress(po);
if(po.getDeploymentStatus().isCompleted()) {
TargetModuleID[] ids = po.getResultTargetModuleIDs();
Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java?rev=751010&r1=751009&r2=751010&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java Fri Mar 6 18:05:04 2009
@@ -169,6 +169,9 @@
renderRequest.setAttribute("resources", resources);
// Get the list of JMS providers
renderRequest.setAttribute("providers", JMSProviderData.getAllProviders());
+
+ renderRequest.setAttribute("successMsg", renderRequest.getParameter("successMsg"));
+ renderRequest.setAttribute("errorMsg", renderRequest.getParameter("errorMsg"));
}
Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp?rev=751010&r1=751009&r2=751010&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp Fri Mar 6 18:05:04 2009
@@ -20,6 +20,13 @@
<fmt:setBundle basename="activemq"/>
<portlet:defineObjects/>
+<c:if test="${!(empty successMsg)}">
+ <div style="color: green; background-color:#F7F7F7; border:1px solid #88A4D7;"><c:out value="${successMsg}"/></div>
+</c:if>
+<c:if test="${!(empty errorMsg)}">
+ <div style="color: red; background-color:#F7F7F7; border:1px solid #88A4D7;"><pre><c:out value="${errorMsg}"/></pre></div>
+</c:if>
+
<p><fmt:message key="jmswizard.list.title" /></p>
<c:choose>