Merge pull request #125 from hansenmc/corb232

Update to CoRB 2.3.2

Author: rjrudin

examples/corb2-project/build.gradle

@@ -18,12 +18,12 @@ buildscript {
   }
   dependencies {
     //Needed for CorbTask to dynamicaly generate properties from CORB Options class
-    classpath 'com.marklogic:marklogic-corb:2.3.1'
+    classpath 'com.marklogic:marklogic-corb:2.3.2'
   }
 }
 
 plugins {
-    id "com.marklogic.ml-gradle" version "2.3.0"
+    id "com.marklogic.ml-gradle" version "2.3.2"
 }
 
 repositories {
@@ -42,7 +42,7 @@ configurations {
 
 dependencies {
     // required to run CoRB2
-    corb 'com.marklogic:marklogic-corb:2.3.0'
+    corb 'com.marklogic:marklogic-corb:2.3.2'
     // optional
     //corb 'org.jasypt:jasypt:1.9.2' // would be necessary to leverage JasyptDecrypter
 }

examples/sample-project/build.gradle

@@ -84,7 +84,7 @@ dependencies {
     testCompile "com.jayway.restassured:rest-assured:2.4.1"
 
     // corb jar available from jcenter
-    corb "com.marklogic:marklogic-corb:2.3.0"
+    corb "com.marklogic:marklogic-corb:2.3.2"
 }
 
 

src/main/groovy/com/marklogic/gradle/task/CorbTask.groovy

@@ -8,24 +8,27 @@ import com.marklogic.appdeployer.AppConfig
 class CorbTask extends JavaExec {
 
   //default CORB option list
-  private static String[] DEFAULT_CORB_OPTIONS = "BATCH-SIZE,BATCH-URI-DELIM,COLLECTION-NAME,DECRYPTER,\
+  private static String[] DEFAULT_CORB_OPTIONS = "BATCH-SIZE,BATCH-URI-DELIM,\
+COLLECTION-NAME,COMMAND,COMMAND-FILE,COMMAND-FILE-POLL-INTERVAL,DECRYPTER,\
+DISK-QUEUE,DISK-QUEUE-MAX-IN-MEMORY-SIZE,DISK-QUEUE-TEMP-DIR,\
 ERROR-FILE-NAME,EXIT-CODE-NO-URIS,EXPORT_FILE_AS_ZIP,\
 EXPORT-FILE-BOTTOM-CONTENT,EXPORT-FILE-DIR,EXPORT-FILE-HEADER-LINE-COUNT,\
 EXPORT-FILE-NAME,EXPORT-FILE-PART-EXT,\
 EXPORT-FILE-SORT,EXPORT-FILE-SORT-COMPARATOR,\
 EXPORT-FILE-TOP-CONTENT,EXPORT-FILE-URI-TO-PATH,\
 FAIL-ON-ERROR,INSTALL,INIT-MODULE,INIT-TASK,JASYPT-PROPERTIES-FILE,\
-MAX_OPTS_FROM_MODULE,MODULES-DATABASE,MODULE-ROOT,OPTIONS-FILE,\
+MAX_OPTS_FROM_MODULE,MODULES-DATABASE,MODULE-ROOT,NUM-TPS-FOR-ETC,OPTIONS-FILE,\
 POST-BATCH-MODULE,POST-BATCH-TASK,POST-BATCH-XQUERY-MODULE,\
 PRE-BATCH-MODULE,PRE-BATCH-TASK,PRE-BATCH-XQUERY-MODULE,\
 PRIVATE-KEY-ALGORITHM,PRIVATE-KEY-FILE,\
 PROCESS-MODULE,PROCESS-TASK,\
-QUERY-RETRY-LIMIT,QUERY-RETRY-INTERVAL,\
+QUERY-RETRY-LIMIT,QUERY-RETRY-INTERVAL,QUERY-RETRY-ERROR-CODES,QUERY-RETRY-ERROR-MESSAGE\
 SSL-CIPHER-SUITES,SSL-CONFIG-CLASS,SSL-ENABLED-PROTOCOLS,SSL-KEY-PASSWORD,\
 SSL-KEYSTORE,SSL-KEYSTORE-PASSWORD,SSL-KEYSTORE-TYPE,SSL-PROPERTIES-FILE,\
 THREAD-COUNT,URIS_BATCH_REF,URIS-FILE,URIS-LOADER,URIS-MODULE,URIS-REPLACE-PATTERN,\
 XCC_CONNECTION_RETRY_LIMIT,XCC-CONNECTION-RETRY-INTERVAL,XCC-CONNECTION-URI,\
 XCC-DBNAME,XCC-HOSTNAME,XCC-PASSWORD,XCC-PORT,XCC-USERNAME,\
+XML-FILE,XML-NODE\
 XQUERY-MODULE".tokenize(',')
 
   CorbTask() {