# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Users/anilam/Awork/V3/v3/admingui
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java
--- common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java Base (BASE)
+++ common/src/main/java/org/glassfish/admingui/common/util/GuiUtil.java Locally Modified (Based On LOCAL)
@@ -185,6 +185,17 @@
             sessionMap.put("debugInfo", GuiUtil.getMessage("inst.notEnabled"));
         }
         
+        try{
+            Map secureAdminAttrs = RestUtil.getAttributesMap(sessionMap.get("REST_URL")+"/secure-admin");
+            if ( (secureAdminAttrs != null) && ("true".equals(secureAdminAttrs.get("enabled")))){
+                sessionMap.put("secureAdminEnabled", "true");
+            }else{
+                sessionMap.put("secureAdminEnabled", "false");
+            }
+        }catch(Exception ex){
+            sessionMap.put("secureAdminEnabled", "false");
+        }
+
         sessionMap.put("reqMsg", GuiUtil.getMessage("msg.JS.enterValue"));
         sessionMap.put("reqMsgSelect", GuiUtil.getMessage("msg.JS.selectValue"));
         sessionMap.put("reqInt", GuiUtil.getMessage("msg.JS.enterIntegerValue"));
Index: web/src/main/resources/grizzly/listenerTabs.inc
--- web/src/main/resources/grizzly/listenerTabs.inc Base (BASE)
+++ web/src/main/resources/grizzly/listenerTabs.inc Locally Modified (Based On LOCAL)
@@ -49,23 +49,24 @@
         gf.redirect(page="#{request.contextPath}/web/grizzly/networkListenerEdit.jsf?configName=#{configName}&name=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" rendered="#{showSSLTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
         <!command
         setSessionAttribute(key="listenerTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/listenerSSLEdit.jsf?configName=#{configName}&name=#{pageSession.encodedProtocolName}&listenerName=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="httpTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.httpTab}" toolTip="$resource{i18n_web.grizzly.httpTab} Tab" >
+    <sun:tab id="httpTab" rendered="#{showHttpTab}"  immediate="$boolean{true}" text="$resource{i18n_web.grizzly.httpTab}" toolTip="$resource{i18n_web.grizzly.httpTab} Tab" >
         <!command
         setSessionAttribute(key="listenerTabs" value="httpTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/listenerHttpEdit.jsf?configName=#{pageSession.configName}&name=#{pageSession.encodedProtocolName}&listenerName=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="fileCacheTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.fileCacheTab}" toolTip="$resource{i18n_web.grizzly.fileCacheTab} Tab" >
+    <sun:tab id="fileCacheTab" rendered="#{showFileCacheTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.fileCacheTab}" toolTip="$resource{i18n_web.grizzly.fileCacheTab} Tab" >
         <!command
         setSessionAttribute(key="listenerTabs" value="fileCacheTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/listenerFileCache.jsf?configName=#{pageSession.configName}&name=#{pageSession.encodedProtocolName}&listenerName=#{pageSession.encodedListenerName}&cancelTo=#{pageSession.cancelTo}");
         />
+        
     </sun:tab>
 
 </sun:tabSet>
Index: web/src/main/resources/grizzly/networkListenerEdit.jsf
--- web/src/main/resources/grizzly/networkListenerEdit.jsf Base (BASE)
+++ web/src/main/resources/grizzly/networkListenerEdit.jsf Locally Modified (Based On LOCAL)
@@ -83,6 +83,21 @@
         setPageSessionAttribute(key="showCancelButton" value="#{true}" );
         setPageSessionAttribute(key="hasPropertySheet" value="#{true}" );
         setPageSessionAttribute(key="hasPropertyTable" value="#{false}" );
+
+
+        //If secure admin is enabled, we will not show the other tabs since GUI doesn't have support for handling low level grizzly config yet.
+        setPageSessionAttribute(key="showSSLTab" value="#{true}");
+        setPageSessionAttribute(key="showHttpTab" value="#{true}");
+        setPageSessionAttribute(key="showFileCacheTab" value="#{true}");
+        if (#{sessionScope.secureAdminEnabled}){
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/http-service/virtual-server/__asadmin" valueMap="#{requestScope.tvp}");
+            //TODO: do we need to handle the case where more than 1 listener is setup for __asadmin ??
+            if ("#{requestScope.tvp['networkListeners']}=#{pageSession.listenerName}") {
+                setPageSessionAttribute(key="showSSLTab" value="#{false}");
+                setPageSessionAttribute(key="showHttpTab" value="#{false}");
+                setPageSessionAttribute(key="showFileCacheTab" value="#{false}");
+            }
+        }
         />
     </event>
             <sun:form id="propertyForm">
@@ -103,7 +118,8 @@
 
 
     <sun:property id="protocol"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.grizzly.networkListener.protocol}" >
