payara · smillidge · Jul 11, 2016 · May 19, 2016 · Jun 3, 2016 · Jun 6, 2016
diff --git a/appserver/admingui/full/src/main/resources/META-INF/admingui/console-config.xml b/appserver/admingui/full/src/main/resources/META-INF/admingui/console-config.xml
@@ -40,6 +40,7 @@
     holder.
 
 -->
+<!-- Portions Copyright [2016] [C2B2 Consulting Limited and/or its affiliates] -->
 
 <console-config id="full">
     <integration-point
@@ -59,11 +60,11 @@
     />
 
     <integration-point
-                id="fullResourceLink"
-                parentId="propSheetSection"
-                type="org.glassfish.admingui:resources"
-                priority="400"
-                content="fullResourceLink.jsf"
+        id="fullResourceLink"
+        parentId="propSheetSection"
+        type="org.glassfish.admingui:resources"
+        priority="400"
+        content="fullResourceLink.jsf"
     />
 
     <!-- add the property sheet for deployment page, specific for ear app -->
@@ -104,7 +105,7 @@
         content="appClient|org.glassfish.admingui.core.Strings|deploy.type.appClient"
 
     />
-     <integration-point
+    <integration-point
         id="full_edit_appClient"
         type="org.glassfish.admingui:editAppPage"
         content="appclient:full/apps/editAppClient.jsf"
@@ -125,72 +126,87 @@
         parentId="form"
         content="jar|org.glassfish.admingui.core.Strings|deploy.type.ejb"
     />
-     <integration-point
+    <integration-point
         id="full_edit_ejb"
         type="org.glassfish.admingui:editAppPage"
         content="ejb:full/apps/editEjb.jsf"
     />
     <!-- add dropdown option for the resource dropdown of cluster/standalone instance resource table. -->
     <integration-point
-            id="jmailResourceDropDown"
-            type="org.glassfish.admingui:resourceTypeDropdown"
-            priority="500"
-            content="full/mailResourceNew.jsf|org.glassfish.admingui.core.Strings|tree.javaMailSessions"
+        id="jmailResourceDropDown"
+        type="org.glassfish.admingui:resourceTypeDropdown"
+        priority="500"
+        content="full/mailResourceNew.jsf|org.glassfish.admingui.core.Strings|tree.javaMailSessions"
     />
     <integration-point
-            id="customResourceDropDown"
-            type="org.glassfish.admingui:resourceTypeDropdown"
-            priority="300"
-            content="full/customResourceNew.jsf|org.glassfish.admingui.core.Strings|tree.customResources"
+        id="customResourceDropDown"
+        type="org.glassfish.admingui:resourceTypeDropdown"
+        priority="300"
+        content="full/customResourceNew.jsf|org.glassfish.admingui.core.Strings|tree.customResources"
     />
     <integration-point
-            id="externalResourceDropDown"
-            type="org.glassfish.admingui:resourceTypeDropdown"
-            priority="400"
-            content="full/externalResourceNew.jsf|org.glassfish.admingui.core.Strings|tree.externalResources"
+        id="externalResourceDropDown"
+        type="org.glassfish.admingui:resourceTypeDropdown"
+        priority="400"
+        content="full/externalResourceNew.jsf|org.glassfish.admingui.core.Strings|tree.externalResources"
     />
 
     <integration-point
-            id="jmailFilter"
-            type="org.glassfish.admingui:resFilterDropdown"
-            priority="500"
-            content="mail-resource|org.glassfish.admingui.core.Strings|tree.javaMailSessions"
+        id="jmailFilter"
+        type="org.glassfish.admingui:resFilterDropdown"
+        priority="500"
+        content="mail-resource|org.glassfish.admingui.core.Strings|tree.javaMailSessions"
     />
     <integration-point
-            id="customFilter"
-            type="org.glassfish.admingui:resFilterDropdown"
-            priority="300"
-            content="custom-resource|org.glassfish.admingui.core.Strings|tree.customResources"
+        id="customFilter"
+        type="org.glassfish.admingui:resFilterDropdown"
+        priority="300"
+        content="custom-resource|org.glassfish.admingui.core.Strings|tree.customResources"
     />
     <integration-point
