Hi Irfan,
You can send your reviews to admin_at_glassfish.dev.java.net (I've cc'd
them in my reply). Anissa at a minimum should also see the changes you
are submitting.
Here are my comments / questions:
1) Around line #670 in clusterProfileTree.jsf did you intend to add this
line:
+ rendered="#{showLoadBalancer}"
Similarly in clusterGeneral.jsf around line #114 and clusterTable.jsf
line #149 did you mean to add the showLoadBalancer reference?
- <sun:property id="lb" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.inst.lbLabel}" >
+ <sun:property id="lb" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
+ label="$resource{i18n.inst.lbLabel}" rendered="#{showLoadBalancer}">
and:
+ rowHeader="$boolean{true}" id="lb" rendered="#{showLoadBalancer}">
After looking at the code more closely I see you are adding this session
variable in our code (w/ value=true) and in your code (w/ value=false).
Perhaps this is OK... however, I want to make sure Anissa and others in
the admin console are aware of this change so they don't wonder why it's
there. Anissa, perhaps you have other ideas on how this should work?
2) In MBeanTreeAdaptor.java you set both the parent node and the
children node's "rendered" property using the same value
(getOption("rendered")). I do not think this is necessary. If the
parent node is not rendered, nothing under it will be rendered. Also,
the pattern we use in this file is to use "childRenderer" for child
properties... not to re-use the parent properties. So I recommend
either removing the child "rendered" property entirely, or to add a
separate rendered property for children called "childRendered".
Also, in this file (and probably others), I noticed that your indenting
is incorrect (as shown by your own diff). This appears to be because
you have your editor set to interpret a TAB as 4 spaces -- a TAB should
always be 8 spaces. An "indent" (sometimes called a "tab stop" or
"shift width" or other names) can be 4 spaces (or whatever you want).
See if you can fix your editor to correctly indent spaces. Also, fixing
this will make reading our code easier as you'll see the indentation
correctly (I'm sure it looks awful in your editor right now! :) ).
Here's an example where your diffs show the wrong spacing:
setProperty(props, "actionListener", desc.getOption("actionListener"));
setProperty(props, "expanded", desc.getOption("expanded"));
+ setProperty(props, "rendered", desc.getOption("rendered"));
The rest looked fine. As always, make sure you test w/ and w/o SIP present.
Thanks!
Ken
attached mail follows:
Hi Ken,
I have removed the code which was specific to Sailfin and used the
include tag to include code from sailfin branch. The changes also
contain code to hide the HTTP Load Balancer in Sailfin.
Please go through the changes and let me know your comments on the same.
Also I have tested the changes both in Sailfin as well as pure GF.
Thanks and Warm Rgds,
Irfan.
--
Irfan Ahmed
9180-66927726, Sun Microsystems Inc., Bangalore, India.
Index: glassfish/admin-gui/src/docroot/clusterProfileTree.jsf
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/docroot/clusterProfileTree.jsf,v
retrieving revision 1.15.6.6
diff -u -r1.15.6.6 clusterProfileTree.jsf
--- glassfish/admin-gui/src/docroot/clusterProfileTree.jsf 18 Dec 2007 06:19:10 -0000 1.15.6.6
+++ glassfish/admin-gui/src/docroot/clusterProfileTree.jsf 18 Dec 2007 09:54:21 -0000
@@ -235,6 +235,7 @@
</dynamicTreeNode>
+ <!include src="/sip/includes/applications.inc" required="false"/>
</sun:treeNode>
<!-- ===================================== WebServices ====================== -->
@@ -260,60 +261,6 @@
/>
</dynamicTreeNode>
- <!-- =============================== SIP Applications ============================== -->
- <sun:treeNode id="sipRootNode"
- text="$resource{sip.sipApps.label}"
- url="/sip/applications/sipApplications.jsf"
- target="main"
- expanded="$boolean{true}"
- rendered="#{SipConfigBean.enabled}"
- imageURL="resource/images/sip/sipMain.gif">
-
- <dynamicTreeNode id="sipModules"
- treeAdaptorClass="com.sun.extensions.comms.SIPTreeAdaptor"
- treeAdaptorListType="sipModules"
- objectName="com.sun.appserv:type=applications,category=config"
- methodName="getExtensionModule"
- text="$resource{sip.sipModules.label}"
- url="/sip/applications/sipModules.jsf"
- target="main"
- expanded="$boolean{false}"
- attributeName="name"
- childImageURL="resource/images/webModule.gif"
- childTarget="main"
- childExpanded="$boolean{false}"
- childURL="sip/applications/sipModuleEdit.jsf?appName=#{$this{valueBinding}.text}&hasContextRoot=false"
- rendered="#{SipConfigBean.enabled}">
- <!facet image>
- <sun:iconHyperlink id="abc" icon="TREE_FOLDER" url="/sip/applications/sipModules.jsf"
- target="main" border="$int{0}" immediate="$boolean{true}" />
- </facet>
- <!filterTree filterSystemApps() />
- </dynamicTreeNode>
-
- <dynamicTreeNode id="convergedSipModules"
- treeAdaptorClass="com.sun.extensions.comms.SIPTreeAdaptor"
- treeAdaptorListType="convergedSipModules"
- objectName="com.sun.appserv:type=applications,category=config"
- methodName="getExtensionModule"
- text="$resource{sip.convergedSipModules.label}"
- url="/sip/applications/convergedSipModules.jsf"
- target="main"
- expanded="$boolean{false}"
- attributeName="name"
- childImageURL="resource/images/webModule.gif"
- childTarget="main"
- childExpanded="$boolean{false}"
- childURL="sip/applications/sipModuleEdit.jsf?appName=#{$this{valueBinding}.text}&hasContextRoot=true"
- rendered="#{SipConfigBean.enabled}">
- <!facet image>
- <sun:iconHyperlink id="abc" icon="TREE_FOLDER" url="/sip/applications/convergedSipModules.jsf"
- target="main" border="$int{0}" immediate="$boolean{true}" />
- </facet>
- <!filterTree filterSystemApps() />
- </dynamicTreeNode>
- </sun:treeNode>
-
<!-- ============================== Java Business Integration ================= -->
<sun:treeNode id="JBIRoot"
@@ -720,27 +667,12 @@
url="loadBalancer/loadBalancers.jsf"
target="main"
imageURL="resource/images/loadbalancers.gif"
+ rendered="#{showLoadBalancer}"
>
</dynamicTreeNode>
- <!-- ===================== Converged Load Balancers ===================== -->
- <dynamicTreeNode id="convergedLoadBalancers"
- treeAdaptorClass="com.sun.extensions.comms.SIPTreeAdaptor"
- treeAdaptorListType="clb"
- objectName="com.sun.appserv:type=converged-lb-configs,category=config"
- methodName="listConvergedLoadBalancers"
- attributeName=""
- childImageURL="resource/images/loadbalancer.gif"
- childTarget="main"
- childExpanded="$boolean{false}"
- childURL="sip/clb/clbConfigSettings.jsf?lbName=#{$this{valueBinding}.text}"
- text="$resource{sip.clb.clbs.pageTitle}"
- url="sip/clb/clbs.jsf"
- target="main"
- imageURL="resource/images/loadbalancers.gif"
- rendered="#{SipConfigBean.enabled}">
- </dynamicTreeNode>
+ <!include src="/sip/includes/clb.inc" required="false"/>
<!-- =========================== Node Agents ====================== -->
<dynamicTreeNode id="nodeAgents"
@@ -948,26 +880,8 @@
<sun:iconHyperlink id="abc" icon="TREE_FOLDER" url="/configuration/msgSecurityConfigs.jsf?configName=${configName}" target="main" border="$int{0}" immediate="$boolean{true}" />
</facet>
</dynamicTreeNode>
- <dynamicTreeNode id="sipSecurity"
- treeAdaptorClass="com.sun.extensions.comms.SIPTreeAdaptor"
- objectName="com.sun.appserv:type=security-service,config=${configName},category=config"
- methodName="getIdentityAssertionTrustNamesList"
- attributeName="id"
- childImageURL="resource/images/Security.gif"
- childTarget="main"
- childExpanded="$boolean{false}"
- childURL="/sip/configuration/security/trustConfigs.jsf?name=#{$this{valueBinding}.text}&configName=${configName}"
- targetConfigName="${configName}"
- text="$resource{sip.security.trustConfigs.pageTitle}"
- url="/sip/configuration/security/trustConfigs.jsf?configName=${configName}"
- target="main"
- rendered="#{SipConfigBean.enabled}"
- >
- <!facet image>
- <sun:iconHyperlink id="abc" icon="TREE_FOLDER" url="/sip/configuration/security/trustConfigs.jsf?configName=${configName}"
- target="main" border="$int{0}" immediate="$boolean{true}" />
- </facet>
- </dynamicTreeNode>
+
+ <!include src="/sip/includes/securityCluster.inc" required="false"/>
</sun:treeNode>
<sun:treeNode id="availabilityService" visible="${show}"
@@ -1048,33 +962,7 @@
</dynamicTreeNode>
</sun:treeNode>
- <sun:treeNode id="sipService"
- text="$resource{sip.sipService}"
- url="/sip/configuration/sipService.jsf?configName=${configName}"
- imageURL="resource/images/httpservice.gif"
- target="main"
- rendered="#{SipConfigBean.enabled}">
-
- <dynamicTreeNode id="sipListeners"
- treeAdaptorClass="com.sun.extensions.comms.SIPTreeAdaptor"
- treeAdaptorListType="sipListeners"
- objectName="com.sun.appserv:type=sip-service,category=config,config=${configName}"
- methodName="getSipListenerNamesList"
- attributeName="id"
- childImageURL="resource/images/http.gif"
- childTarget="main"
- childExpanded="$boolean{false}"
- childURL="/sip/configuration/sipListenerEdit.jsf?name=#{$this{valueBinding}.text}&configName=${configName}"
- text="$resource{sip.sipListeners}"
- url="/sip/configuration/sipListeners.jsf?configName=${configName}"
- target="main">
- <!facet image>
- <sun:iconHyperlink id="abc"
- icon="TREE_FOLDER" url="/sip/configuration/sipListeners.jsf?configName=${configName}"
- target="main" border="$int{0}" immediate="$boolean{true}" />
- </facet>
- </dynamicTreeNode>
- </sun:treeNode>
+ <!include src="/sip/includes/sipServiceCluster.inc" required="false"/>
<sun:treeNode id="orb"
text="$resource{i18n.tree.orb}"
Index: glassfish/admin-gui/src/docroot/peTree.jsf
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/docroot/peTree.jsf,v
retrieving revision 1.12.6.6
diff -u -r1.12.6.6 peTree.jsf
--- glassfish/admin-gui/src/docroot/peTree.jsf 18 Dec 2007 06:20:44 -0000 1.12.6.6
+++ glassfish/admin-gui/src/docroot/peTree.jsf 18 Dec 2007 09:54:21 -0000
@@ -232,7 +232,9 @@
<sun:iconHyperlink id="abc" icon="TREE_FOLDER" url="/applications/appclientModules.jsf" target="main" border="$int{0}" immediate="$boolean{true}" />
</facet>
</dynamicTreeNode>
- </sun:treeNode>
+
+ <!include src="/sip/includes/applications.inc" required="false"/>
+ </sun:treeNode>
@@ -259,61 +261,6 @@
/>
</dynamicTreeNode>
- <!-- =============================== SIP Applications ============================== -->
- <sun:treeNode id="sipRootNode"
- text="$resource{sip.sipApps.label}"
- url="/sip/applications/sipApplications.jsf"
- target="main"
- expanded="$boolean{false}"
- rendered="#{SipConfigBean.enabled}"
- imageURL="resource/images/sip/sipMain.gif">
-
- <dynamicTreeNode id="sipModules"
- treeAdaptorClass="com.sun.extensions.comms.SIPTreeAdaptor"
- treeAdaptorListType="sipModules"
- objectName="com.sun.appserv:type=applications,category=config"
- methodName="getExtensionModule"
- text="$resource{sip.sipModules.label}"
- url="/sip/applications/sipModules.jsf"
- target="main"
- expanded="$boolean{false}"
- attributeName="name"
- childImageURL="resource/images/webModule.gif"
- childTarget="main"
- childExpanded="$boolean{false}"
- childURL="sip/applications/sipModuleEdit.jsf?appName=#{$this{valueBinding}.text}&hasContextRoot=false"
- rendered="#{SipConfigBean.enabled}">
- <!facet image>
- <sun:iconHyperlink id="abc" icon="TREE_FOLDER" url="/sip/applications/sipModules.jsf"
- target="main" border="$int{0}" immediate="$boolean{true}" />
- </facet>
- <!filterTree filterSystemApps() />
- </dynamicTreeNode>
-
- <dynamicTreeNode id="convergedSipModules"
- treeAdaptorClass="com.sun.extensions.comms.SIPTreeAdaptor"
- treeAdaptorListType="convergedSipModules"
- objectName="com.sun.appserv:type=applications,category=config"
- methodName="getExtensionModule"
- text="$resource{sip.convergedSipModules.label}"
- url="/sip/applications/convergedSipModules.jsf"
- target="main"
- expanded="$boolean{false}"
- attributeName="name"
- childImageURL="resource/images/webModule.gif"
- childTarget="main"
- childExpanded="$boolean{false}"
- childURL="sip/applications/sipModuleEdit.jsf?appName=#{$this{valueBinding}.text}&hasContextRoot=true"
- rendered="#{SipConfigBean.enabled}">
- <!facet image>
- <sun:iconHyperlink id="abc" icon="TREE_FOLDER" url="/sip/applications/convergedSipModules.jsf"
- target="main" border="$int{0}" immediate="$boolean{true}" />
- </facet>
- <!filterTree filterSystemApps() />
- </dynamicTreeNode>
- </sun:treeNode>
-
-
<!-- ============================== Java Business Integration ================= -->
<sun:treeNode id="JBIRoot"
@@ -798,26 +745,8 @@
<sun:iconHyperlink id="abc" icon="TREE_FOLDER" url="/configuration/msgSecurityConfigs.jsf?configName=#{configName}" target="main" border="$int{0}" immediate="$boolean{true}" />
</facet>
</dynamicTreeNode>
- <dynamicTreeNode id="sipSecurity"
- treeAdaptorClass="com.sun.extensions.comms.SIPTreeAdaptor"
- objectName="com.sun.appserv:type=security-service,config=$pageSession{configName},category=config"
- methodName="getIdentityAssertionTrustNamesList"
- attributeName="id"
- childImageURL="resource/images/Security.gif"
- childTarget="main"
- childExpanded="$boolean{false}"
- childURL="/sip/configuration/security/trustConfigs.jsf?name=#{$this{valueBinding}.text}&configName=#{configName}"
- targetConfigName="#{configName}"
- text="$resource{sip.security.trustConfigs.pageTitle}"
- url="/sip/configuration/security/trustConfigs.jsf?configName=#{configName}"
- target="main"
- rendered="#{SipConfigBean.enabled}"
- >
- <!facet image>
- <sun:iconHyperlink id="abc" icon="TREE_FOLDER" url="/sip/configuration/security/trustConfigs.jsf?configName=#{configName}"
- target="main" border="$int{0}" immediate="$boolean{true}" />
- </facet>
- </dynamicTreeNode>
+
+ <!include src="/sip/includes/security.inc" required="false"/>
</sun:treeNode>
<sun:treeNode id="transactionService"
@@ -878,36 +807,7 @@
</dynamicTreeNode>
</sun:treeNode>
-
- <sun:treeNode id="sipService"
- text="$resource{sip.sipService}"
- url="/sip/configuration/sipService.jsf?configName=#{configName}"
- imageURL="resource/images/httpservice.gif"
- target="main"
- rendered="#{SipConfigBean.enabled}">
-
- <dynamicTreeNode id="sipListeners"
- treeAdaptorClass="com.sun.extensions.comms.SIPTreeAdaptor"
- treeAdaptorListType="sipListeners"
- objectName="com.sun.appserv:type=sip-configs,category=config"
- methodName="listSipListeners"
- parameters=""
- paramTypes="java.lang.String"
- attributeName="id"
- childImageURL="resource/images/http.gif"
- childTarget="main"
- childExpanded="$boolean{false}"
- childURL="/sip/configuration/sipListenerEdit.jsf?name=#{$this{valueBinding}.text}&configName=#{configName}"
- text="$resource{sip.sipListeners}"
- url="/sip/configuration/sipListeners.jsf?configName=#{configName}"
- target="main">
- <!facet image>
- <sun:iconHyperlink id="abc"
- icon="TREE_FOLDER" url="/sip/configuration/sipListeners.jsf?configName=#{configName}"
- target="main" border="$int{0}" immediate="$boolean{true}" />
- </facet>
- </dynamicTreeNode>
- </sun:treeNode>
+ <!include src="/sip/includes/sipService.inc" required="false"/>
<sun:treeNode id="orb"
text="$resource{i18n.tree.orb}"
Index: glassfish/admin-gui/src/docroot/applications/applications.jsf
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/docroot/applications/applications.jsf,v
retrieving revision 1.4
diff -u -r1.4 applications.jsf
--- glassfish/admin-gui/src/docroot/applications/applications.jsf 5 May 2007 05:26:59 -0000 1.4
+++ glassfish/admin-gui/src/docroot/applications/applications.jsf 18 Dec 2007 09:54:21 -0000
@@ -104,6 +104,7 @@
<sun:staticText text=" $resource{i18n.tree.appclientModules}" />
</sun:hyperlink>
</sun:property>
+ <!include src="/sip/includes/applicationLinks.inc" required="false"/>
</sun:propertySheetSection >
</sun:propertySheet>
<sun:hidden id="helpKey" value="$resource{help.applications}" />
Index: glassfish/admin-gui/src/docroot/cluster/clusterGeneral.jsf
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/docroot/cluster/clusterGeneral.jsf,v
retrieving revision 1.9
diff -u -r1.9 clusterGeneral.jsf
--- glassfish/admin-gui/src/docroot/cluster/clusterGeneral.jsf 5 May 2007 05:27:04 -0000 1.9
+++ glassfish/admin-gui/src/docroot/cluster/clusterGeneral.jsf 18 Dec 2007 09:54:21 -0000
@@ -110,7 +110,8 @@
<sun:hyperlink id="configlink" text="#{config}"
url="/configuration/configuration.jsf?configName=#{config}" />
</sun:property>
- <sun:property id="lb" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.inst.lbLabel}" >
+ <sun:property id="lb" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
+ label="$resource{i18n.inst.lbLabel}" rendered="#{showLoadBalancer}">
<event>
<!beforeEncode
getLBforTarget(targetName="#{clusterName}", isCluster="$boolean{true}" result=>$page{listOfLBs});
@@ -121,6 +122,9 @@
"<br />
</foreach>
</sun:property>
+
+ <!include src="/sip/includes/clusterGeneralCLBProp.inc" required="false"/>
+
<sun:property id="hbEnabledProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.cluster.Heartbeat}" helpText="$resource{i18n.cluster.HeartbeatHelp}">
<sun:checkbox label="$resource{i18n.common.Enabled}" selected="#{hbEnabled}" />
</sun:property>
Index: glassfish/admin-gui/src/docroot/cluster/clustersTable.inc
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/docroot/cluster/clustersTable.inc,v
retrieving revision 1.8
diff -u -r1.8 clustersTable.inc
--- glassfish/admin-gui/src/docroot/cluster/clustersTable.inc 24 Jul 2007 19:39:36 -0000 1.8
+++ glassfish/admin-gui/src/docroot/cluster/clustersTable.inc 18 Dec 2007 09:54:21 -0000
@@ -146,7 +146,7 @@
<sun:tableColumn
headerText="$resource{i18n.common.lbTableColumn}"
- rowHeader="$boolean{true}" id="lb" >
+ rowHeader="$boolean{true}" id="lb" rendered="#{showLoadBalancer}">
<event>
<!beforeEncode
getLBforTarget(targetName="#{clusterName}", isCluster="$boolean{true}" result=>$page{listOfLBs});
@@ -158,6 +158,7 @@
</foreach>
</sun:tableColumn>
+ <!include src="/sip/includes/clusterCLBColumn.inc" required="false"/>
<sun:tableColumn
headerText="$resource{i18n.common.Configuration}" rowHeader="$boolean{true}"
Index: glassfish/admin-gui/src/java/com/sun/enterprise/tools/admingui/handlers/CommonHandlers.java
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/java/com/sun/enterprise/tools/admingui/handlers/CommonHandlers.java,v
retrieving revision 1.16.6.2
diff -u -r1.16.6.2 CommonHandlers.java
--- glassfish/admin-gui/src/java/com/sun/enterprise/tools/admingui/handlers/CommonHandlers.java 18 Dec 2007 06:20:45 -0000 1.16.6.2
+++ glassfish/admin-gui/src/java/com/sun/enterprise/tools/admingui/handlers/CommonHandlers.java 18 Dec 2007 09:54:21 -0000
@@ -216,6 +216,7 @@
sessionMap.put("fullProductName", GuiUtil.getMessage("versionImage.description"));
sessionMap.put("loginButtonTooltip", GuiUtil.getMessage("loginButtonTooltip"));
sessionMap.put("mastHeadDescription", GuiUtil.getMessage("mastHeadDescription"));
+ sessionMap.put("showLoadBalancer", true);
sessionMap.put("_INFO_SESSION_INITIALIZED","TRUE");
}
Index: glassfish/admin-gui/src/java/com/sun/enterprise/tools/admingui/tree/MBeanTreeAdaptor.java
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/java/com/sun/enterprise/tools/admingui/tree/MBeanTreeAdaptor.java,v
retrieving revision 1.3
diff -u -r1.3 MBeanTreeAdaptor.java
--- glassfish/admin-gui/src/java/com/sun/enterprise/tools/admingui/tree/MBeanTreeAdaptor.java 22 May 2007 22:55:54 -0000 1.3
+++ glassfish/admin-gui/src/java/com/sun/enterprise/tools/admingui/tree/MBeanTreeAdaptor.java 18 Dec 2007 09:54:21 -0000
@@ -277,6 +277,7 @@
// CommandEvent.
setProperty(props, "actionListener", desc.getOption("actionListener"));
setProperty(props, "expanded", desc.getOption("expanded"));
+ setProperty(props, "rendered", desc.getOption("rendered"));
} else {
// This case deals with the children
@@ -336,6 +337,7 @@
// We are using "childActionListener" for the hyperlink, not the TreeNode
// setProperty(props, "actionListener", desc.getOption("childActionListener"));
setProperty(props, "expanded", desc.getOption("childExpanded"));
+ setProperty(props, "rendered", desc.getOption("rendered"));
}
// Return the options
Index: glassfish/admin-gui/src/java/com/sun/extensions/comms/SipUtilities.java
===================================================================
RCS file: /cvs/glassfish/admin-gui/src/java/com/sun/extensions/comms/Attic/SipUtilities.java,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 SipUtilities.java
--- glassfish/admin-gui/src/java/com/sun/extensions/comms/SipUtilities.java 18 Dec 2007 06:21:17 -0000 1.1.2.2
+++ glassfish/admin-gui/src/java/com/sun/extensions/comms/SipUtilities.java 18 Dec 2007 09:54:21 -0000
@@ -125,6 +125,8 @@
sessionMap.put("loginButtonTooltip", msgUtil.getMessage(SIP_RESOURCE_BUNDLE, "loginButton.tooltip"));
sessionMap.put("mastHeadDescription", msgUtil.getMessage(SIP_RESOURCE_BUNDLE, "mastHeadDescription"));
+ sessionMap.put("showLoadBalancer", false);
+
sessionMap.put("_SIP_INFO_SESSION_INITIALIZED", "TRUE");
}
}