PAYARA-1909 Domain Discovery Mode

appserver/admin/gf_template/src/main/resources/config/domain.xml

@@ -43,6 +43,7 @@
 <!-- Portions Copyright [2017] [Payara Foundation and/or its affiliates] -->
 
 <domain log-root="${com.sun.aas.instanceRoot}/logs" application-root="${com.sun.aas.instanceRoot}/applications" version="10.0">
+<hazelcast-runtime-configuration></hazelcast-runtime-configuration>
 <security-configurations>
     <authentication-service default="true" name="adminAuth" use-password-credential="true">
       <security-provider name="spcrealm" type="LoginModule" provider-name="adminSpc">
@@ -119,15 +120,15 @@
       <connector-service shutdown-timeout-in-seconds="30">
       </connector-service>
        <transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" />
-       <hazelcast-runtime-configuration></hazelcast-runtime-configuration>
        <asadmin-recorder-configuration></asadmin-recorder-configuration>
        <request-tracing-service-configuration>
          <log-notifier></log-notifier>
        </request-tracing-service-configuration>
       <notification-service-configuration enabled="true">
         <log-notifier-configuration enabled="true"></log-notifier-configuration>
       </notification-service-configuration>
-      <monitoring-service-configuration></monitoring-service-configuration>
+    <hazelcast-config-specific-configuration></hazelcast-config-specific-configuration>
+    <monitoring-service-configuration></monitoring-service-configuration>
        <diagnostic-service />
       <security-service>
         <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="admin-realm">
@@ -377,13 +378,13 @@
              </message-security-config>
          </security-service>
          <transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" automatic-recovery="true" />
-         <hazelcast-runtime-configuration></hazelcast-runtime-configuration>
          <request-tracing-service-configuration>
              <log-notifier></log-notifier>
          </request-tracing-service-configuration>
       <notification-service-configuration enabled="true">
         <log-notifier-configuration enabled="true"></log-notifier-configuration>
       </notification-service-configuration>
+      <hazelcast-config-specific-configuration></hazelcast-config-specific-configuration>
       <monitoring-service-configuration></monitoring-service-configuration>
          <diagnostic-service />
          <java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">

appserver/admin/payara_template/src/main/resources/config/domain.xml

@@ -16,6 +16,7 @@
  -->
 
 <domain log-root="${com.sun.aas.instanceRoot}/logs" application-root="${com.sun.aas.instanceRoot}/applications" version="10.0">
+<hazelcast-runtime-configuration></hazelcast-runtime-configuration>
 <security-configurations>
     <authentication-service default="true" name="adminAuth" use-password-credential="true">
       <security-provider name="spcrealm" type="LoginModule" provider-name="adminSpc">
@@ -86,12 +87,12 @@
         <property value="${com.sun.aas.installRoot}/.." name="ipsRoot" />
         <das-config dynamic-reload-enabled="false" autodeploy-enabled="false"/>
       </admin-service>
+      <hazelcast-config-specific-configuration></hazelcast-config-specific-configuration>
       <connector-service shutdown-timeout-in-seconds="30">
       </connector-service>
        <transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" timeout-in-seconds="300">
          <property name="xaresource-txn-timeout" value="300"/>
        </transaction-service>
-       <hazelcast-runtime-configuration></hazelcast-runtime-configuration>
        <ejb-container max-pool-size="128">
          <ejb-timer-service />
        </ejb-container>
@@ -340,7 +341,7 @@
          <transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" automatic-recovery="true" timeout-in-seconds="300">
            <property name="xaresource-txn-timeout" value="300"/>
          </transaction-service>
-         <hazelcast-runtime-configuration></hazelcast-runtime-configuration>
+         <hazelcast-config-specific-configuration></hazelcast-config-specific-configuration>
          <request-tracing-service-configuration>
              <log-notifier></log-notifier>
          </request-tracing-service-configuration>

appserver/admingui/payara-console-extras/src/main/resources/META-INF/admingui/console-config.xml