-             <sun:staticText id="protocol" text="#{pageSession.valueMap['protocol']}" />
+             //<sun:staticText id="protocol" text="#{pageSession.valueMap['protocol']}" />
+             <sun:hyperlink id="protocol" text="#{pageSession.valueMap['protocol']}" url="#{request.contextPath}/web/grizzly/protocolEdit.jsf?name=#{pageSession.valueMap['protocol']}&configName=#{configName}" />
         </sun:property>
 
     <sun:property id="http-protocol"  rendered="#{pageSession.showHttp}" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="HTTP Protocol: " >
@@ -138,15 +154,13 @@
 
 
         <sun:property id="port"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.grizzly.networkListener.port}" helpText="$resource{i18n_web.grizzly.networkListener.portHelp}">
-            <sun:textField id="port" columns="$int{20}" maxLength="#{sessionScope.fieldLengths['maxLength.grizzly.networkListener.port']}" required="#{true}" styleClass="required port" text="#{pageSession.valueMap['port']}"  />
+            <sun:textField id="port" columns="$int{40}" maxLength="#{sessionScope.fieldLengths['maxLength.grizzly.networkListener.port']}" required="#{true}" styleClass="required port" text="#{pageSession.valueMap['port']}"  />
         </sun:property>
 
         <sun:property id="addr"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.grizzly.networkListener.address}" helpText="$resource{i18n_web.grizzly.networkListener.addressHelp}">
-            <sun:textField id="addr" columns="$int{20}" maxLength="#{sessionScope.fieldLengths['maxLength.grizzly.networkListener.address']}" text="#{pageSession.valueMap['address']}"  />
+            <sun:textField id="addr" columns="$int{40}" maxLength="#{sessionScope.fieldLengths['maxLength.grizzly.networkListener.address']}" text="#{pageSession.valueMap['address']}"  />
         </sun:property>
 
-
-
         <sun:property id="transport"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n_web.grizzly.networkListener.transport}" >
             <sun:hyperlink id="transport" text="#{pageSession.valueMap['transport']}" url="#{request.contextPath}/web/grizzly/transportEdit.jsf?name=#{pageSession.valueMap['transport']}" />
         </sun:property>
Index: web/src/main/resources/grizzly/protocolEdit.jsf
--- web/src/main/resources/grizzly/protocolEdit.jsf Base (BASE)
+++ web/src/main/resources/grizzly/protocolEdit.jsf Locally Modified (Based On LOCAL)
@@ -70,6 +70,32 @@
         setPageSessionAttribute(key="showCancelButton" value="#{true}" );
         setPageSessionAttribute(key="hasPropertySheet" value="#{true}" );
         setPageSessionAttribute(key="hasPropertyTable" value="#{false}" );
+
+
+        //If secure admin is enabled, we will not show the other tabs since GUI doesn't have support for handling low level grizzly config yet.
+        setPageSessionAttribute(key="showSSLTab" value="#{true}");
+        setPageSessionAttribute(key="showHttpTab" value="#{true}");
+        setPageSessionAttribute(key="showFileCacheTab" value="#{true}");
+        setPageSessionAttribute(key="disableSaveButton" value="#{false}");
+        if (#{sessionScope.secureAdminEnabled}){
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/http-service/virtual-server/__asadmin" valueMap="#{requestScope.tvp}");
+            setAttribute(key="listenerName" value="#{requestScope.tvp['networkListeners']}");
+            gf.getEntityAttrs(endpoint="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/network-config/network-listeners/network-listener/#{requestScope.listenerName}" valueMap="#{requestScope.tmpVP}");
+            if("#{pageSession.Name}=#{requestScope.tmpVP.protocol}"){
+                setPageSessionAttribute(key="showSSLTab" value="#{false}");
+                setPageSessionAttribute(key="showHttpTab" value="#{false}");
+                setPageSessionAttribute(key="showFileCacheTab" value="#{false}");
+                setPageSessionAttribute(key="disableSaveButton" value="#{true}");
+            }
+            //TODO: hardcoding this 2 protocol name. Should obtain through the protocol-finder.
+            if (" (#{pageSession.Name}=sec-admin-listener) || (#{pageSession.Name}=admin-http-redirect)"){
+                setPageSessionAttribute(key="showSSLTab" value="#{false}");
+                setPageSessionAttribute(key="showHttpTab" value="#{false}");
+                setPageSessionAttribute(key="showFileCacheTab" value="#{false}");
+                setPageSessionAttribute(key="disableSaveButton" value="#{true}");
+            }
+        }
+
         />
     </event>
             <sun:form id="propertyForm">
