On May 14, 2010, at 1:49 AM, genspr...@apache.org wrote:
> Author: genspring
> Date: Fri May 14 05:49:37 2010
> New Revision: 944122
>
> URL: http://svn.apache.org/viewvc?rev=944122&view=rev
> Log:
> GERONIMO-5274 Deploy New/Install New Application portlet needs some love to
> help out newbies, patch from Hu Di
>
> Modified:
>
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets_en.properties
>
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
>
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo_en.properties
>
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
>
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp
I'm guessing that this change has broken the branches/2.1 automated build
testsuite. All of the 2.1 have failed since May 15. May 14 was the last
successful build. For further evidence, I believe this is the test failure:
-------------------------------------------------------------------------------
Test set: console-testsuite.basic-console
-------------------------------------------------------------------------------
Tests run: 38, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 93.282 sec <<<
FAILURE!
testDeploymentLink(org.apache.geronimo.testsuite.console.DeploymentPortletTest)
Time elapsed: 0.311 sec <<< FAILURE!
com.thoughtworks.selenium.SeleniumException: ERROR: Element link=Deploy New not
found
at
com.thoughtworks.selenium.HttpCommandProcessor.throwAssertionFailureExceptionOrError(HttpCommandProcessor.java:97)
at
com.thoughtworks.selenium.HttpCommandProcessor.doCommand(HttpCommandProcessor.java:91)
at
com.thoughtworks.selenium.DefaultSelenium.click(DefaultSelenium.java:167)
at
org.apache.geronimo.testsuite.console.DeploymentPortletTest.testDeploymentLink(DeploymentPortletTest.java:36)
--kevan
>
> Modified:
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets_en.properties
> URL:
> http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets_en.properties?rev=944122&r1=944121&r2=944122&view=diff
> ==============================================================================
> ---
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets_en.properties
> (original)
> +++
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets_en.properties
> Fri May 14 05:49:37 2010
> @@ -121,8 +121,9 @@ car.viewForDownload.prerequisites
> car.viewForDownload.website = Web Site
>
> configmanager.common.archive = Archive
> -configmanager.common.plan = Plan
> -configmanager.common.startAppAfterInstall = Start app after install
> +configmanager.common.plan = Plan(optional)
> +configmanager.common.startAppAfterInstall = Start application after
> installation
> +configmanager.common.redeployapplication = Redeploy application
> configmanager.deploy.migratedPlan = Migrated plan
> configmanager.deploy.migratedPlanSummary = The deployment plan you
> provided appears to be for a previous version of the application server. A
> migrated version of your plan is provided below for your convenience. Not
> all deployment plans can be fully migrated so some manual editing may be
> required before the migrated plan can be deployed.
> configmanager.deploy.originalPlan = Original plan
> @@ -130,11 +131,12 @@ configmanager.deploy.redeployApplication
> configmanager.deploy.saveLocally = Save this plan locally
> configmanager.deploy.showMigratedPlan = Show Migrated plan
> configmanager.deploy.showOriginalPlan = Show original plan
> -configmanager.deployHelp.archiveExp = Browse to select the war
> file in the Archive box.
> +configmanager.deployHelp.archiveExp = Browse to select the Java
> EE archive file in the Archive box.
> configmanager.deployHelp.installApplication = Install the application in
> the Geronimo server.
> -configmanager.deployHelp.planExp = If the deployment plan is
> separate from the war file, then browse to select it.
> +configmanager.deployHelp.planExp = If the deployment plan is
> separate from the archive file, then browse to select it. If the deployment
> plan is packaged within the archive file, then leave this field blank.
> configmanager.deployHelp.startAppAfterInstallExp = Check this to
> automatically start the application when it is installed. Otherwise, the user
> can start the application by clicking on the associated "Start"
> toggle in the"Installed Applications" window. By default this
> checkbox is checked and newly installed applications will automatically be
> started.
> -configmanager.deployHelp.title = This portlet allows the
> user to deploy new applications on Geronimo. Web applications require
> deployment plans, which are either packaged with the war file or kept in a
> separate file which is typically called geronimo-web.xml.
> +configmanager.deployHelp.redeployapplication = Check this to redeploy
> the application. Geronimo server will try to identify the module from the
> repository and replace it with the new one.
> +configmanager.deployHelp.title = This portlet allows the
> user to deploy or redeploy applications on Geronimo. For example, web
> applications require deployment plans, which are either packaged within the
> war file or kept in a separate file which is typically called
> geronimo-web.xml. A deployment plan can also be a stand-alone xml file when a
> RAR is being used or for providing environment specific settings.
>
> consolebase.common.JVMVersions = JVM Versions
> consolebase.common.actions = Actions
>
> Modified:
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
> URL:
> http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties?rev=944122&r1=944121&r2=944122&view=diff
> ==============================================================================
> ---
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
> (original)
> +++
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
> Fri May 14 05:49:37 2010
> @@ -111,7 +111,8 @@ car.viewForDownload.prerequisites
> car.viewForDownload.website = \u7AD9\u70B9
>
> configmanager.common.archive = \u5F52\u6863\u6587\u4EF6
> -configmanager.common.plan = \u90E8\u7F72\u8BA1\u5212
> +configmanager.common.plan =
> \u90E8\u7F72\u8BA1\u5212(\u53EF\u9009\u7684)
> +configmanager.common.redeployapplication =
> \u91CD\u65B0\u90E8\u7F72\u5E94\u7528
> configmanager.common.startAppAfterInstall =
> \u5B89\u88C5\u540E\u542F\u52A8\u5E94\u7528
> configmanager.deploy.migratedPlan = \u8FC1\u79FB\u8BA1\u5212
> configmanager.deploy.migratedPlanSummary =
> \u4F60\u63D0\u4F9B\u7684\u90E8\u7F72\u8BA1\u5212\u4F3C\u4E4E\u662F\u7528\u4E8E\u5E94\u7528\u670D\u52A1\u5668\u7684\u524D\u4E00\u4E2A\u7248\u672C\u3002\u4E3A\u4E86\u65B9\u4FBF\uFF0C\u5728\u4E0B\u9762\u63D0\u4F9B\u4E86\u4F60\u7684\u90E8\u7F72\u8BA1\u5212\u7684\u8FC1\u79FB\u7248\u672C\u3002\u5E76\u4E0D\u662F\u6240\u6709\u7684\u90E8\u7F72\u8BA1\u5212\u90FD\u80FD\u5B8C\u5168\u5730\u8FC1\u79FB\uFF0C\u6240\u4EE5\u5728\u8FC1\u79FB\u7248\u672C\u7684\u90E8\u7F72\u8BA1\u5212\u80FD\u7528\u4E8E\u90E8\u7F72\u4E4B\u524D\uFF0C\u53EF\u80FD\u9700\u8981\u4E00\u4E9B\u624B\u5DE5\u5730\u4FEE\u6539\u3002
> @@ -120,11 +121,12 @@ configmanager.deploy.redeployApplication
> configmanager.deploy.saveLocally =
> \u4FDD\u5B58\u90E8\u7F72\u8BA1\u5212\u5230\u672C\u5730
> configmanager.deploy.showMigratedPlan =
> \u663E\u793A\u8FC1\u79FB\u540E\u7684\u8BA1\u5212
> configmanager.deploy.showOriginalPlan =
> \u663E\u793A\u79DF\u51FA\u7684\u90E8\u7F72\u8BA1\u5212
> -configmanager.deployHelp.archiveExp =
> \u6D4F\u89C8\u7CFB\u7EDF\u6765\u9009\u62E9war\u5305\u3002
> +configmanager.deployHelp.archiveExp =
> \u6D4F\u89C8\u7CFB\u7EDF\u6765\u9009\u62E9jar\u5305\u3002
> configmanager.deployHelp.installApplication =
> \u5B89\u88C5\u5E94\u7528\u5230Geronimo\u670D\u52A1\u5668\u3002
> -configmanager.deployHelp.planExp =
> \u5982\u679C\u90E8\u7F72\u8BA1\u5212\u6CA1\u6709\u88AB\u6253\u5305\u5728war\u5305\u4E2D\uFF0C\u90A3\u4E48\u70B9\u51FB"\u6D4F\u89C8"\u6309\u94AE\u6765\u9009\u62E9\u90E8\u7F72\u8BA1\u5212\u3002
> +configmanager.deployHelp.planExp =
> \u5982\u679C\u90E8\u7F72\u8BA1\u5212\u6CA1\u6709\u88AB\u6253\u5305\u5728jar\u5305\u4E2D\uFF0C\u90A3\u4E48\u70B9\u51FB"\u6D4F\u89C8"\u6309\u94AE\u6765\u9009\u62E9\u90E8\u7F72\u8BA1\u5212\u3002\u5982\u679C\u90E8\u7F72\u8BA1\u5212\u88AB\u6253\u5305\u5728jar\u5305\u4E2D\uFF0C\u90A3\u4E48\u8FD9\u91CC\u7A7A\u7740\u3002
> +configmanager.deployHelp.redeployapplication =
> \u9009\u4E2D\u8FD9\u4E2A\u590D\u9009\u6846\u6765\u91CD\u65B0\u90E8\u7F72\u5E94\u7528\u3002Geronimo\u670D\u52A1\u5668\u4F1A\u5728\u4ECE\u5B58\u50A8\u5E93\u91CC\u627E\u5230\u8FD9\u4E2A\u6A21\u5757\uFF0C\u5E76\u7528\u65B0\u7684\u6A21\u5757\u66FF\u6362\u6389\u539F\u6709\u7684\u6A21\u5757\u3002
>
> configmanager.deployHelp.startAppAfterInstallExp =
> \u9009\u4E2D\u8FD9\u4E2A\u590D\u9009\u6846\uFF0C\u4F1A\u5728\u5E94\u7528\u5B89\u88C5\u540E\u81EA\u52A8\u542F\u52A8\u5B83\u3002\u5426\u5219\uFF0C\u7528\u6237\u9700\u8981\u5728"\u5DF2\u5B89\u88C5\u5E94\u7528"\u7A97\u53E3\u4E2D\u70B9\u51FB\u76F8\u5E94\u7684"\u542F\u52A8"\u94FE\u63A5\u6765\u542F\u52A8\u5E94\u7528\u3002\u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C\u8FD9\u4E2A\u590D\u9009\u6846\u88AB\u9009\u4E2D\uFF0C\u4F1A\u81EA\u52A8\u5730\u542F\u52A8\u65B0\u5B89\u88C5\u7684\u5E94\u7528\u3002
> -configmanager.deployHelp.title =
> \u8FD9\u4E2Aportlet\u5141\u8BB8\u7528\u6237\u90E8\u7F72\u65B0\u5E94\u7528\u5230Geronimo\u4E2D\u3002Web\u5E94\u7528\u9700\u8981\u90E8\u7F72\u8BA1\u5212\uFF0C\u5B83\u53EF\u4EE5\u88AB\u6253\u5305\u5728war\u5305\u4E2D\uFF0C\u6216\u8005\u4FDD\u5B58\u5728\u4E00\u4E2A\u5355\u72EC\u7684\u901A\u5E38\u53D6\u540D\u4E3Ageronimo-web.xml\u7684\u6587\u4EF6\u4E2D\u3002
> +configmanager.deployHelp.title =
> \u8FD9\u4E2Aportlet\u5141\u8BB8\u7528\u6237\u90E8\u7F72\u6216\u8005\u91CD\u65B0\u90E8\u7F72\u5E94\u7528\u5230Geronimo\u4E2D\u3002\u4F8B\u5982Web\u5E94\u7528\u9700\u8981\u90E8\u7F72\u8BA1\u5212\uFF0C\u5B83\u53EF\u4EE5\u88AB\u6253\u5305\u5728war\u5305\u4E2D\uFF0C\u6216\u8005\u4FDD\u5B58\u5728\u4E00\u4E2A\u5355\u72EC\u7684\u901A\u5E38\u53D6\u540D\u4E3Ageronimo-web.xml\u7684\u6587\u4EF6\u4E2D\u3002\u5F53\u67D0\u4E2ARAR\u6587\u4EF6\u5728\u4F7F\u7528\u7684\u65F6\u5019\u6216\u662F\u4E3A\u4E86\u63D0\u4F9B\u7279\u5B9A\u7684\u73AF\u5883\u8BBE\u7F6E\u65F6\uFF0C\u90E8\u7F72\u8BA1\u5212\u4E5F\u53EF\u4EE5\u662F\u4E00\u4E2A\u5355\u72EC\u7684xml\u6587\u4EF6\u3002
>
> consolebase.common.JVMVersions = JVM\u7248\u672C
> consolebase.common.actions = \u64CD\u4F5C
>
> Modified:
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo_en.properties
> URL:
> http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo_en.properties?rev=944122&r1=944121&r2=944122&view=diff
> ==============================================================================
> ---
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo_en.properties
> (original)
> +++
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo_en.properties
> Fri May 14 05:49:37 2010
> @@ -21,9 +21,9 @@ Create\ Plugin = Create Plugin
>
> Create\ and\ Install\ Plugins = Create and Install Plugins
>
> -Deploy\ New = Deploy New
> +Deploy\ New = Deployer
>
> -Install\ New\ Applications = Install New Applications
> +Install\ New\ Applications = Install Application
>
> Install\ Plugins = Install Plugins
>
>
> Modified:
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
> URL:
> http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties?rev=944122&r1=944121&r2=944122&view=diff
> ==============================================================================
> ---
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
> (original)
> +++
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
> Fri May 14 05:49:37 2010
> @@ -1,3 +1,4 @@
> +#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
> #=====================================================================
> # Licensed to the Apache Software Foundation (ASF) under one or more
> # contributor license agreements. See the NOTICE file distributed with
> @@ -14,20 +15,27 @@
> # See the License for the specific language governing permissions and
> # limitations under the License.
> #=====================================================================
> +
> Create\ and\ Install\ Plugins = \u521B\u5EFA/\u5B89\u88C5\u63D2\u4EF6
>
> -Deploy\ New = \u90E8\u7F72\u65B0\u5E94\u7528
> +Deploy\ New = \u90E8\u7F72\u5E94\u7528
>
> -Install\ New\ Applications = \u5B89\u88C5\u65B0\u7684\u5E94\u7528
> +Install\ New\ Applications = \u5B89\u88C5\u5E94\u7528
>
> Plugins = \u63D2\u4EF6
>
> Security\ Realms = \u5B89\u5168\u57DF
>
> errorMsg01 = \u90E8\u7F72\u5931\u8D25
> +
> errorMsg02 = \u672A\u6210\u529F\u542F\u52A8\u5E94\u7528
> +
> errorMsg03 =
> \u540C\u540D\u5B89\u5168\u57DF\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u6307\u5B9A\u65B0\u7684\u5B89\u5168\u57DF\u540D\u79F0\u3002
> -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
> -infoMsg01 = \u6210\u529F\u90E8\u7F72\u5E94\u7528
> -infoMsg02 = \u6210\u529F\u91CD\u65B0\u90E8\u7F72\u5E94\u7528
> -infoMsg03 = \u6210\u529F\u542F\u52A8\u5E94\u7528
> +
> +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
> +
> +infoMsg01 = \u6210\u529F\u90E8\u7F72\u5E94\u7528
> +
> +infoMsg02 = \u6210\u529F\u91CD\u65B0\u90E8\u7F72\u5E94\u7528
> +
> +infoMsg03 = \u6210\u529F\u542F\u52A8\u5E94\u7528
>
> Modified:
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp
> URL:
> http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp?rev=944122&r1=944121&r2=944122&view=diff
> ==============================================================================
> ---
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp
> (original)
> +++
> geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp
> Fri May 14 05:49:37 2010
> @@ -34,6 +34,10 @@
> <td class="LightBackground" style="padding: 10px 5px 10px
> 10px"><fmt:message key="configmanager.deployHelp.startAppAfterInstallExp"
> /></td>
> </tr>
> <tr>
> + <td width="150" align="right" valign="top" class="MediumBackground"
> style="padding: 10px 10px 10px 5px; color: #1E1E52;"> <fmt:message
> key="configmanager.common.redeployapplication" /></td>
> + <td class="LightBackground" style="padding: 10px 5px 10px
> 10px"><fmt:message key="configmanager.deployHelp.redeployapplication" /></td>
> + </tr>
> + <tr>
> <td width="150" align="right" valign="top" class="MediumBackground"
> style="padding: 10px 10px 5px 10px"><img src="/console/images/install.gif"
> alt="Install"/></td>
> <td class="LightBackground" style="padding: 10px 5px 10px
> 10px"><fmt:message key="configmanager.deployHelp.installApplication" /></td>
> </tr>
>
>