@@ -39,28 +39,29 @@
    holder.
 -->
 <console-config id="payaraExtras">
+
     <integration-point
-        id="domainHazelcast"
-        type="org.glassfish.admingui:domainTab"
-        priority="30"
-        parentId="domainTabs"
-        content="hazelcast/hazelcastTabsDomain.jsf"
+        id="hazelcast"
+        type="org.glassfish.admingui:navNode"
+        priority="180"
+        parentId="nodes"
+        content="pluginTreeNodeHazelcast.jsf"
     />
-        
+
     <integration-point
-        id="clusterHazelcast"
-        type="org.glassfish.admingui:clusterTab"
-        priority="200"
-        parentId="clusterTabs"
-        content="hazelcast/hazelcastTabsCluster.jsf"
+        id="hazelcastLocal"
+        type="org.glassfish.admingui:navNode"
+        priority="60"
+        parentId="#{configNameId}"
+        content="pluginTreeNodeHazelcastLocal.jsf"
     />
 
     <integration-point
-        id="standaloneHazelcast"
-        type="org.glassfish.admingui:standaloneInstTab"
-        priority="40"
-        parentId="standaloneInstanceTabs"
-        content="hazelcast/hazelcastTabsStandalone.jsf"
+        id="notificationLink"
+        type="org.glassfish.admingui:configuration"
+        priority="60"
+        parentId="propSheetSection"
+        content="hazelcast/hazelcastConfigLink.jsf"
     />
 
     <integration-point
@@ -111,23 +112,6 @@
         content="notification/notificationConfigLink.jsf"
     />
 
-
-    <integration-point
-        id="hazelcast"
-        type="org.glassfish.admingui:navNode"
-        priority="80"
-        parentId="#{configNameId}"
-        content="pluginTreeNodeHazelcast.jsf"
-    />
-
-    <integration-point
-        id="hazelcastLink"
-        type="org.glassfish.admingui:configuration"
-        priority="80"
-        parentId="propSheetSection"
-        content="hazelcast/hazelcastConfigLink.jsf"
-    />
-
     <integration-point
         id="domainEnvironmentWarning"
         type="org.glassfish.admingui:domainTab"

appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties

@@ -36,48 +36,76 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
-hazelcast.configurationTitle=Hazelcast Configuration
-hazelcast.configurationTitleHelp=Enable and configure the settings for the embedded Hazelcast distributed cache within Payara.<br/>\
-<br/>Hazelcast must be enabled to use the Hazelcast Web and EJB session persistence type in the Availability Service.\
-<br/>Hazelcast must be enabled to use <a href='https://jcp.org/en/jsr/detail?id=107'>JCache (JSR 107)</a> capabilities and apis in your applications. \
-<br/>Hazelcast does not need to be enabled to use the legacy GlassFish Shoal based GMS and replicated session persistence type. \
-<br/>Set a unique Cluster Name and Cluster Password for each Development, Preproduction and Production Environment.
+hazelcast.configurationTitle=Domain Wide Data Grid Configuration
+hazelcast.configurationTitleHelp=Enable and configure the settings for the embedded Domain wide Data Grid within Payara.<br/>\
+<br/>Data Grid must be enabled to use the Hazelcast Web and EJB session persistence type in the Availability Service.\
+<br/>Data Grid must be enabled to use <a href='https://jcp.org/en/jsr/detail?id=107'>JCache (JSR 107)</a> capabilities and apis in your applications.
+hazelcast.local.configurationTitle=Configuration Specific Data Grid Configuration
+hazelcast.local.configurationTitleHelp=Data Grid configuration specified here applies to all server instances that use this configuation \
+These configuration options in combination with the Domain Data Grid configuration determines how a server instance joins the cluster.
 hazelcast.configuration.enabled=Enabled