@@ -77,7 +103,27 @@
 #include "/common/shared/alertMsg.inc"
                 <!-- Page Title -->
                 <sun:title id="propertyContentPage" title="$resource{i18n_web.grizzly.protocolEditPageTitle}" helpText="$resource{i18n_web.grizzly.protocolEditPageTitleHelp}">
-#include "/common/shared/editPageButtons.inc"
+<!facet pageButtonsTop>
+        <sun:panelGroup id="topButtons">
+            <sun:button id="saveButton" disabled="#{disableSaveButton}" text="$resource{i18n.button.Save}"
+                    onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) {submitAndDisable(this, '$resource{i18n.button.Processing}');}; return false;" >
+                <!command
+                    prepareSuccessfulMsg();
+                    gf.createEntity(endpoint="#{pageSession.selfUrl}"
+                        attrs="#{pageSession.valueMap}"
+                        convertToFalse="#{pageSession.convertToFalseList}"
+                    );
+                    gf.redirect(page="#{pageSession.selfPage}&alertType=${alertType}&alertSummary=${alertSummary}&alertDetail=${alertDetail}");
+                />
+            </sun:button>
+            <sun:button id="cancelButton" immediate="#{true}" primary="#{false}" rendered="#{pageSession.showCancelButton}" text="$resource{i18n.button.Cancel}" >
+                <!command
+                    gf.redirect(page="#{parentPage}?configName=#{configName}");
+                />
+            </sun:button>
+        </sun:panelGroup>
+    </facet>
+
                     </sun:title>
     <sun:propertySheet id="propertySheet">
 #include "/common/shared/configNameSection.inc"
Index: web/src/main/resources/grizzly/protocolTabs.inc
--- web/src/main/resources/grizzly/protocolTabs.inc Base (BASE)
+++ web/src/main/resources/grizzly/protocolTabs.inc Locally Modified (Based On LOCAL)
@@ -49,19 +49,19 @@
         gf.redirect(page="#{request.contextPath}/web/grizzly/protocolEdit.jsf?configName=#{configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="sslTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
+    <sun:tab id="sslTab" rendered="#{showSSLTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.sslTab}" toolTip="$resource{i18n_web.grizzly.sslTab} Tab" >
         <!command
         setSessionAttribute(key="protocolTabs" value="sslTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/protocolSSLEdit.jsf?configName=#{configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="httpTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.httpTab}" toolTip="$resource{i18n_web.grizzly.httpTab} Tab" >
+    <sun:tab id="httpTab" rendered="#{showHttpTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.httpTab}" toolTip="$resource{i18n_web.grizzly.httpTab} Tab" >
         <!command
         setSessionAttribute(key="protocolTabs" value="httpTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/protocolHttp.jsf?configName=#{pageSession.configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}");
         />
     </sun:tab>
-    <sun:tab id="fileCacheTab" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.fileCacheTab}" toolTip="$resource{i18n_web.grizzly.fileCacheTab} Tab" >
+    <sun:tab id="fileCacheTab" rendered="#{showFileCacheTab}" immediate="$boolean{true}" text="$resource{i18n_web.grizzly.fileCacheTab}" toolTip="$resource{i18n_web.grizzly.fileCacheTab} Tab" >
         <!command
         setSessionAttribute(key="protocolTabs" value="fileCacheTab");
         gf.redirect(page="#{request.contextPath}/web/grizzly/protocolFileCache.jsf?configName=#{configName}&name=#{pageSession.encodedName}&cancelTo=#{pageSession.cancelTo}");