payara · Pandrex247 · Jul 31, 2017 · Jun 18, 2017 · Jul 2, 2017 · Jul 2, 2017
diff --git a/...ver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties b/...ver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties
@@ -165,6 +165,7 @@ standalone.ColWeight=LB Weight
 
 standaloneInstanceNew.PageTitle=New Payara Server Instance
 standaloneInstanceNew.PageTitleHelp=Create a Payara Server instance.
+standaloneInstancePropertiesPageTitleHelp=
 
 standalone.ApplicationsTitle=Applications
 standalone.ApplicationsTitleHelp=Deploy, undeploy, enable, disable, and remove selected applications associated with the instance. Removing the application only removes the application from this instance. The application is not undeployed.

diff --git a/appserver/admingui/cluster/src/main/resources/standalone/standaloneInstanceProperties.jsf b/appserver/admingui/cluster/src/main/resources/standalone/standaloneInstanceProperties.jsf
@@ -73,7 +73,7 @@
     </event>
     <sun:form id="propertyForm">
 #include "/cluster/standalone/standaloneInstanceTabs.inc"
-        <sun:title id="propertyContentPage" title="$resource{i18ncs.PropertiesTitle}" >
+        <sun:title id="propertyContentPage" title="$resource{i18ncs.PropertiesTitle}" helpText="$resource{i18nc.microprofile.properties.description}">
 #include "/cluster/shared/instancePropertiesButtons.jsf"
         </sun:title>
 #include "/common/shared/alertMsg_1.inc"

diff --git a/appserver/admingui/common/src/main/resources/appServer/domainTabs.inc b/appserver/admingui/common/src/main/resources/appServer/domainTabs.inc
@@ -38,6 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
+    Portions Copyright [2017] [Payara Foundation and/or its affiliates]
 -->
 
 <!-- appServer/domainTabs.jsf -->
@@ -49,6 +50,12 @@
             gf.redirect(page="#{request.contextPath}/common/appServer/serverInstDomainAttrs.jsf");
         />
     </sun:tab>
+    <sun:tab id="domainProps" immediate="true" text="$resource{i18nc.headings.DomainProperties}" toolTip="$resource{i18nc.headings.DomainPropertiesTab}">
+        <!command
+            setSessionAttribute(key="domainTabs" value="domainProps");
+            gf.redirect(page="#{request.contextPath}/common/appServer/serverInstDomainProps.jsf");
+        />
+    </sun:tab>
     <sun:tab id="appConfig" immediate="true" text="$resource{i18n.headings.AppConfig}" toolTip="$resource{i18n.headings.AppConfigTab}" >
         <!command
             setSessionAttribute(key="domainTabs" value="appConfig");

diff --git a/appserver/admingui/common/src/main/resources/appServer/instanceProperties.jsf b/appserver/admingui/common/src/main/resources/appServer/instanceProperties.jsf
@@ -38,6 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
+    Portions Copyright [2017] [Payara Foundation and/or its affiliates]
 -->
 
 <!initPage
@@ -70,7 +71,7 @@
     </event>
     <sun:form id="propertyForm">
 #include "/common/appServer/serverInstTabs.inc"
-        <sun:title id="propertyContentPage" title="$resource{i18nc.instanceProperties.PropertiesTitle}" >
+        <sun:title id="propertyContentPage" title="$resource{i18nc.instanceProperties.PropertiesTitle}"  helpText="$resource{i18nc.microprofile.properties.description}" >
 #include "/common/appServer/instancePropertiesButtons.jsf"
         </sun:title>
 #include "/common/shared/alertMsg.inc"

