Merge pull request #578 from hansenmc/CoRB-4.5.0

Corb 2.5.2

Author: rjrudin

examples/corb2-project/build.gradle

@@ -1,8 +1,8 @@
 /*
- * This buildscript shows how corb dependencies can be easily declared and then a Gradle configuration named
- * "corb". This configuration is then used as the classpath for CorbTask, which is an extension of Gradle's
- * JavaExec task that exposes the corb options as task attributes. The CorbTask will apply any corb options set via
- * task attributes, project properties, or System properties.
+ * This build script shows how CoRB dependencies can be easily declared and then a Gradle configuration named "corb".
+ * This configuration is then used as the classpath for CorbTask, which is an extension of Gradle's JavaExec task that
+ * exposes the CoRB options as task attributes.
+ * The CorbTask will apply any corb options set via task attributes, project properties, or System properties.
  */
 
 /*
@@ -12,25 +12,20 @@
  */
 buildscript {
   repositories {
-    jcenter()
-    // Needed for corb dependency: XCC
-    maven { url "http://developer.marklogic.com/maven2/" }
+		jcenter()
   }
   dependencies {
-    //Needed for CorbTask to dynamicaly generate properties from CORB Options class
-    classpath 'com.marklogic:marklogic-corb:2.4.5'
+    //Needed for CorbTask to dynamically generate properties from CORB Options class
+    classpath "com.marklogic:marklogic-corb:${corbVersion}"
   }
 }
 
 plugins {
-    id "com.marklogic.ml-gradle" version "4.0.4"
+    id "com.marklogic.ml-gradle" version "4.1.0"
 }
 
 repositories {
     jcenter()
-
-    // Needed for corb dependency: XCC
-    maven { url "http://developer.marklogic.com/maven2/" }
 }
 
 configurations {
@@ -42,7 +37,7 @@ configurations {
 
 dependencies {
     // required to run CoRB2
-    corb 'com.marklogic:marklogic-corb:2.4.5'
+    corb "com.marklogic:marklogic-corb:${corbVersion}"
     // optional
     //corb 'org.jasypt:jasypt:1.9.2' // would be necessary to leverage JasyptDecrypter
 }

examples/corb2-project/gradle.properties

@@ -1,3 +1,4 @@
+corbVersion=2.5.2
 mlHost=localhost
 mlAppName=corb2-project
 mlRestPort=8140

examples/corb2-project/src/main/ml-modules/ext/corb2-project/corb/transform.xqy

@@ -1,5 +1,3 @@
 xquery version "1.0-ml";
-
 declare variable $URI external;
-
 xdmp:log("Calling Corb transform on URI: " || $URI)

examples/corb2-project/src/main/ml-modules/ext/corb2-project/corb/uris.xqy

@@ -1,9 +1,4 @@
 xquery version "1.0-ml";
-
-(:
-Sample query that returns all URIs.
-:)
-
-let $uris := cts:uris((), (), cts:and-query(()))
-
-return (count($uris), $uris)
+(: Sample query that returns all URIs :)
+let $uris := cts:uris("", (), cts:true-query())
+return (count($uris), $uris)

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

@@ -4,40 +4,40 @@ import org.gradle.api.Task
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.TaskAction
 
-import com.marklogic.appdeployer.AppConfig
+import java.lang.reflect.Modifier
 
 class CorbTask extends JavaExec {
 
   def corbOptions = [:]
 
   //default CORB option list
   private static String[] DEFAULT_CORB_OPTIONS = "BATCH-SIZE,BATCH-URI-DELIM,\
-COLLECTION-NAME,COMMAND,COMMAND-FILE,COMMAND-FILE-POLL-INTERVAL,CONNECTION_POLICY,CONTENT_SOURCE_POOL,\
+COLLECTION-NAME,COMMAND,COMMAND-FILE,COMMAND-FILE-POLL-INTERVAL,CONNECTION-POLICY,CONTENT-SOURCE-POOL,\
 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,JOB_NAME,JOB_SERVER_PORT,\
-LOADER_BASE64_ENCODE,LOADER_PATH,LOADER_SET_URIS_BATCH_REF,LOADER_USE_ENVELOPE,LOADER_VARIABLE,\
-MAX_OPTS_FROM_MODULE,METADATA,METADATA_TO_PROCESS_MODULE,\
-METRICS_COLLECTIONS,METRICS_DATABASE,METRICS_LOG_LEVEL,METRICS_MODULE,\
-METRICS_NUM_FAILED_TRANSACTIONS,METRICS_NUM_SLOW_TRANSACTIONS,METRICS_ROOT,METRICS_SYNC_FREQUENCY,\
-ML_LOG_LEVELS,MODULES-DATABASE,MODULE-ROOT,\
+FAIL-ON-ERROR,INSTALL,INIT-MODULE,INIT-TASK,JASYPT-PROPERTIES-FILE,JOB-NAME,JOB-SERVER-PORT,\
+LOADER-BASE64-ENCODE,LOADER-PATH,LOADER-SET-URIS-BATCH-REF,LOADER-USE-ENVELOPE,LOADER-VARIABLE,\
+MAX-OPTS-FROM-MODULE,METADATA,METADATA-TO-PROCESS-MODULE,\
+METRICS-COLLECTIONS,METRICS-DATABASE,METRICS-LOG-LEVEL,METRICS-MODULE,\
+METRICS-NUM-FAILED-TRANSACTIONS,METRICS-NUM-SLOW-TRANSACTIONS,METRICS-ROOT,METRICS-SYNC-FREQUENCY,\
+ML-LOG-LEVELS,MODULES-DATABASE,MODULE-ROOT,\
 NUM-TPS-FOR-ETC,OPTIONS-FILE,\
-POST_BATCH_MINIMUM_COUNT,POST-BATCH-MODULE,POST-BATCH-TASK,POST-BATCH-XQUERY-MODULE,\
-PRE_BATCH_MINIMUM_COUNT,PRE-BATCH-MODULE,PRE-BATCH-TASK,PRE-BATCH-XQUERY-MODULE,PRE_POST_BATCH_ALWAYS_EXECUTE,\
+POST-BATCH-MINIMUM-COUNT,POST-BATCH-MODULE,POST-BATCH-TASK,POST-BATCH-XQUERY-MODULE,\
+PRE-BATCH-MINIMUM-COUNT,PRE-BATCH-MODULE,PRE-BATCH-TASK,PRE-BATCH-XQUERY-MODULE,PRE-POST-BATCH-ALWAYS-EXECUTE,\
 PRIVATE-KEY-ALGORITHM,PRIVATE-KEY-FILE,\
 PROCESS-MODULE,PROCESS-TASK,\
 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,\
-TEMP_DIR,THREAD-COUNT,\
-URIS_BATCH_REF,URIS-FILE,URIS-LOADER,URIS-MODULE,URIS_REDACTED,URIS-REPLACE-PATTERN,URIS_TOTAL_COUNT,\
-XCC_CONNECTION_RETRY_LIMIT,XCC-CONNECTION-RETRY-INTERVAL,XCC_CONNECTION_HOST_RETRY_LIMIT,XCC-CONNECTION-URI,\
-XCC-DBNAME,XCC-HOSTNAME,XCC_HTTPCOMPLIANT,XCC-PASSWORD,XCC-PORT,XCC_PROTOCOL,XCC_TIME_ZONE,XCC-USERNAME,\
-XML-FILE,XML_METADATA,XML-NODE,XML_SCHEMA,XML_TEMP_DIR,ZIP_FILE\
+TEMP-DIR,THREAD-COUNT,\
+URIS_BATCH_REF,URIS-FILE,URIS-LOADER,URIS-MODULE,URIS-REDACTED,URIS-REPLACE-PATTERN,URIS-TOTAL-COUNT,\
+XCC-CONNECTION-RETRY-LIMIT,XCC-CONNECTION-RETRY-INTERVAL,XCC-CONNECTION-HOST-RETRY-LIMIT,XCC-CONNECTION-URI,XCC-DBNAME,\
+XCC-HOSTNAME,XCC-HTTPCOMPLIANT,XCC-PASSWORD,XCC-PORT,XCC-PROTOCOL,XCC-TIME-ZONE,XCC-URL-ENCODE-COMPONENTS,XCC-USERNAME,\
+XML-FILE,XML-METADATA,XML-NODE,XML-SCHEMA,XML-TEMP-DIR,ZIP-FILE\
 XQUERY-MODULE".tokenize(',')
 
   CorbTask() {
@@ -46,7 +46,10 @@ XQUERY-MODULE".tokenize(',')
     try {
         optionNames = Class.forName("com.marklogic.developer.corb.Options", true, Thread.currentThread().contextClassLoader)
         .declaredFields
-        .findAll { !it.synthetic }.collect { it.get(null) }
+        .findAll { (it.getModifiers() & (Modifier.PROTECTED | Modifier.PRIVATE)) == 0 &&
+			String.class.equals(it.getType()) &&
+			!it.synthetic }
+		.collect { it.get(null) }
     } catch (ClassNotFoundException ex) {}
 
     //Augment with member variables and a mapping of CoRB2 Options
@@ -174,10 +177,14 @@ XQUERY-MODULE".tokenize(',')
     this.metaClass.getProperties().collectEntries {
       String corbOptionKey = CORB_PROPERTY_PREFIX + it.name.capitalize()
       //evaluate whether a value is set and the name matches the corbOptions key pattern
-	  if (corbOptions[corbOptionKey] && this[it.name]) {
-	    [(corbOptions[corbOptionKey]): this[it.name] ]
-	  } else {
-	    [:]
+	  try {
+	    if (corbOptions[corbOptionKey] && this[it.name]) {
+	      [(corbOptions[corbOptionKey]): this[it.name] ]
+	    } else {
+	      [:]
+	    }
+	  } catch (groovy.lang.GroovyRuntimeException ex) {
+	    return [:]
 	  }
     }
   }