DHF 4.x support

Author: mhavey

uml2es/docs/build.md

@@ -45,7 +45,7 @@ The toolkit provides a gradle build file containing all model deployment and cod
 	* "all" - All classes are considered entities. Ignore entities specified.
 
 *Dependencies:* 
-- Your gradle project is DHF 4.1
+- Your gradle project is DHF 4.1. If you prefer to use a more recent DHF 4.x release, make sure to change the DHF version in any *.gradle or gradle*.properties files you obtain from this toolkit.
 - You have deployed your UML model
 - Standard DHF environment properties: mlHost, mlFinalPort
 
@@ -72,7 +72,7 @@ The toolkit provides a gradle build file containing all model deployment and cod
 - overwrite: true/false. If true and harmonization already exists, overwrite it. If you don't want to clobber, set to false.
 
 *Dependencies:*
-- Your gradle project is DHF 4.1
+- Your gradle project is DHF 4.1. If you prefer to use a more recent DHF 4.x release, make sure to change the DHF version in any *.gradle or gradle*.properties files you obtain from this toolkit.
 - You have deployed your UML model
 - You have created the entity in question using uCreateDHFEntities
 - Standard DHF environment properties: mlHost, mlFinalPort

uml2es/tutorials/dmHubLab/step1/src/main/ml-modules/root/mapperGUILib.sjs

@@ -15,7 +15,7 @@ function convertDmIde2DMF(dmuiMappingURI, dmfMappingURI, mainEntity) {
   if (!doc || doc == null) throw "Not found in modules DB: *" + dmuiMappingURI + "*";
   var dmTemplate = buildDMTemplate(doc, mainEntity, true);
   xdmp.documentInsert(dmfMappingURI, dmTemplate, {
-    "collections": ["dm", "cookieCutter", "http://marklogic.com/entity-services/models", mainEntity],
+    "collections": ["dm", "cookieCutter", /* "http://marklogic.com/entity-services/models", */ mainEntity],
     "permissions": xdmp.documentGetPermissions(dmuiMappingURI)
   });
 }

uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/cookieCutter.sjs

@@ -415,7 +415,7 @@ function writeFile(folder, name, content, asText, model, coll, stagingDB) {
 		contentNode = textNode.toNode();
 	}
 	var uri = folder + name;
-	var collections = [coll, "cookieCutter", "http://marklogic.com/entity-services/models"];
+	var collections = [coll, "cookieCutter"]; //, "http://marklogic.com/entity-services/models"];
 	if (model && model != "") collections.push(model);
 	if (stagingDB && stagingDB != "") {
 		xdmp.eval('declareUpdate(); xdmp.documentInsert(uri,contentNode, {"collections": collections})',

uml2es/uml2esTransform/uml2es4dhf.gradle

@@ -33,7 +33,8 @@ plugins {
 
     // This gradle plugin extends the ml-gradle plugin with
     // commands that make the Data Hub Framework do its magic
-    id 'com.marklogic.ml-data-hub' version '4.1.0'
+    // You can change to any 4.x build. Must be 4.1.0 or higher. DHF 5 is not supported.
+    id 'com.marklogic.ml-data-hub' version '4.1.0' 
 }
 
 repositories {
@@ -62,7 +63,8 @@ configurations {
 dependencies {
     // this allows you to write custom java code that depends
     // on the Data Hub Framework library
-    compile 'com.marklogic:marklogic-data-hub:4.1.0'
+    // You can change to any 4.x build. Must be 4.1.0 or higher. DHF 5 is not supported.
+    compile 'com.marklogic:marklogic-data-hub:4.1.0' 
     compile 'com.marklogic:marklogic-xcc:9.0.7'
 
     mlcp "com.marklogic:mlcp:9.0.6"