diff --git a/appserver/admingui/common/src/main/resources/appServer/serverInstDomainProps.jsf b/appserver/admingui/common/src/main/resources/appServer/serverInstDomainProps.jsf
@@ -0,0 +1,83 @@
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common Development
+    and Distribution License("CDDL") (collectively, the "License").  You
+    may not use this file except in compliance with the License.  You can
+    obtain a copy of the License at
+    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+    or packager/legal/LICENSE.txt.  See the License for the specific
+    language governing permissions and limitations under the License.
+
+    When distributing the software, include this License Header Notice in each
+    file and include the License file at packager/legal/LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [year] [name of copyright owner]"
+
+    Contributor(s):
+    If you wish your version of this file to be governed by only the CDDL or
+    only the GPL Version 2, indicate your decision by adding "[Contributor]
+    elects to include this software in this distribution under the [CDDL or GPL
+    Version 2] license."  If you don't indicate a single choice of license, a
+    recipient has the option to distribute your version of this file under
+    either the CDDL, the GPL Version 2 or to extend the choice of license to
+    its licensees as provided above.  However, if you add GPL Version 2 code
+    and therefore, elected the GPL Version 2 license, then the option applies
+    only if the new code is made subject to such option by the copyright
+    holder.
+
+    Portions Copyright [2017] [Payara Foundation and/or its affiliates]
+-->
+
+<!initPage
+    setResourceBundle(key="i18n" bundle="org.glassfish.admingui.core.Strings")
+    setResourceBundle(key="i18nc" bundle="org.glassfish.common.admingui.Strings")
+    setResourceBundle(key="help_common" bundle="org.glassfish.common.admingui.Helplinks");
+/>
+<!-- i18n -->
+<!composition template="/templates/default.layout"  guiTitle="$resource{i18nc.domain.DomainPropsPageTitle}" >
+<!define name="content">
+    <event>
+        <!beforeCreate
+            setPageSessionAttribute(key="rest-api" value="true");
+            setPageSessionAttribute(key="edit" value="#{true}" );
+            setPageSessionAttribute(key="hasPropertyTable" value="#{true}" );
+            setPageSessionAttribute(key="showDefaultButton" value="#{false}" );
+            setPageSessionAttribute(key="selfPage", value="#{request.contextPath}/common/appServer/serverInstDomainProps.jsf?");
+
+            setPageSessionAttribute(key="selfUrl", value="#{sessionScope.REST_URL}");
+            gf.restRequest(endpoint="#{sessionScope.REST_URL}/property", method="GET", result="#{requestScope.propTable}");
+            setPageSessionAttribute(key="tableList", value="#{requestScope.propTable.data.extraProperties.properties}");
+        />
+    </event>
+    <sun:form id="propertyForm">
+#include "/common/appServer/domainTabs.inc"
+        <sun:title id="propertyContentPage" title="$resource{i18nc.domain.DomainPropsPageTitle}"  helpText="$resource{i18nc.domain.DomainPropsPageTitleHelp}" >
+#include "/common/appServer/instancePropertiesButtons.jsf"
+        </sun:title>
+#include "/common/shared/alertMsg.inc"
+#include "/common/shared/nameSection.inc"
+#include "/common/shared/propertyDescTable.inc"
+
+        <sun:title id="bottomTitle">
+#include "/common/appServer/instancePropertiesButtons.jsf"
+        </sun:title>
+
+        <sun:hidden id="helpKey" value="$resource{help_common.instanceProperties}" />
+
+    </sun:form>
+#include "/common/shared/changeButtonsJS.inc"
+</define>
+</composition>
diff --git a/appserver/admingui/common/src/main/resources/applications/appGeneralTabs.inc b/appserver/admingui/common/src/main/resources/applications/appGeneralTabs.inc
@@ -70,4 +70,10 @@
             gf.redirect(page="#{request.contextPath}/common/applications/targetListing.jsf?appName=#{pageSession.encodedAppName}&listPageLink=#{pageSession.listPageLink}");
         />
     </sun:tab>
+     <sun:tab id="propertiesTab" rendered="true" immediate="true" text="$resource{i18nc.headings.ApplicationProperties}" toolTip="$resource{i18nc.headings.ApplicationPropertiesTab}">
+        <!command
+            setSessionAttribute(key="appGeneralTabs" value="propertiesTab");
+            gf.redirect(page="#{request.contextPath}/common/applications/appProperties.jsf?appName=#{pageSession.encodedAppName}&listPageLink=#{pageSession.listPageLink}");
+        />
+    </sun:tab>
 </sun:tabSet>
