prepping for 2.0.0-rc.1

Author: paxtonhare

CONTRIBUTING.md

@@ -71,7 +71,7 @@ plugins {
    ...
 
    // comment out this line. It pulls the version from the cloud
-   // id 'com.marklogic.ml-data-hub' version '2.0.0-beta.1'
+   // id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
 }
 
 // this tells gradle to apply the plugin you included above in the buildscript section

README.md

@@ -51,7 +51,7 @@ Alternatively you can include the jar file as a build dependency in your Java pr
 **Gradle**
 
 ```groovy
-compile('com.marklogic:marklogic-data-hub:2.0.0-beta.1')
+compile('com.marklogic:marklogic-data-hub:2.0.0-rc.1')
 ```
 
 **Maven**
@@ -60,15 +60,15 @@ compile('com.marklogic:marklogic-data-hub:2.0.0-beta.1')
 <dependency>
   <groupId>com.marklogic</groupId>
   <artifactId>marklogic-data-hub</artifactId>
-  <version>2.0.0-beta.1</version>
+  <version>2.0.0-rc.1</version>
   <type>pom</type>
 </dependency>
 ```
 
 **Ivy**
 
 ```xml
-<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-beta.1'>
+<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-rc.1'>
   <artifact name='$AID' ext='pom'></artifact>
 </dependency>
 ```
@@ -79,7 +79,7 @@ If you prefer to use gradle for all of your hub interactions then you can includ
 
 ```groovy
 plugins {
-    id 'com.marklogic.ml-data-hub' version '2.0.0-beta.1'
+    id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
 }
 ```
 

examples/spring-batch/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'application'
     id 'net.saliman.properties' version '1.4.6'
-    id 'com.marklogic.ml-data-hub' version '2.0.0-beta.1'
+    id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
 }
 
 repositories {
@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:2.0.0-beta.1'
+    compile 'com.marklogic:marklogic-data-hub:2.0.0-rc.1'
     compile "com.marklogic:marklogic-spring-batch-core:0.7.4"
     compile 'com.marklogic:ml-javaclient-util:4.0.alpha4'
 

gradle.properties

@@ -1 +1 @@
-version=2.0.0-beta.1
+version=2.0.0-rc.1

marklogic-data-hub/src/main/resources/scaffolding/build_gradle

@@ -1,35 +1,35 @@
-buildscript {
-  repositories {
-    maven {url 'http://developer.marklogic.com/maven2/'}
-  }
-}
-
-plugins {
-    id 'java'
-    id 'eclipse'
-    id 'idea'
-
-    // This plugin allows you to create different environments
-    // for your gradle deploy. Each environment is represented
-    // by a gradle-${env}.properties file
-    // See https://github.com/stevesaliman/gradle-properties-plugin
-    // specify the env on the command line with:
-    // gradle -PenvironmentName=x ...
-    id 'net.saliman.properties' version '1.4.6'
-
-    // 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 '2.0.0-beta.1'
-}
-
-repositories {
-    jcenter()
-    maven {url 'http://developer.marklogic.com/maven2/'}
-}
-
-dependencies {
-    // this allows you to write custom java code that depends
-    // on the Data Hub Framework library
-    compile 'com.marklogic:marklogic-data-hub:2.0.0-beta.1'
-    compile 'com.marklogic:marklogic-xcc:9.0.1'
-}
+buildscript {
+  repositories {
+    maven {url 'http://developer.marklogic.com/maven2/'}
+  }
+}
+
+plugins {
+    id 'java'
+    id 'eclipse'
+    id 'idea'
+
+    // This plugin allows you to create different environments
+    // for your gradle deploy. Each environment is represented
+    // by a gradle-${env}.properties file
+    // See https://github.com/stevesaliman/gradle-properties-plugin
+    // specify the env on the command line with:
+    // gradle -PenvironmentName=x ...
+    id 'net.saliman.properties' version '1.4.6'
+
+    // 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 '2.0.0-rc.1'
+}
+
+repositories {
+    jcenter()
+    maven {url 'http://developer.marklogic.com/maven2/'}
+}
+
+dependencies {
+    // this allows you to write custom java code that depends
+    // on the Data Hub Framework library
+    compile 'com.marklogic:marklogic-data-hub:2.0.0-rc.1'
+    compile 'com.marklogic:marklogic-xcc:9.0.1'
+}

marklogic-data-hub/src/trace-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trace-ui",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-rc.1",
   "license": "APACHE",
   "homepage": "https://github.com/marklogic-community/marklogic-data-hub",
   "scripts": {
@@ -15,6 +15,9 @@
   },
   "private": true,
   "dependencies": {
+    "@angular-mdl/core": "^4.0.1",
+    "@angular-mdl/popover": "^0.6.3",
+    "@angular-mdl/select": "^0.10.4",
     "@angular/common": "^4.0.0",
     "@angular/compiler": "^4.0.0",
     "@angular/core": "^4.0.0",
@@ -23,12 +26,10 @@
     "@angular/platform-browser": "^4.0.0",
     "@angular/platform-browser-dynamic": "^4.0.0",
     "@angular/router": "^4.0.0",
-    "@angular-mdl/core": "^4.0.1",
-    "@angular-mdl/popover": "^0.6.3",
-    "@angular-mdl/select": "^0.10.4",
     "angular2-moment": "^1.3.3",
+    "classlist.js": "^1.1.20150312",
     "clipboard": "^1.6.1",
-    "codemirror": "^5.25.0",
+    "codemirror": "^5.26.0",
     "core-js": "^2.4.1",
     "font-awesome": "^4.7.0",
     "lodash": "^4.17.4",
@@ -39,25 +40,26 @@
     "semver": "^5.3.0",
     "sockjs-client": "^1.1.2",
     "stompjs": "^2.3.3",
+    "web-animations-js": "^2.3.1",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@types/codemirror": "0.0.38",
     "@angular/cli": "1.0.0",
     "@angular/compiler-cli": "^4.0.0",
     "@types/jasmine": "2.5.38",
     "@types/lodash": "^4.14.58",
     "@types/node": "~6.0.60",
     "@types/semver": "^5.3.31",
     "codelyzer": "~2.0.0",
+    "enhanced-resolve": "^3.3.0",
     "jasmine-core": "~2.5.2",
     "jasmine-spec-reporter": "~3.2.0",
     "karma": "~1.4.1",
     "karma-chrome-launcher": "~2.0.0",
     "karma-cli": "~1.0.1",
+    "karma-coverage-istanbul-reporter": "^0.2.0",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-coverage-istanbul-reporter": "^0.2.0",
     "npm": "4.1.2",
     "protractor": "~5.1.0",
     "rimraf": "^2.5.4",

marklogic-data-hub/src/trace-ui/src/app/object-to-array.pipe.ts

@@ -8,13 +8,21 @@ export class ObjectToArrayPipe implements PipeTransform {
   transform(obj: any): Array<any> {
     let array = [];
     for (let key of Object.keys(obj)) {
-      let newObj = Object.assign(
-        {
-          __key: key
-        },
-        obj[key]
-      );
-      array.push(newObj);
+      let val = obj[key];
+      if (val instanceof Object && !(val instanceof String)) {
+        let newObj = Object.assign(
+          {
+            __key: key
+          },
+          val
+        );
+        array.push(newObj);
+      } else {
+        array.push({
+          __key: key,
+          value: val
+        });
+      }
     }
     return array;
   }

marklogic-data-hub/src/trace-ui/src/polyfills.ts

@@ -19,25 +19,25 @@
  */
 
 /** IE9, IE10 and IE11 requires all of the following polyfills. **/
-// import 'core-js/es6/symbol';
-// import 'core-js/es6/object';
-// import 'core-js/es6/function';
-// import 'core-js/es6/parse-int';
-// import 'core-js/es6/parse-float';
-// import 'core-js/es6/number';
-// import 'core-js/es6/math';
-// import 'core-js/es6/string';
-// import 'core-js/es6/date';
-// import 'core-js/es6/array';
-// import 'core-js/es6/regexp';
-// import 'core-js/es6/map';
-// import 'core-js/es6/set';
+import 'core-js/es6/symbol';
+import 'core-js/es6/object';
+import 'core-js/es6/function';
+import 'core-js/es6/parse-int';
+import 'core-js/es6/parse-float';
+import 'core-js/es6/number';
+import 'core-js/es6/math';
+import 'core-js/es6/string';
+import 'core-js/es6/date';
+import 'core-js/es6/array';
+import 'core-js/es6/regexp';
+import 'core-js/es6/map';
+import 'core-js/es6/set';
 
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
+import 'classlist.js';  // Run `npm install --save classlist.js`.
 
 /** IE10 and IE11 requires the following to support `@angular/animation`. */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
 
 /** Evergreen browsers require these. **/
@@ -46,7 +46,7 @@ import 'core-js/es7/reflect';
 
 
 /** ALL Firefox browsers require the following to support `@angular/animation`. **/
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
 
 

marklogic-data-hub/src/trace-ui/src/tsconfig.app.json

@@ -4,7 +4,7 @@
     "outDir": "../out-tsc/app",
     "module": "es2015",
     "baseUrl": "",
-    "types": []
+    "types": ["app/codemirror/codemirror.types"]
   },
   "exclude": [
     "test.ts",

quick-start/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-hub-quickstart",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-rc.1",
   "license": "APACHE",
   "homepage": "https://github.com/marklogic-community/marklogic-data-hub",
   "scripts": {
@@ -50,14 +50,15 @@
     "@types/node": "~6.0.60",
     "@types/semver": "^5.3.31",
     "codelyzer": "~2.0.0",
+    "enhanced-resolve": "^3.3.0",
     "jasmine-core": "~2.5.2",
     "jasmine-spec-reporter": "~3.2.0",
     "karma": "~1.4.1",
     "karma-chrome-launcher": "~2.0.0",
     "karma-cli": "~1.0.1",
+    "karma-coverage-istanbul-reporter": "^0.2.0",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-coverage-istanbul-reporter": "^0.2.0",
     "npm": "4.1.2",
     "protractor": "~5.1.0",
     "rimraf": "^2.5.4",