Fixes admin console application deployment gui

Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/deployment/DFDeploymentProperties.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/deployment/DFDeploymentProperties.java
new file mode 100644
index 0000000..9133897
--- /dev/null
+++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/deployment/DFDeploymentProperties.java
@@ -0,0 +1,333 @@
+/*	
+ * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.	
+ *	
+ * This program and the accompanying materials are made available under the	
+ * terms of the Eclipse Public License v. 2.0, which is available at	
+ * http://www.eclipse.org/legal/epl-2.0.	
+ *	
+ * This Source Code may also be made available under the following Secondary	
+ * Licenses when the conditions for such availability set forth in the	
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,	
+ * version 2 with the GNU Classpath Exception, which is available at	
+ * https://www.gnu.org/software/classpath/license.html.	
+ *	
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0	
+ */
+package org.glassfish.admingui.common.deployment;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import org.glassfish.deployment.common.DeploymentUtils;
+
+/**
+ * Convenience class for managing deployment properties - settings or options to
+ * be conveyed to the back-end during deployment-related operations.
+ * <p>
+ * Heavily inspired by the original from common-utils but copied here to
+ * minimize dependencies.
+ *
+ * @author tjquinn
+ */
+public class DFDeploymentProperties extends Properties {
+
+    public String getWsdlTargetHint() throws IllegalArgumentException {
+        return getProperty(WSDL_TARGET_HINT, null);
+    }
+
+    public void setWsdlTargetHint(String target) {
+        if (target != null) {
+            setProperty(WSDL_TARGET_HINT, target);
+        }
+    }
+
+    public String getTarget() throws IllegalArgumentException {
+        return getProperty(TARGET, null);
+    }
+
+    public void setTarget(String target) {
+        if (target != null) {
+            setProperty(TARGET, target);
+        }
+    }
+
+    public boolean getRedeploy() {
+        return Boolean.valueOf(getProperty(REDEPLOY, DEFAULT_REDEPLOY));
+    }
+
+    public void setRedeploy(boolean redeploy) {
+        setProperty(REDEPLOY, Boolean.toString(redeploy));
+    }
+
+    public boolean getForce() {
+        return Boolean.valueOf(getProperty(FORCE, DEFAULT_FORCE));
+    }
+
+    public void setForce(boolean force) {
+        setProperty(FORCE, Boolean.toString(force));
+    }
+
+    public boolean getReload() {
+        return Boolean.valueOf(getProperty(RELOAD, DEFAULT_RELOAD));
+    }
+
+    public void setReload(boolean reload) {
+        setProperty(RELOAD, Boolean.toString(reload));
+    }
+
+    public boolean getCascade() {
+        return Boolean.valueOf(getProperty(CASCADE, DEFAULT_CASCADE));
+    }
+
+    public void setCascade(boolean cascade) {
+        setProperty(CASCADE, Boolean.toString(cascade));
+    }
+
+    public boolean getPrecompileJSP() {
+        return Boolean.valueOf(getProperty(PRECOMPILE_JSP, DEFAULT_PRECOMPILE_JSP));
+    }
+
+    public void setPrecompileJSP(boolean precompileJSP) {
+        setProperty(PRECOMPILE_JSP, Boolean.toString(precompileJSP));
+    }
+
+    public boolean getVerify() {
+        return Boolean.valueOf(getProperty(VERIFY, DEFAULT_VERIFY));
+    }
+
+    public void setVerify(boolean verify) {
+        setProperty(VERIFY, Boolean.toString(verify));
+    }
+
+    public String getVirtualServers() {
+        return getProperty(VIRTUAL_SERVERS, DEFAULT_VIRTUAL_SERVERS);
+    }
+
+    public void setVirtualServers(String virtualServers) {
+        if (virtualServers != null) {
+            setProperty(VIRTUAL_SERVERS, virtualServers);
+        }
+    }
+
+    public boolean getEnabled() {
+        return Boolean.valueOf(getProperty(ENABLED, DEFAULT_ENABLED));
+    }
+
+    public void setEnabled(boolean enabled) {
+        setProperty(ENABLED, Boolean.toString(enabled));
+    }
+
+    public String getContextRoot() {
+        return getProperty(CONTEXT_ROOT, null);
+    }
+
+    public void setContextRoot(String contextRoot) {
+        if (contextRoot != null) {
+            setProperty(CONTEXT_ROOT, contextRoot);
+        }
+    }
+
+    public String getName() {
+        return getProperty(NAME);
+    }
+
+    public void setName(String name) {
+        if (name != null) {
+            setProperty(NAME, name);
+        }
+    }
+
+    public String getDescription() {
+        return getProperty(DESCRIPTION, "");
+    }
+
+    public void setDescription(String description) {
+        if (description != null) {
+            setProperty(DESCRIPTION, description);
+        }
+    }
+
+    public boolean getGenerateRMIStubs() {
+        return Boolean.valueOf(getProperty(GENERATE_RMI_STUBS,
+                DEFAULT_GENERATE_RMI_STUBS));
+    }
+
+    public void setGenerateRMIStubs(boolean generateRMIStubs) {
+        setProperty(GENERATE_RMI_STUBS,
+                Boolean.toString(generateRMIStubs));
+    }
+
+    public boolean getAvailabilityEnabled() {
+        return Boolean.valueOf(getProperty(AVAILABILITY_ENABLED,
+                DEFAULT_AVAILABILITY_ENABLED));
+    }
+
+    public void setAvailabilityEnabled(boolean availabilityEnabled) {
+        setProperty(AVAILABILITY_ENABLED,
+                Boolean.toString(availabilityEnabled));
+    }
+
+    public boolean getJavaWebStartEnabled() {
+        return Boolean.valueOf(getProperty(DEPLOY_OPTION_JAVA_WEB_START_ENABLED,
+                DEFAULT_JAVA_WEB_START_ENABLED));
+    }
+
+    public void setJavaWebStartEnabled(boolean javaWebStartEnabled) {
+        setProperty(DEPLOY_OPTION_JAVA_WEB_START_ENABLED,
+                Boolean.toString(javaWebStartEnabled));
+    }
+
+    public String getLibraries() {
+        return getProperty(DEPLOY_OPTION_LIBRARIES, null);
+    }
+
+    public void setLibraries(String libraries) {
+        if (libraries != null) {
+            setProperty(DEPLOY_OPTION_LIBRARIES, libraries);
+        }
+    }
+
+    public String getResourceAction() {
+        return getProperty(RESOURCE_ACTION, null);
+    }
+
+    public void setResourceAction(String resourceAction) {
+        if (resourceAction != null) {
+            setProperty(RESOURCE_ACTION, resourceAction);
+        }
+    }
+
+    public String getResourceTargetList() {
+        return getProperty(RESOURCE_TARGET_LIST, null);
+    }
+
+    public void setResourceTargetList(String resTargetList) {
+        if (resTargetList != null) {
+            setProperty(RESOURCE_TARGET_LIST, resTargetList);
+        }
+    }
+
+    public void setUpload(boolean uploadEnabled) {
+        setProperty(UPLOAD, Boolean.toString(uploadEnabled));
+    }
+
+    public boolean getUpload() {
+        return Boolean.valueOf(getProperty(UPLOAD, DEFAULT_UPLOAD));
+    }
+
+    public void setExternallyManaged(boolean isExternallyManaged) {
+        setProperty(EXTERNALLY_MANAGED, Boolean.toString(isExternallyManaged));
+    }
+
+    public void setPath(String path) {
+        setProperty(PATH, path);
+    }
+
+    public String getPath() {
+        return getProperty(PATH);
+    }
+
+    public boolean getExternallyManaged() {
+        return Boolean.valueOf(getProperty(EXTERNALLY_MANAGED,
+                DEFAULT_EXTERNALLY_MANAGED));
+    }
+
+    public void setProperties(Properties props) {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<Object, Object> prop : props.entrySet()) {
+            if (sb.length() > 0) {
+                sb.append(PROPERTY_SEPARATOR);
+            }
+            sb.append(prop.getKey()).append("=").append(prop.getValue());
+        }
+        setProperty(PROPERTY, sb.toString());
+    }
+
+    public Properties getProperties() {
+        Properties result = new Properties();
+        String[] settings = getProperty(PROPERTY).split(PROPERTY_SEPARATOR);
+        for (String setting : settings) {
+            int equals = setting.indexOf('=');
+            if (equals != -1) {
+                result.setProperty(
+                        setting.substring(0, equals),
+                        setting.substring(equals + 1)
+                );
+            }
+        }
+        return result;
+    }
+
+    public static final String WSDL_TARGET_HINT = "wsdlTargetHint";
+    public static final String TARGET = "target";
+    public static final String REDEPLOY = "redeploy";
+    public static final String DEFAULT_REDEPLOY = "false";
+    public static final String FORCE = "force";
+    public static final String DEFAULT_FORCE = "true";
+    public static final String RELOAD = "reload";
+    public static final String DEFAULT_RELOAD = "false";
+    public static final String CASCADE = "cascade";
+    public static final String DEFAULT_CASCADE = "false";
+    public static final String VERIFY = "verify";
+    public static final String DEFAULT_VERIFY = "false";
+    public static final String VIRTUAL_SERVERS = "virtualservers";
+    public static final String DEFAULT_VIRTUAL_SERVERS = null;
+    public static final String PRECOMPILE_JSP = "precompilejsp";
+    public static final String DEFAULT_PRECOMPILE_JSP = "false";
+    public static final String GENERATE_RMI_STUBS = "generatermistubs";
+    public static final String DEFAULT_GENERATE_RMI_STUBS = "false";
+    public static final String AVAILABILITY_ENABLED = "availabilityenabled";
+    public static final String DEFAULT_AVAILABILITY_ENABLED = "false";
+    public static final String ENABLED = "enabled";
+    public static final String DEFAULT_ENABLED = "true";
+    public static final String CONTEXT_ROOT = "contextroot";
+    public static final String ARCHIVE_NAME = "archiveName";
+    public static final String NAME = "name";
+    public static final String TYPE = "type";
+    public static final String DESCRIPTION = "description";
+    public static final String CLIENTJARREQUESTED = "clientJarRequested";
+    public static final String UPLOAD = "upload";
+    public static final String EXTERNALLY_MANAGED = "externallyManaged";
+    public static final String PATH = "path";
+    public static final String DEFAULT_JAVA_WEB_START_ENABLED = "true";
+    public static final String DEPLOYMENT_PLAN = "deploymentplan";
+
+    public static final String PROPERTY = "property";
+    private static final String PROPERTY_SEPARATOR = ":";
+
+    public static final String DEFAULT_UPLOAD = "true";
+    public static final String DEFAULT_EXTERNALLY_MANAGED = "false";
+    // resource constants	
+    public static final String RESOURCE_ACTION = "resourceAction";
+    public static final String RESOURCE_TARGET_LIST = "resourceTargetList";
+
+    // possible values for resource action	
+    public static final String RES_DEPLOYMENT = "resDeployment";
+    public static final String RES_CREATE_REF = "resCreateRef";
+    public static final String RES_DELETE_REF = "resDeleteRef";
+    public static final String RES_UNDEPLOYMENT = "resUndeployment";
+    public static final String RES_REDEPLOYMENT = "resRedeployment";
+    public static final String RES_NO_OP = "resNoOp";
+    public static final String DEPLOY_OPTION_JAVA_WEB_START_ENABLED
+            = DeploymentUtils.DEPLOYMENT_PROPERTY_JAVA_WEB_START_ENABLED;
+    public static final String DEPLOY_OPTION_LIBRARIES = "libraries";
+
+    // possible values for module state	
+    public static final String ALL = "all";
+    public static final String RUNNING = "running";
+    public static final String NON_RUNNING = "non-running";
+
+    // lifecycle module constants	
+    public static final String LIFECYCLE_MODULE = "lifecycle-module";
+    public static final String CLASS_NAME = "class-name";
+    public static final String CLASSPATH = "classpath";
+    public static final String LOAD_ORDER = "load-order";
+    public static final String IS_FAILURE_FATAL = "is-failure-fatal";
+    public static final String IS_LIFECYCLE = "isLifecycle";
+    public static final String IS_COMPOSITE = "isComposite";
+
+    public Map<String, String> asMap() {
+        return new HashMap<>();
+    }
+
+}
diff --git a/appserver/admingui/common/src/main/resources/applications/appEdit.layout b/appserver/admingui/common/src/main/resources/applications/appEdit.layout
index cb80d76..7b244d2 100644
--- a/appserver/admingui/common/src/main/resources/applications/appEdit.layout
+++ b/appserver/admingui/common/src/main/resources/applications/appEdit.layout
@@ -110,14 +110,14 @@
                         setPageSessionAttribute(key="javaWebStartEnabled" value="false");
                     }
                     foreach (var="oneProp" list="#{pageSession.tableList}") {
-                        if (#{requestScope.oneProp.name}=$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}){
+                        if (#{requestScope.oneProp.name}=$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}){
                             setAttribute(key="found" value="true");
                             mapPut(map="#{requestScope.oneProp}" key="value" value="#{pageSession.javaWebStartEnabled}")
                         }
                     }
                     if (!#{requestScope.found}){
                         createMap(result="#{requestScope.jmap}");
-                        mapPut(map="#{requestScope.jmap}" key="name" value="$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}")
+                        mapPut(map="#{requestScope.jmap}" key="name" value="$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}")
                         mapPut(map="#{requestScope.jmap}" key="value" value="#{pageSession.javaWebStartEnabled}")
                         listAdd(list="#{pageSession.tableList}" value="#{requestScope.jmap}");
                     }
diff --git a/appserver/admingui/common/src/main/resources/applications/edit.inc b/appserver/admingui/common/src/main/resources/applications/edit.inc
index 348957d..2bae5d7 100644
--- a/appserver/admingui/common/src/main/resources/applications/edit.inc
+++ b/appserver/admingui/common/src/main/resources/applications/edit.inc
@@ -98,7 +98,7 @@
             setPageSessionAttribute(key="javaWebStartEnabled" value="true");
             setPageSessionAttribute(key="implicitCdiEnabled" value="true");
             foreach (var="oneProp" list="#{pageSession.tableList}") {
-                if (#{requestScope.oneProp.name}=$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}){
+                if (#{requestScope.oneProp.name}=$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}){
                     setPageSessionAttribute(key="javaWebStartEnabled" value="#{requestScope.oneProp.value}");
                 }
                 if (#{requestScope.oneProp.name}=implicitCdiEnabled){
diff --git a/appserver/admingui/common/src/main/resources/applications/redeployFrame.jsf b/appserver/admingui/common/src/main/resources/applications/redeployFrame.jsf
index e60da48..b22ea87 100644
--- a/appserver/admingui/common/src/main/resources/applications/redeployFrame.jsf
+++ b/appserver/admingui/common/src/main/resources/applications/redeployFrame.jsf
@@ -36,7 +36,7 @@
         //we want to show/preserver java-web-start-enabled, and preserveAppsScopedResourcs
 
         //if the jws prop does not exist,it is true by default. GLASSFISH-19109
-        mapPut(map="#{pageSession.deployMap}" key="$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}" value="true")
+        mapPut(map="#{pageSession.deployMap}" key="$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}" value="true")
         mapPut(map="#{pageSession.deployMap}" key="implicitCdiEnabled" value="true")
         gf.restRequest(endpoint="#{pageSession.selfUrl}/property.json" method="GET" result="#{requestScope.propTable}");
         setPageSessionAttribute(key="listOfProps" value="#{requestScope.propTable.data.extraProperties.properties}");
@@ -44,8 +44,8 @@
             if ("#{requestScope.oneProp.name}=preserveAppScopedResources"){
                 mapPut(map="#{pageSession.deployMap}" key="preserveAppScopedResources" value="#{requestScope.oneProp.value}")
             }
-            if ("#{requestScope.oneProp.name}=$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}"){
-                mapPut(map="#{pageSession.deployMap}" key="$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}" value="#{requestScope.oneProp.value}")
+            if ("#{requestScope.oneProp.name}=$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}"){
+                mapPut(map="#{pageSession.deployMap}" key="$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}" value="#{requestScope.oneProp.value}")
             }
             if ("#{requestScope.oneProp.name}=implicitCdiEnabled"){
                 mapPut(map="#{pageSession.deployMap}" key="implicitCdiEnabled" value="#{requestScope.oneProp.value}")
@@ -128,7 +128,7 @@
                 <sun:checkbox id="implicitCdi"  selected="#{pageSession.deployMap['implicitCdiEnabled']}" selectedValue="true" />
             </sun:property>
             <sun:property id="jws"  labelAlign="left" noWrap="#{false}" overlapLabel="#{false}"  label="$resource{i18n.deploy.JavaWebStart}" helpText="$resource{i18n.deploy.JavaWebStartHelp}" >
-                <sun:checkbox selected="#{pageSession.deployMap['$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}']}" selectedValue="true" label=" " />
+                <sun:checkbox selected="#{pageSession.deployMap['$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}']}" selectedValue="true" label=" " />
             </sun:property>
             <sun:property id="availability" rendered="#{!pageSession.onlyDASExist}" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.deploy.availability}" helpText="$resource{i18n.deploy.availabilityHelp}">
                 <sun:checkbox id="availability"  selected="#{pageSession.deployMap['availabilityEnabled']}" selectedValue="true" />
diff --git a/appserver/admingui/full/src/main/resources/apps/deploymentAppClient.jsf b/appserver/admingui/full/src/main/resources/apps/deploymentAppClient.jsf
index 148cbef..7bf896c 100644
--- a/appserver/admingui/full/src/main/resources/apps/deploymentAppClient.jsf
+++ b/appserver/admingui/full/src/main/resources/apps/deploymentAppClient.jsf
@@ -24,8 +24,8 @@
         setAttribute(key="fieldMap" value="appClient");
         createMap(result="#{pageSession.appClient}")
         mapPut(map="#{pageSession.deployMap}", key="appClient", value="#{pageSession.appClient}");
-        mapPut(map="#{pageSession.appClient}", key="convertToFalseList", value={ "verify", "force" , "PROPERTY-implicitCdiEnabled", "PROPERTY-$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}"} );
-        mapPut(map="#{pageSession.appClient}", key="PROPERTY-$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}" , value="true" );
+        mapPut(map="#{pageSession.appClient}", key="convertToFalseList", value={ "verify", "force" , "PROPERTY-implicitCdiEnabled", "PROPERTY-$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}"} );
+        mapPut(map="#{pageSession.appClient}", key="PROPERTY-$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}" , value="true" );
         mapPut(map="#{pageSession.appClient}", key="PROPERTY-implicitCdiEnabled", value="true");
      />
     <!afterCreate
@@ -47,7 +47,7 @@
 </sun:property>
 
 <sun:property id="jw" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.deploy.JavaWebStart}" helpText="$resource{i18n.deploy.JavaWebStartHelp}">
-	<sun:checkbox id="jwt"  selected="#{pageSession.appClient['PROPERTY-$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}']}" selectedValue="true" />
+	<sun:checkbox id="jwt"  selected="#{pageSession.appClient['PROPERTY-$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}']}" selectedValue="true" />
 </sun:property>
 
 <sun:property id="v2" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.deploy.run}" helpText="$resource{i18n.deploy.runHelp}">
diff --git a/appserver/admingui/full/src/main/resources/apps/deploymentEar.jsf b/appserver/admingui/full/src/main/resources/apps/deploymentEar.jsf
index 0278cb0..673f066 100644
--- a/appserver/admingui/full/src/main/resources/apps/deploymentEar.jsf
+++ b/appserver/admingui/full/src/main/resources/apps/deploymentEar.jsf
@@ -23,8 +23,8 @@
         setAttribute(key="fieldMap" value="ear");
         createMap(result="#{pageSession.ear}")
         mapPut(map="#{pageSession.deployMap}", key="ear", value="#{pageSession.ear}");
-        mapPut(map="#{pageSession.ear}", key="convertToFalseList", value={"enabled", "precompilejsp" , "availabilityEnabled", "PROPERTY-implicitCdiEnabled", "verify", "force", "keepState", "PROPERTY-$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}", "PROPERTY-preserveAppScopedResources"} );
-        mapPut(map="#{pageSession.ear}", key="PROPERTY-$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}" , value="true" );
+        mapPut(map="#{pageSession.ear}", key="convertToFalseList", value={"enabled", "precompilejsp" , "availabilityEnabled", "PROPERTY-implicitCdiEnabled", "verify", "force", "keepState", "PROPERTY-$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}", "PROPERTY-preserveAppScopedResources"} );
+        mapPut(map="#{pageSession.ear}", key="PROPERTY-$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}" , value="true" );
         mapPut(map="#{pageSession.ear}", key="PROPERTY-implicitCdiEnabled", value="true");
     />
     <!afterCreate
diff --git a/appserver/admingui/full/src/main/resources/apps/deploymentEarFields.jsf b/appserver/admingui/full/src/main/resources/apps/deploymentEarFields.jsf
index e66c83b..c3a6c97 100644
--- a/appserver/admingui/full/src/main/resources/apps/deploymentEarFields.jsf
+++ b/appserver/admingui/full/src/main/resources/apps/deploymentEarFields.jsf
@@ -60,7 +60,7 @@
 </sun:property>
 
 <sun:property id="jw" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.deploy.JavaWebStart}" helpText="$resource{i18n.deploy.JavaWebStartHelp}">
-	<sun:checkbox id="jwc"  selected="#{pageSession.ear['PROPERTY-$constant{org.glassfish.deployment.client.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}']}" selectedValue="true" />
+	<sun:checkbox id="jwc"  selected="#{pageSession.ear['PROPERTY-$constant{org.glassfish.admingui.common.deployment.DFDeploymentProperties.DEPLOY_OPTION_JAVA_WEB_START_ENABLED}']}" selectedValue="true" />
 </sun:property>
 
 <sun:property id="precmplProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18n.deploy.precompile}" helpText="$resource{i18n.deploy.PrecompileHelp}">