diff --git a/appserver/admingui/common/src/main/resources/applications/appProperties.jsf b/appserver/admingui/common/src/main/resources/applications/appProperties.jsf
@@ -0,0 +1,85 @@
+<!--
+
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+    Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
+
+    The contents of this file are subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common Development
+    and Distribution License("CDDL") (collectively, the "License").  You
+    may not use this file except in compliance with the License.  You can
+    obtain a copy of the License at
+    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+    or packager/legal/LICENSE.txt.  See the License for the specific
+    language governing permissions and limitations under the License.
+
+    When distributing the software, include this License Header Notice in each
+    file and include the License file at packager/legal/LICENSE.txt.
+
+    GPL Classpath Exception:
+    Oracle designates this particular file as subject to the "Classpath"
+    exception as provided by Oracle in the GPL Version 2 section of the License
+    file that accompanied this code.
+
+    Modifications:
+    If applicable, add the following below the License Header, with the fields
+    enclosed by brackets [] replaced by your own identifying information:
+    "Portions Copyright [year] [name of copyright owner]"
+
+    Contributor(s):
+    If you wish your version of this file to be governed by only the CDDL or
+    only the GPL Version 2, indicate your decision by adding "[Contributor]
+    elects to include this software in this distribution under the [CDDL or GPL
+    Version 2] license."  If you don't indicate a single choice of license, a
+    recipient has the option to distribute your version of this file under
+    either the CDDL, the GPL Version 2 or to extend the choice of license to
+    its licensees as provided above.  However, if you add GPL Version 2 code
+    and therefore, elected the GPL Version 2 license, then the option applies
+    only if the new code is made subject to such option by the copyright
+    holder.
+
+    Portions Copyright [2017] [Payara Foundation and/or its affiliates]
+-->
+
+<!initPage
+    setResourceBundle(key="i18n" bundle="org.glassfish.admingui.core.Strings")
+    setResourceBundle(key="i18nc" bundle="org.glassfish.common.admingui.Strings")
+    setResourceBundle(key="help_common" bundle="org.glassfish.common.admingui.Helplinks");
+/>
+<!-- i18n -->
+<!composition template="/templates/default.layout"  guiTitle="$resource{i18nc.domain.DomainPropsPageTitle}" >
+<!define name="content">
+    <event>
+        <!beforeCreate
+            getRequestValue(key="appName" value="#{pageSession.appName}");
+            urlencode(value="#{pageSession.appName}" encoding="UTF-8" result="#{pageSession.encodedAppName}");
+            setPageSessionAttribute(key="rest-api" value="true");
+            setPageSessionAttribute(key="edit" value="#{true}" );
+            setPageSessionAttribute(key="hasPropertyTable" value="#{true}" );
+            setPageSessionAttribute(key="showDefaultButton" value="#{false}" );
+            setPageSessionAttribute(key="selfPage", value="#{request.contextPath}/common/applications/appProperties.jsf?appName=#{pageSession.encodedAppName}&listPageLink=#{pageSession.listPageLink}");
+
+            setPageSessionAttribute(key="selfUrl", value="#{sessionScope.REST_URL}/applications/application/#{pageSession.encodedAppName}");
+            gf.restRequest(endpoint="#{sessionScope.REST_URL}/applications/application/#{pageSession.encodedAppName}/property", method="GET", result="#{requestScope.propTable}");
+            setPageSessionAttribute(key="tableList", value="#{requestScope.propTable.data.extraProperties.properties}");
+        />
+    </event>
+    <sun:form id="propertyForm">
+#include "/common/applications/appGeneralTabs.inc"
+        <sun:title id="propertyContentPage" title="$resource{i18nc.applications.ApplicationPropsPageTitle}"  helpText="$resource{i18nc.applications.ApplicationPropsPageTitleHelp}" >
+#include "/common/appServer/instancePropertiesButtons.jsf"
+        </sun:title>
+#include "/common/shared/alertMsg.inc"
+#include "/common/shared/nameSection.inc"
+#include "/common/shared/propertyDescTable.inc"
+
+        <sun:title id="bottomTitle">
+#include "/common/appServer/instancePropertiesButtons.jsf"
+        </sun:title>
+
+        <sun:hidden id="helpKey" value="$resource{help_common.instanceProperties}" />
+
+    </sun:form>
+#include "/common/shared/changeButtonsJS.inc"
+</define>
+</composition>