-hazelcast.configuration.enabledHelp=If enabled, Hazelcast will start when the server starts. Hazelcast will start immediately if both this and the 'Dynamic' boxes are checked
+hazelcast.configuration.enabledHelp=If enabled, the Data Grid will start when the server starts. Data Grid will start immediately if both this and the 'Dynamic' boxes are checked.<br\>\
+The Data Grid is always enabled on the DAS.
 hazelcast.configuration.configFile=Override configuration file
-hazelcast.configuration.configFileHelp=Path to the Hazelcast configuration file (relative to the domain config directory) which overrides all the settings on this page<br\>\
+hazelcast.configuration.configFileHelp=Path to the Data Grid configuration file (relative to the domain config directory) which overrides all the settings on this page<br\>\
 If this is set, and the file exists, all the settings below are ignored and are taken from the specified configuration file.
 hazelcast.configuration.startPort=Start Port
-hazelcast.configuration.startPortHelp=Default port Hazelcast will listen on. Hazelcast will increment this number until it finds a valid port.
+hazelcast.configuration.startPortHelp=Default port the Data Grid member will listen on. The member will increment this number until it finds a valid port.
 hazelcast.configuration.multicastPort=Multicast Port
-hazelcast.configuration.multicastPortHelp=The multicast port for group communications in the Hazelcast cluster
+hazelcast.configuration.multicastPortHelp=The multicast port for group communications in the Data Grid if  multicast cluster discovery mode is selected
 hazelcast.configuration.multicastGroup=Multicast Group
-hazelcast.configuration.multicastGroupHelp=The multicast group for communications in the Hazelcast cluster
-hazelcast.configuration.clusterName=Cluster Group Name
-hazelcast.configuration.clusterNameHelp=Cluster Group Name. For Hazelcast to cluster the cluster name and password must be identical.
-hazelcast.configuration.clusterPassword=Cluster Group Password
-hazelcast.configuration.clusterPasswordHelp=Cluster Group Password. The password must be the same on all cluster group members.
-hazelcast.configuration.jndiName=JNDI Name
+hazelcast.configuration.multicastGroupHelp=The multicast group for communications in the Data Grid if multicast cluster discovery mode is selected
+hazelcast.configuration.tcpipMembers=TCP/IP Members
+hazelcast.configuration.tcpipMembersHelp=The list of other data grid members to connect to when Cluster discovery mode is set to tcpip
+hazelcast.configuration.discoveryMode=Cluster Discovery Mode
+hazelcast.configuration.discoveryModeHelp=How should the DAS discovery other server instances in the Data Grid
+hazelcast.configuration.interfaces=Network Interfaces
+hazelcast.configuration.interfacesHelp=The list of network interfaces the Data Grid should bind to
+hazelcast.configuration.dasPublicAddress=DAS Public Address
+hazelcast.configuration.dasPublicAddressHelp=The network address that other members should use to connect to the DAS. If left blank the value for Public Bind Address will be used.
+hazelcast.configuration.dasBindAddress=DAS Bind Address
+hazelcast.configuration.dasBindAddressHelp=The network interface address the DAS Data Grid should bind to
+hazelcast.configuration.dasPort=DAS Start Port
+hazelcast.configuration.dasPortHelp=Default port the DAS member will listen on. The member will increment this number until it finds a valid port.
+hazelcast.configuration.clusterName=Data Grid Group Name
+hazelcast.configuration.clusterNameHelp=Data Grid Group Name. For members to form a Data Grid the name and password must be identical.
+hazelcast.configuration.clusterPassword=Data Grid Group Password
+hazelcast.configuration.clusterPasswordHelp=Data Grid Group Password. The password must be the same on all data grid members.
+hazelcast.configuration.jndiName=Hazelcast Instance JNDI Name
 hazelcast.configuration.jndiNameHelp=JNDI Name to bind the Hazelcast Instance to
 hazelcast.configuration.licenseKey=License Key
 hazelcast.configuration.licenseKeyHelp=The License Key for Hazelcast  Enterprise
 hazelcast.configuration=Configuration
-hazelcast.configurationTip=Hazelcast Configuration
+hazelcast.configurationTip=Data Grid Configuration
 hazelcast.membersTab=Cluster Members