-            id="externalFilter"
-            type="org.glassfish.admingui:resFilterDropdown"
-            priority="400"
-            content="external-jndi-resource|org.glassfish.admingui.core.Strings|tree.externalResources"
+        id="externalFilter"
+        type="org.glassfish.admingui:resFilterDropdown"
+        priority="400"
+        content="external-jndi-resource|org.glassfish.admingui.core.Strings|tree.externalResources"
     />
 
 
     <integration-point
-            id="serverBatch"
-            type="org.glassfish.admingui:serverInstTab"
-            priority="30"
-            parentId="serverInstTabs"
-            content="batch/batchTabs.jsf"
-            />
+        id="serverBatch"
+        type="org.glassfish.admingui:serverInstTab"
+        priority="30"
+        parentId="serverInstTabs"
+        content="batch/batchTabs.jsf"
+    />
     <integration-point
-            id="clusterBatch"
-            type="org.glassfish.admingui:clusterTab"
-            priority="200"
-            parentId="clusterTabs"
-            content="batch/batchTabsCluster.jsf"
-            />
+        id="clusterBatch"
+        type="org.glassfish.admingui:clusterTab"
+        priority="200"
+        parentId="clusterTabs"
+        content="batch/batchTabsCluster.jsf"
+    />
+
+    <integration-point
+        id="standaloneBatch"
+        type="org.glassfish.admingui:standaloneInstTab"
+        priority="40"
+        parentId="standaloneInstanceTabs"
+        content="batch/batchTabsStandalone.jsf"
+    />
+    <integration-point
+        id="batch"
+        type="org.glassfish.admingui:navNode"
+        priority="400"
+        parentId="#{configNameId}"
+        content="pluginTreeNodeBatch.jsf"
+    />
 
     <integration-point
-            id="standaloneBatch"
-            type="org.glassfish.admingui:standaloneInstTab"
-            priority="40"
-            parentId="standaloneInstanceTabs"
-            content="batch/batchTabsStandalone.jsf"
-            />
+        id="batchLink"
+        type="org.glassfish.admingui:configuration"
+        priority="400"
+        parentId="propSheetSection"
+        content="batchConfigLink.jsf"
+    />
 
 </console-config>
