geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r780369 - in /geronimo/server/trunk/plugins/console/plugin-portlets/src/main: java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java resources/portletinfo.properties resources/portletinfo_zh.properties
Date Sun, 31 May 2009 05:24:08 GMT
Author: xuhaihong
Date: Sun May 31 05:24:08 2009
New Revision: 780369

URL: http://svn.apache.org/viewvc?rev=780369&view=rev
Log:
GERONIMO-4305 PortletException with Redeploy application checked for non existent application
(Patch from Rex Wang)

Modified:
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java?rev=780369&r1=780368&r2=780369&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
Sun May 31 05:24:08 2009
@@ -64,8 +64,7 @@
     private static final String HELP_VIEW            = "/WEB-INF/view/configmanager/deployHelp.jsp";
     private static final String MIGRATED_PLAN_PARM   = "migratedPlan";
     private static final String ORIGINAL_PLAN_PARM   = "originalPlan";
-    private static final String FULL_STATUS_PARM     = "fullStatusMessage";
-    private static final String ABBR_STATUS_PARM     = "abbrStatusMessage";
+
     private PortletRequestDispatcher deployView;
     private PortletRequestDispatcher helpView;
 
@@ -141,7 +140,8 @@
                 if(isRedeploy) {
                     TargetModuleID[] targets = identifyTargets(moduleFile, planFile, mgr.getAvailableModules(null,
all));
                     if(targets.length == 0) {
-                        throw new PortletException("Unable to identify modules to replace.
 Please include a Geronimo deployment plan or use the command-line deployment tool.");
+                    	addErrorMessage(actionRequest, getLocalizedString(actionRequest, "plugin.errorMsg04"),
null);
+                    	return;
                     }
                     progress = mgr.redeploy(targets, moduleFile, planFile);
                 } else {
@@ -250,7 +250,7 @@
         } catch (IOException e) {
             throw new PortletException("Unable to read input files: "+e.getMessage());
         } catch (DeploymentException e) {
-            throw new PortletException(e.getMessage(), e);
+        	return new TargetModuleID[0];
         }
         return (TargetModuleID[]) modules.toArray(new TargetModuleID[modules.size()]);
     }

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties?rev=780369&r1=780368&r2=780369&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
Sun May 31 05:24:08 2009
@@ -31,7 +31,8 @@
 
 plugin.errorMsg01 = Deployment Failed
 plugin.errorMsg02 = The application was not successfully started
-plugin.errorMsg03  = Security realm with the same name already exists, please specify a new
security realm name.
+plugin.errorMsg03 = Security realm with the same name already exists, please specify a new
security realm name.
+plugin.errorMsg04 = Unable to identify modules to replace. Please check if it has already
been stopped or undeployed.
 plugin.infoMsg01  = The application was successfully deployed.
 plugin.infoMsg02  = The application was successfully redeployed.
 plugin.infoMsg03  = The application was successfully started.

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties?rev=780369&r1=780368&r2=780369&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
Sun May 31 05:24:08 2009
@@ -32,7 +32,8 @@
 
 plugin.errorMsg01 = \u90E8\u7F72\u5931\u8D25
 plugin.errorMsg02 = \u672A\u6210\u529F\u542F\u52A8\u5E94\u7528
-plugin.errorMsg03  = \u540C\u540D\u5B89\u5168\u57DF\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u6307\u5B9A\u65B0\u7684\u5B89\u5168\u57DF\u540D\u79F0\u3002
+plugin.errorMsg03 = \u540C\u540D\u5B89\u5168\u57DF\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u6307\u5B9A\u65B0\u7684\u5B89\u5168\u57DF\u540D\u79F0\u3002
+plugin.errorMsg04 = \u00d3\u00a6\u00d3\u00c3\u00b7\u00fe\u00ce\u00f1\u00c6\u00f7\u00d6\u00d0\u00b2\u00bb\u00b4\u00e6\u00d4\u00da\u00c4\u00fa\u00cb\u00f9\u00d2\u00aa\u00c7\u00f3\u00d6\u00d8\u00d0\u00c2\u00b2\u00bf\u00ca\u00f0\u00b5\u00c4\u00c4\u00a3\u00bf\u00e9\u00a1\u00a3\u00c7\u00eb\u00bc\u00ec\u00b2\u00e9\u00ca\u00c7\u00b7\u00f1\u00cb\u00fc\u00d2\u00d1\u00be\u00ad\u00cd\u00a3\u00d6\u00b9\u00bb\u00f2\u00d0\u00b6\u00d4\u00d8\u00a1\u00a3
 plugin.infoMsg01  = \u6210\u529F\u90E8\u7F72\u5E94\u7528
 plugin.infoMsg02  = \u6210\u529F\u91CD\u65B0\u90E8\u7F72\u5E94\u7528
 plugin.infoMsg03  = \u6210\u529F\u542F\u52A8\u5E94\u7528



Mime
View raw message