From: Anissa Lam <Anissa.Lam_at_Sun.COM>
Date: Wed, 24 Oct 2007 11:45:04 -0700

Please review the changes for  bug# 6619915

*Synopsis*: developer profile's Common Task page should  have the 'Add Cluster Support' task

Code change include:
- add the common task to the developer profile's Common Task page
- 'Add Cluster Support' page now takes in the cancelPage request parameter, so that if user hits Cancel key, they will be back to where they comes from:  either app server general page or the common task page.

The diff is attached.

thanks
Anissa.

 

Index: commonTask.jsf
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/docroot/commonTask.jsf,v
retrieving revision 1.18.4.1
diff -u -r1.18.4.1 commonTask.jsf
--- commonTask.jsf 2 Oct 2007 03:45:55 -0000 1.18.4.1
+++ commonTask.jsf 22 Oct 2007 23:49:31 -0000
@@ -91,7 +91,20 @@
                                 redirect(page="appServer/monitorRuntime.jsf?instanceName=server&configName=server-config");
                             />
                         </sun:commonTask>
- </sun:commonTasksGroup>
+ </sun:commonTasksGroup>
+
+ <sun:commonTasksGroup title="$resource{i18n.commonTasks.group.enterpriseTask}">
+ <sun:commonTask
+ text="$resource{i18n.commonTasks.task.addClusterSupport}"
+ toolTip="$resource{i18n.commonTasks.task.addClusterSupport.toolTip}"
+ infoLinkUrl="/com_sun_webui_jsf/help/helpwindow.jsf?&windowTitle=Help+Window&helpFile=upgradeprofile.html" onClick="admingui.nav.selectTreeNodeById('form:tree:applicationServer');" target="main">
+ <!command
+ setSessionAttribute(key="serverInstTabs" value="general");
+ redirect(page="appServer/upgradeProfile.jsf?cancelPage=../homePage.jsf");
+ />
+ </sun:commonTask>
+ </sun:commonTasksGroup>
+
                     <sun:commonTasksGroup title="$resource{i18n.commonTasks.group.Other}">
                         <sun:commonTask
                             text="$resource{i18n.commonTasks.task.searchLog}"


Index: upgradeProfile.jsf
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/docroot/appServer/upgradeProfile.jsf,v
retrieving revision 1.2
diff -u -r1.2 upgradeProfile.jsf
--- upgradeProfile.jsf 17 May 2007 05:24:00 -0000 1.2
+++ upgradeProfile.jsf 22 Oct 2007 23:51:20 -0000
@@ -40,6 +40,7 @@
     setResourceBundle(key="i18n" bundle="com.sun.enterprise.tools.admingui.resources.Strings")
     setResourceBundle(key="help" bundle="com.sun.enterprise.tools.admingui.resources.Helplinks")
     setPageSessionAttribute(key="successMsg" value="$resource{i18n.msg.upgradeSuccess}")
+ getRequestValue(key="cancelPage" value=>$page{cancelPage});
     />
 #include "shared/restart.inc"
     <sun:html id="html2">
@@ -65,7 +66,7 @@
                       </sun:button>
                       <sun:button id="cancelButton" text="$resource{i18n.button.Cancel}" immediate="$boolean{true}" primary="#{false}">
                         <!command
- redirect(page="serverInstGeneralPe.jsf");
+ redirect(page="#{cancelPage}");
                         />
                     </sun:button>
                 </sun:panelGroup>


Index: serverInstGeneralPe.jsf
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/docroot/appServer/serverInstGeneralPe.jsf,v
retrieving revision 1.10
diff -u -r1.10 serverInstGeneralPe.jsf
--- serverInstGeneralPe.jsf 17 May 2007 05:09:32 -0000 1.10
+++ serverInstGeneralPe.jsf 22 Oct 2007 23:50:39 -0000
@@ -90,7 +90,7 @@
                         />
                         <sun:button id="upgradeProfile" text="$resource{i18n.button.upgradeProfile}" primary="#{false}" disabled="#{disableUpgrade}">
                             <!command
- redirect(page="upgradeProfile.jsf");
+ redirect(page="upgradeProfile.jsf?cancelPage=serverInstGeneralPe.jsf");
                             />
                         </sun:button>
                         <sun:button id="recoverTrans" text="$resource{i18n.button.recoverTrans}" primary="#{false}">