diff --git a/appserver/admingui/full/src/main/resources/batch.jsf b/appserver/admingui/full/src/main/resources/batch.jsf
@@ -0,0 +1,87 @@
+<!--
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright (c) 2016 C2B2 Consulting Limited and/or its affiliates. 
+ All rights reserved.
+
+ The contents of this file are subject to the terms of 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.
+-->
+<!initPage
+    setResourceBundle(key="i18nc" bundle="org.glassfish.common.admingui.Strings");
+    setResourceBundle(key="i18nf" bundle="org.glassfish.full.admingui.Strings");
+    setResourceBundle(key="i18ncs" bundle="org.glassfish.cluster.admingui.Strings")
+    setResourceBundle(key="help_full" bundle="org.glassfish.full.admingui.Helplinks");
+    />
+<!composition template="/templates/default.layout"  guiTitle="$resource{i18nf.batch.configurationTitle}"  >
+
+<!define name="content">
+<event>
+    <!beforeCreate
+        getRequestValue(key="config" value="#{pageSession.config}");
+
+        createMap(result="#{pageSession.attrsMap}")
+        mapPut(map="#{pageSession.attrsMap}" key="target" value="#{pageSession.config}");
+        gf.restRequest(endpoint="#{sessionScope.REST_URL}/list-batch-runtime-configuration?target=#{pageSession.config}"  method="GET" result="#{requestScope.resp}");
+        setPageSessionAttribute(key="valueMap", value="#{requestScope.resp.data.extraProperties.listBatchRuntimeConfiguration}");
+        mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.config}");
+        />
+</event>
+<sun:form id="propertyForm">
+#include "/common/shared/alertMsg_1.inc"
+    <sun:title id="propertyContentPage" title="$resource{i18nf.batch.configurationTitle}" helpText="$resource{i18nf.batch.configurationTitleHelp}" >
+        <!facet pageButtonsTop>
+        <sun:panelGroup id="topButtons">
+            <sun:button id="saveButton"  text="$resource{i18n.button.Save}"
+                        onClick="submitAndDisable(this, '$resource{i18n.button.Processing}'); return false;" >
+                <!command
+                    prepareSuccessfulMsg();
+                    gf.restRequest(endpoint="#{sessionScope.REST_URL}/set-batch-runtime-configuration" method="POST" attrs="#{pageSession.valueMap}");
+                    />
+            </sun:button>
+        </sun:panelGroup>
+    </facet>
+</sun:title>
+#include "/common/shared/nameSection.inc"
+<sun:propertySheetSection >
+    <sun:property id="executorServiceLookupName"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nf.batch.configuration.executorServiceLookupName}" helpText="$resource{i18nf.batch.configuration.executorServiceLookupNameHelp}">
+        <sun:dropDown id="executorServiceLookupName" selected="#{pageSession.valueMap['executorServiceLookupName']}" labels="$pageSession{mesList}"  values="$pageSession{mesList}"  >
+            <!beforeCreate
+                gf.getChildrenNameFromListCmd(endpoint="#{sessionScope.REST_URL}/resources/list-managed-executor-services", attrs="#{pageSession.attrsMap}"  result="#{pageSession.mesList}");
+                />
+        </sun:dropDown>
+    </sun:property>
+
+    <sun:property id="poolNameProp"  labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nf.batch.configuration.dataSourceLookupName}"  helpText="$resource{i18nf.batch.configuration.dataSourceLookupNameHelp}">
+        <sun:dropDown id="PoolName" selected="#{pageSession.valueMap['dataSourceLookupName']}" labels="$pageSession{jdbcList}"  values="$pageSession{jdbcList}" >
+            <!beforeCreate
+                gf.getChildrenNameFromListCmd(endpoint="#{sessionScope.REST_URL}/resources/list-jdbc-resources", attrs="#{pageSession.attrsMap}" result="#{pageSession.jdbcList}");
+                />
+        </sun:dropDown>
+    </sun:property>
+    <!-- Payara Modifications -->
+    <sun:property id="schemaNameProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nf.batch.configuration.schemaName}"  helpText="$resource{i18nf.batch.configuration.schemaNameHelp}">
+        <sun:textField id="schemaName" columns="$int{40}" maxLength="30" text="#{pageSession.valueMap['schemaName']}" />
+    </sun:property>
+    <sun:property id="tablePrefixProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nf.batch.configuration.tablePrefix}"  helpText="$resource{i18nf.batch.configuration.tablePrefixHelp}">
+        <sun:textField id="tablePrefix" columns="$int{40}" maxLength="30" text="#{pageSession.valueMap['tablePrefix']}" />
+    </sun:property>
+    <sun:property id="tableSuffixProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nf.batch.configuration.tableSuffix}"  helpText="$resource{i18nf.batch.configuration.tableSuffixHelp}">
+        <sun:textField id="tableSuffix" columns="$int{40}" maxLength="30" text="#{pageSession.valueMap['tableSuffix']}" />
+    </sun:property>
+    <!-- End Payara Modifications -->
+</sun:propertySheetSection>
+
+<sun:hidden id="helpKey" value="$resource{help_full.batchConfiguration}" />
+</sun:form>
+</define>
+</composition>
diff --git a/appserver/admingui/full/src/main/resources/batchConfigLink.jsf b/appserver/admingui/full/src/main/resources/batchConfigLink.jsf
@@ -0,0 +1,31 @@
+<!--
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright (c) 2016 C2B2 Consulting Limited and/or its affiliates. 
+ All rights reserved.
+
+ The contents of this file are subject to the terms of 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.
+-->
+
+<sun:property>
+    <sun:hyperlink 
+        toolTip="$resource{i18nf.tree.batch}"
+        url="/full/batch.jsf?config=#{configName}"
+        >
+        <sun:image url="/resource/images/batch.png" />
+        <sun:staticText text="$resource{i18nf.tree.batch}" />
+    </sun:hyperlink>
+    <!beforeCreate
+        setResourceBundle(key="i18nf" bundle="org.glassfish.full.admingui.Strings");
+        />
+</sun:property>
diff --git a/appserver/admingui/full/src/main/resources/images/batch.png b/appserver/admingui/full/src/main/resources/images/batch.png
diff --git a/appserver/admingui/full/src/main/resources/org/glassfish/full/admingui/Strings.properties b/appserver/admingui/full/src/main/resources/org/glassfish/full/admingui/Strings.properties
@@ -37,7 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
-# Portions Copyright [2014] [C2B2 Consulting Limited] 
+# Portions Copyright [2014-2016] [C2B2 Consulting Limited] 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=JavaMail Sessions
 javaMailSessions.pageTitleHelp=A JavaMail session resource represents a mail session in the JavaMail API, which provides a platform-independent and protocol-independent framework to build mail and messaging applications.
