PAYARA-4096 Allow generating instance names from the Admin Console

appserver/admingui/cluster/osgi.bundle

@@ -37,5 +37,6 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
+#Portions Copyright [2019] [Payara Foundation and/or its affiliates.]
 
--exportcontents: org.glassfish.cluster.admingui; version=${project.osgi.version}
+-exportcontents: org.glassfish.cluster.admingui; fish.payara.cluster.admingui; version=${project.osgi.version}

appserver/admingui/cluster/pom.xml

@@ -89,5 +89,11 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.main.common</groupId>
+            <artifactId>glassfish-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

appserver/admingui/cluster/src/main/java/fish/payara/cluster/admingui/PayaraClusterHandlers.java

@@ -0,0 +1,75 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2019 Payara Foundation 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://github.com/payara/Payara/blob/master/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 glassfish/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * The Payara Foundation designates this particular file as subject to the "Classpath"
+ * exception as provided by the Payara Foundation 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.
+ */
+
+package fish.payara.cluster.admingui;
+
+import com.sun.jsftemplating.annotation.Handler;
+import com.sun.jsftemplating.annotation.HandlerInput;
+import com.sun.jsftemplating.annotation.HandlerOutput;
+import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext;
+import fish.payara.api.admin.config.NameGenerator;
+import org.glassfish.admingui.common.util.GuiUtil;
+
+public class PayaraClusterHandlers {
+
+    @Handler(id = "py.generateInstanceNameIfRequired",
+            input = {
+                    @HandlerInput(name = "name", type = String.class, required = true),
+                    @HandlerInput(name = "autoname", type = Boolean.class, required = true)
+            },
+            output = {
+                    @HandlerOutput(name = "instanceName", type = String.class)})
+    public static void generateInstanceNameIfRequired(HandlerContext handlerCtx) {
+        String instanceName = (String) handlerCtx.getInputValue("name");
+        Boolean autoname = (Boolean) handlerCtx.getInputValue("autoname");
+
+        if (GuiUtil.isEmpty(instanceName)) {
+            if (autoname) {
+                instanceName = NameGenerator.generateName();
+            } else {
+                GuiUtil.prepareAlert("error", "No instance name provided, and Auto Name not enabled", null);
+                handlerCtx.getFacesContext().renderResponse();
+            }
+        }
+
+        handlerCtx.setOutputValue("instanceName", instanceName);
+    }
+
+}

appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties

@@ -447,3 +447,4 @@ clusters.ejbTimers.TimerCountCol=Timer Count
 general.serverNameCol=Server Name
 
 autoName=Auto Name
+autoName.help=When enabled, will generate a name for your instance if none is provided, or will otherwise resolve any name conflicts. 

appserver/admingui/cluster/src/main/resources/shared/instanceNew.inc

@@ -38,7 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portions Copyright [2018] [Payara Foundation and/or its affiliates]
+    Portions Copyright [2018-2019] [Payara Foundation and/or its affiliates]
 
 -->
 
@@ -51,6 +51,8 @@
             <sun:button id="newButton" text="$resource{i18n.button.OK}"
                 onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) {submitAndDisable(this, '$resource{i18n.button.Processing}');}; return false;" >
             <!command
+                py.generateInstanceNameIfRequired(name="#{pageSession.name}", autoname="#{pageSession.autoNameSelected}", instanceName="#{pageSession.name}");
+
                 if (!#{pageSession.autoNameSelected}) {
                     setAttribute(key="nameToCheck" value="#{pageSession.name}");
                     gfj.checkNameExist();
@@ -122,10 +124,10 @@
             </sun:property>
 
             <sun:property id="NameTextProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.instanceName}" >
-                <sun:textField id="NameText" text="#{pageSession.name}" styleClass="required" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.cluster.instanceName']}" required="#{true}" />
+                <sun:textField id="NameText" text="#{pageSession.name}" columns="$int{55}" maxLength="#{sessionScope.fieldLengths['maxLength.cluster.instanceName']}" />
             </sun:property>
 
-            <sun:property id="AutoNameProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.autoName}" >
+            <sun:property id="AutoNameProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18ncs.autoName}" helpText="$resource{i18ncs.autoName.help}" >
                 <sun:checkbox id="AutoName" selected="#{pageSession.autoNameSelected}" selectedValue="#{true}" />
             </sun:property>