prepping 2.0.0-alpha.1

Author: paxtonhare

CHANGELOG.md

@@ -1,7 +1,28 @@
 # Change Log
 
-## [v1.0.1](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.1)
+## [v2.0.1-alpha.1](https://github.com/marklogic/marklogic-data-hub/tree/v2.0.1-alpha.1)
 
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.2...v2.0.1-alpha.1)
+
+**Implemented enhancements:**
+
+- Visual entity type model editor [\#286](https://github.com/marklogic/marklogic-data-hub/issues/286)
+
+## [v1.0.2](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.2) (2016-11-22)
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.1...v1.0.2)
+
+**Fixed bugs:**
+
+- mlcp load from QuickStart GUI not loading data [\#331](https://github.com/marklogic/marklogic-data-hub/issues/331)
+
+**Closed issues:**
+
+- Possible typo on wiki page [\#333](https://github.com/marklogic/marklogic-data-hub/issues/333)
+- Tutorial instruction - create entity "Employees" instead of "Employee" [\#330](https://github.com/marklogic/marklogic-data-hub/issues/330)
+- mlcp job is not getting run + console log button not showing [\#329](https://github.com/marklogic/marklogic-data-hub/issues/329)
+- Error Extension hubstats does not exist. [\#328](https://github.com/marklogic/marklogic-data-hub/issues/328)
+
+## [v1.0.1](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.1) (2016-11-08)
 [Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.0...v1.0.1)
 
 **Fixed bugs:**

README.md

@@ -2,15 +2,19 @@
 
 OS | Status
 --- | --- | ---
-Linux/Mac | [![Build Status](https://travis-ci.org/marklogic/marklogic-data-hub.svg?branch=master)](https://travis-ci.org/marklogic/marklogic-data-hub)
+Linux/Mac | [![Build Status](https://travis-ci.org/marklogic/marklogic-data-hub.svg?branch=2.0-develop)](https://travis-ci.org/marklogic/marklogic-data-hub)
 Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv?svg=true)](https://ci.appveyor.com/project/paxtonhare/marklogic-data-hub)
 
 # MarkLogic Data Hub
 
+## WARNING!!!! This is the the 2.0 branch of The MarkLogic Data Hub Framework. The 2.0 version is only compatible with MarkLogic 9.0 which is currently in Early Access and not generally available.
+
 Go from nothing to Enterprise Data Hub in a matter of minutes.  
 
 This project allows you to deploy a skeleton Data Hub into MarkLogic. With some basic configuration you will be running an Enterprise Data Hub in no time.
 
+
+
 # Getting Started
 
 ###TL;DR
@@ -36,7 +40,7 @@ Alternatively you can include the jar file as a build dependency in your Java pr
 **Gradle**
 
 ```groovy
-compile('com.marklogic:marklogic-data-hub:1.0.1')
+compile('com.marklogic:marklogic-data-hub:2.0.0-alpha.1')
 ```
 
 **Maven**
@@ -45,15 +49,15 @@ compile('com.marklogic:marklogic-data-hub:1.0.1')
 <dependency>
   <groupId>com.marklogic</groupId>
   <artifactId>marklogic-data-hub</artifactId>
-  <version>1.0.1</version>
+  <version>2.0.0-alpha.1</version>
   <type>pom</type>
 </dependency>
 ```
 
 **Ivy**
 
 ```xml
-<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.0.1'>
+<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-alpha.1'>
   <artifact name='$AID' ext='pom'></artifact>
 </dependency>
 ```
@@ -64,7 +68,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 '1.0.1'
+    id 'com.marklogic.ml-data-hub' version '2.0.0-alpha.1'
 }
 ```
 

examples/spring-batch/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'idea'
     id 'application'
     id 'net.saliman.properties' version '1.4.6'
-    id 'com.marklogic.ml-data-hub' version '1.0.1'
+    id 'com.marklogic.ml-data-hub' version '2.0.0-alpha.1'
 }
 
 repositories {
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:1.0.1'
+    compile 'com.marklogic:marklogic-data-hub:2.0.0-alpha.1'
     compile 'com.marklogic:marklogic-spring-batch-core:0.6.0'
     compile 'com.marklogic:ml-javaclient-util:2.9.1'
     testCompile 'com.marklogic:marklogic-spring-batch-test:0.6.0'

marklogic-data-hub/gradle.properties

@@ -36,6 +36,6 @@ hubProjectDir=examples/hr-hub
 mlReplaceTokensInModules=true
 mlUseRoxyTokenPrefix=false
 
-version=1.0.1
+version=2.0.0-alpha.1
 
 

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

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'net.saliman.properties' version '1.4.6'
-    id 'com.marklogic.ml-data-hub' version '1.0.1'
+    id 'com.marklogic.ml-data-hub' version '2.0.0-alpha.1'
 }
 
 repositories {
@@ -12,6 +12,6 @@ repositories {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:1.0.1'
+    compile 'com.marklogic:marklogic-data-hub:2.0.0-alpha.1'
     compile 'com.marklogic:marklogic-xcc:8.0.5'
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "data-hub-quickstart",
-  "version": "1.0.1",
+  "version": "2.0.0-alpha.1",
   "license": "APACHE",
   "homepage": "https://github.com/marklogic/marklogic-data-hub",
   "scripts": {

ml-data-hub-plugin/gradle.properties

@@ -1,2 +1,2 @@
-version=1.0.1
+version=2.0.0-alpha.1
 group=com.marklogic

quick-start/gradle.properties

@@ -1 +1 @@
-version=1.0.1
+version=2.0.0-alpha.1

quick-start/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-hub-quickstart",
-  "version": "1.0.1",
+  "version": "2.0.0-alpha.1",
   "license": "APACHE",
   "homepage": "https://github.com/marklogic/marklogic-data-hub",
   "angular-cli": {},

quick-start/src/main/ui/app/entity-modeler/entity-modeler.component.html

@@ -1,5 +1,5 @@
 <div class="tools-container">
-  <button class="tools-toggler" mdl-button mdl-button-type="mini-fab" mdl-colored="primary" mdl-ripple (click)="toolsVisible = !toolsVisible">
+  <button class="tools-toggler" [ngClass]="{'none' : (!entities || entities.length === 0)}" mdl-button mdl-button-type="mini-fab" mdl-colored="primary" mdl-ripple (click)="toolsVisible = !toolsVisible">
     <i class="fa fa-wrench"></i>
   </button>
   <div class="tools" *ngIf="toolsVisible">
@@ -13,6 +13,9 @@
   </div>
 </div>
 <div class="entities">
+  <div class="none" *ngIf="!entities || entities.length === 0">
+    You don't have any entities yet. Click the Wrench Icon to get started.
+  </div>
   <svg #svgRoot *ngIf="entities">
     <g class="nodes" [attr.transform]="mainTransform">
       <g #entityDef *ngFor="let entity of entities"