@@ -166,5 +166,6 @@ batch.configuration.tableSuffix=Table Suffix
 batch.configuration.tableSuffixHelp=Suffix to add to the table name (This may be ignored by non-rdbms based stores)
 # End Payara Editions
 
+tree.batch=Batch
 
 
diff --git a/appserver/admingui/full/src/main/resources/pluginTreeNodeBatch.jsf b/appserver/admingui/full/src/main/resources/pluginTreeNodeBatch.jsf
@@ -0,0 +1,29 @@
+<!--
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright (c) 2016 C2B2 Consulting Limited and/or its affiliates. 
+ All rights reserved.
+
+ The contents of this file are subject to the terms of 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.
+-->
+
+<sun:treeNode  id="batch"
+    text="$resource{i18nf.tree.batch}"
+    url="/full/batch.jsf?config=${configName}"
+    imageURL="/resource/images/batch.png"
+    >
+    <!beforeCreate
+        setResourceBundle(key="i18nf" bundle="org.glassfish.full.admingui.Strings");
+    />
+</sun:treeNode>
+
diff --git a/appserver/admingui/payara-console-extras/pom.xml b/appserver/admingui/payara-console-extras/pom.xml
@@ -13,9 +13,9 @@
  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.
- -->
+When distributing the software, include this License Header Notice in each
+file and include the License file at packager/legal/LICENSE.txt.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

diff --git a/...er/admingui/payara-console-extras/src/main/resources/META-INF/admingui/console-config.xml b/...er/admingui/payara-console-extras/src/main/resources/META-INF/admingui/console-config.xml
@@ -48,6 +48,23 @@ file and include the License file at packager/legal/LICENSE.txt.
         parentId="serverInstTabs"
         content="asadminRecorder/asadminRecorderTabs.jsf"
     />
+
+    <integration-point
+        id="hazelcast"
+        type="org.glassfish.admingui:navNode"
+        priority="300"
+        parentId="#{configNameId}"
+        content="pluginTreeNodeHazelcast.jsf"
+    />
+
+    <integration-point
+        id="hazelcastLink"
+        type="org.glassfish.admingui:configuration"
+        priority="300"
+        parentId="propSheetSection"
+        content="hazelcast/hazelcastConfigLink.jsf"
+    />
+
     <integration-point
         id="requesttracing"
         type="org.glassfish.admingui:navNode"
@@ -63,4 +80,4 @@ file and include the License file at packager/legal/LICENSE.txt.
         parentId="propSheetSection"
         content="requestTracing/requestTracingConfigLink.jsf"
     />
-</console-config>
+</console-config>
diff --git a/...i/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties b/...i/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
@@ -53,6 +53,7 @@ hazelcast.configuration.dynamic=Dynamic
 hazelcast.configuration.dynamicHelp=Starts or Stops the Hazelcast Member embedded in Payara if required.
 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.
+tree.hazelcast=Hazelcast
 
 asadminRecorder.configuration=Configuration
 asadminRecorder.configurationTip=Asadmin Recorder Configuration