svn commit: r942994 - in /geronimo/server/trunk/plugins/console/plugin-portlets/src/main: i18n-resources/pluginportlets_en.properties i18n-resources/portletinfo_en.properties webapp/WEB-INF/view/configmanager/deployHelp.jsp

[ge...@apache.org]

Author: genspring
Date: Tue May 11 03:28:35 2010
New Revision: 942994

URL: http://svn.apache.org/viewvc?rev=942994&view=rev
Log:
GERONIMO-5274 Deploy New/Install New Application portlet needs some love to help out newbies

Modified:
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties?rev=942994&r1=942993&r2=942994&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/pluginportlets_en.properties Tue May 11 03:28:35 2010
@@ -138,8 +138,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
@@ -148,11 +149,12 @@ configmanager.deploy.saveLocally        
 configmanager.deploy.showDetail                  = Show full details
 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/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=942994&r1=942993&r2=942994&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/i18n-resources/portletinfo_en.properties Tue May 11 03:28:35 2010
@@ -19,9 +19,9 @@ Assemble\ Server = Assemble Server
 
 Create\ Plugin = Create Plugin
 
-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/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp?rev=942994&r1=942993&r2=942994&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp Tue May 11 03:28:35 2010
@@ -33,6 +33,10 @@
     <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> <fmt:message key="configmanager.common.startAppAfterInstall" /></td>
     <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>