Provide support for setting the schema in JBatch

appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java

@@ -82,6 +82,8 @@ public class ListBatchRuntimeConfiguration
     private static final String DATA_SOURCE_NAME = "dataSourceLookupName";
 
     private static final String EXECUTOR_SERVICE_NAME = "executorServiceLookupName";
+
+    private static final String SCHEMA_NAME = "schemaName";
 
     @Inject
     protected Target targetUtil;
@@ -105,6 +107,7 @@ protected void executeCommand(AdminCommandContext context, Properties extraProps
 
         map.put(DATA_SOURCE_NAME, batchRuntimeConfiguration.getDataSourceLookupName());
         map.put(EXECUTOR_SERVICE_NAME, batchRuntimeConfiguration.getExecutorServiceLookupName());
+        map.put(SCHEMA_NAME, batchRuntimeConfiguration.getSchemaName());
         extraProps.put("listBatchRuntimeConfiguration", map);
 
         ColumnFormatter columnFormatter = new ColumnFormatter(getDisplayHeaders());
@@ -119,6 +122,9 @@ protected void executeCommand(AdminCommandContext context, Properties extraProps
                 case EXECUTOR_SERVICE_NAME:
                     data[index] = batchRuntimeConfiguration.getExecutorServiceLookupName();
                     break;
+                case SCHEMA_NAME:
+                    data[index] = batchRuntimeConfiguration.getSchemaName();
+                    break;
                 default:
                     throw new IllegalArgumentException("Unknown header: " + getOutputHeaders()[index]);
             }
@@ -131,7 +137,7 @@ protected void executeCommand(AdminCommandContext context, Properties extraProps
     @Override
     protected final String[] getAllHeaders() {
         return new String[] {
-                DATA_SOURCE_NAME, EXECUTOR_SERVICE_NAME
+                DATA_SOURCE_NAME, EXECUTOR_SERVICE_NAME, SCHEMA_NAME
         };
     }
 

appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/SetBatchRuntimeConfiguration.java

@@ -99,6 +99,9 @@ public class SetBatchRuntimeConfiguration
 
     @Param(name = "executorServiceLookupName", shortName = "x", optional = true)
     private String executorServiceLookupName;
+
+    @Param(name = "schemaName", shortName = "n", optional = true)
+    private String schemaName;
 
     @Override
     public void execute(final AdminCommandContext context) {
@@ -117,7 +120,6 @@ public void execute(final AdminCommandContext context) {
 
         try {
             Config config = targetUtil.getConfig(target);
-            System.out.println("** EXECUTING -d " + dataSourceLookupName + "  -x " + executorServiceLookupName);
 
             BatchRuntimeConfiguration batchRuntimeConfiguration = config.getExtensionByType(BatchRuntimeConfiguration.class);
             if (batchRuntimeConfiguration != null) {
@@ -150,6 +152,10 @@ public Object run(final BatchRuntimeConfiguration batchRuntimeConfigurationProxy
                                 throw new GlassFishBatchValidationException("No executor service bound to name = " + executorServiceLookupName);
                             }
                         }
+                        if (schemaName != null && !encounteredError) {
+                            batchRuntimeConfigurationProxy.setSchemaName(schemaName);
+                            actionReport.setActionExitCode(ActionReport.ExitCode.SUCCESS);
+                        }
 
                         return null;
                     }

appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeConfiguration.java

@@ -59,8 +59,13 @@ public interface BatchRuntimeConfiguration
     @Attribute(defaultValue = "concurrent/__defaultManagedExecutorService")
     String getExecutorServiceLookupName();
 
+    @Attribute(defaultValue = "APP")
+    String getSchemaName();
+
     public void setDataSourceLookupName(String value);
 
     public void setExecutorServiceLookupName(String value);
+
+    public void setSchemaName(String value);
 
 }

appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java

@@ -248,7 +248,7 @@ public static String getDefaultDataSourceLookupNameForTarget(String targetName)
     }
 
     private String getSchemaName() {
-        return "APP";
+        return batchRuntimeConfiguration.getSchemaName();
     }
 
     public String getExecutorServiceLookupName() {

appserver/payara-admingui/full/src/main/resources/batch/batchConfiguration_2.inc

@@ -71,6 +71,9 @@
                     />
                    </sun:dropDown>
                </sun:property>
+                <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:propertySheetSection>
 
     <sun:hidden id="helpKey" value="$resource{help_full.batchConfiguration}" />

appserver/payara-admingui/full/src/main/resources/org/glassfish/full/admingui/Strings.properties

@@ -157,6 +157,8 @@ batch.configuration.executorServiceLookupName=Executor Service Lookup Name:
 batch.configuration.executorServiceLookupNameHelp=JNDI lookup name of the managed executor service that provides threads to jobs
 batch.configuration.dataSourceLookupName=Data Source Lookup Name:
 batch.configuration.dataSourceLookupNameHelp=JNDI lookup name of the data source that stores job information
+batch.configuration.schemaName=Database Schema Name
+batch.configuration.schemaNameHelp=Name of the schema containing the required batch tables