Index: src/main/java/org/glassfish/admingui/common/handlers/DeploymentHandler.java =================================================================== --- src/main/java/org/glassfish/admingui/common/handlers/DeploymentHandler.java (revision 51681) +++ src/main/java/org/glassfish/admingui/common/handlers/DeploymentHandler.java (working copy) @@ -239,21 +239,16 @@ if (ctxRoot != null){ payload.put("contextroot", ctxRoot); } - - String availabilityEnabled = valueMap.get("availabilityenabled"); - if (availabilityEnabled != null){ - payload.put("availabilityenabled", Boolean.parseBoolean(availabilityEnabled)); - } String keepState = deployMap.get("keepState"); if (keepState != null){ payload.put("keepstate",keepState); } - payload.put("id", filePath); payload.put("force", "true"); payload.put("name", appName); payload.put("verify", deployMap.get("verify")); payload.put("precompilejsp", deployMap.get("precompilejsp")); + payload.put("availabilityEnabled", deployMap.get("availabilityEnabled")); if ("osgi".equals(deployMap.get("type"))){ payload.put("type", "osgi"); } Index: src/main/resources/applications/redeployFrame.jsf =================================================================== --- src/main/resources/applications/redeployFrame.jsf (revision 51681) +++ src/main/resources/applications/redeployFrame.jsf (working copy) @@ -56,7 +56,7 @@ } createMap(result="#{pageSession.deployMap}") mapPut(map="#{pageSession.deployMap}", key="appName", value="#{pageSession.appName}"); - setPageSessionAttribute(key="convertToFalse" value={"precompilejsp", "verify"}) + setPageSessionAttribute(key="convertToFalse" value={"precompilejsp", "verify" ,"availabilityEnabled"}) //we want to show/preserver java-web-start-enabled, and preserveAppsScopedResourcs @@ -78,6 +78,10 @@ setPageSessionAttribute(key="listPageLink" value="#{gf_application_list_page}"); setPageSessionAttribute(key="extraArgs" value="#{gf_application_extra_args}"); setPageSessionAttribute(key="cancelPage" value="#{gf_application_cancel_page}"); + gf.onlyDASExist(onlyDAS="#{pageSession.onlyDASExist}"); + if ("!(#{pageSession.onlyDASExist})"){ + mapPut(map="#{pageSession.deployMap}", key="availabilityEnabled", value="#{pageSession.valueMap['availabilityEnabled']}"); + } /> @@ -142,6 +146,9 @@ + + +