-hazelcast.membersTabTip=View the Hazelcast Cluster Members
-hazelcast.hazelcastTabs=Hazelcast
-hazelcast.membersTitle=Hazelcast Cluster Members
-hazelcast.membersTitleHelp=A list of the Hazelcast Cluster Members visible to this instance
-hazelcast.domainMembersTitleHelp=A list of the Hazelcast Cluster Members visible to this domain
-hazelcast.members.members =Cluster Members
-hazelcast.members.membersHelp=The Hazelcast Cluster Members
-hazelcast.configuration.dynamic=Dynamic
-hazelcast.configuration.dynamicHelp=Applies the configuration change immediately, without needing a restart.
-hazelcast.configuration.lite =Lite Cluster Member
-hazelcast.configuration.liteHelp=If set to true this member is a lite cluster member. i.e. It clusters but stores no cluster data within its heap.
+hazelcast.membersTabTip=View the Data Grid Cluster Members
+hazelcast.hazelcastTabs=Data Grid
+hazelcast.membersTitle=Data Grid Members
+hazelcast.membersTitleHelp=A list of the Data Grid Members visible to this instance
+hazelcast.domainMembersTitleHelp=A list of the Data Grid Members visible to this domain
+hazelcast.members.members =Data Grid Members
+hazelcast.members.membersHelp=The Data Grid Cluster Members
+hazelcast.configuration.dynamic=Restart Data Grid
+hazelcast.configuration.dynamicHelp=Applies the cluster configuration change immediately, without needing a restart of the Server.<br/>WARNING this can cause cluster wide data loss if a large number of instances restart their clustering immediately.
+hazelcast.configuration.lite =Lite Data Grid Member
+hazelcast.configuration.liteHelp=If set to true this member is a lite Data Grid member. i.e. It joins the grid but stores no data within its heap.
 hazelcast.configuration.hostaware =Host Aware Partitioning
-hazelcast.configuration.hostawareHelp =When enabled cluster backups will not be stored on members with the same IP Address. All members of the cluster including Payara Micro members must have Host Aware Partitioning enabled.
-tree.hazelcast=Hazelcast
+hazelcast.configuration.hostawareHelp =When enabled data backups will not be stored on members with the same IP Address. All members of the data grid including Payara Micro members must have Host Aware Partitioning enabled.
+hazelcast.configuration.memberGroup=Member Group
+hazelcast.configuration.memberGroupHelp=The member group for all server instances using this configuration
+hazelcast.configuration.cacheManagerJndiName=JCache Cache Manager JNDI Name
+hazelcast.configuration.cacheManagerJndiNameHelp=JNDI Name to bind the JCache Cache Manager to
+hazelcast.configuration.cachingProviderJndiName=JCache Caching Provider JNDI Name
+hazelcast.configuration.cachingProviderJndiNameHelp=JNDI Name to bind the JCache Caching Provider to
+hazelcast.configuration.executorPoolSize=Executor Pool Size
+hazelcast.configuration.executorPoolSizeHelp=Thread Pool Size for the Data Grid Executor Service
+hazelcast.configuration.scheduledExecutorPoolSize=Scheduled Executor Pool Size
+hazelcast.configuration.scheduledExecutorPoolSizeHelp=Thread Pool Size for the Data Grid Scheduled Executor Service
+hazelcast.configuration.executorQueueCapacity=Executor Queue Capacity
+hazelcast.configuration.scheduledExecutorQueueCapacity=Scheduled Executor Queue Capacity
+hazelcast.configuration.executorQueueCapacityHelp=Queue Capacity of the Data Grid Executor Service. Executions are queued until a thread is available
+hazelcast.configuration.scheduledExecutorQueueCapacityHelp=Queue Capacity of the Data Grid Scheduled Executor Service. Executions are queued until a thread is available
+tree.hazelcast=Data Grid
 
 environmentWarning.environmentWarningTab=Environment Warning
 environmentWarning.environmentWarningTabTip=Environment Warning Tab