rolling version numbers

paxtonhare · paxtonhare · commit 21a023afc62f · 2016-06-20T15:28:41.000-04:00
fixing compile of trace ui code
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 .metadata/
 .idea/
 marklogic-data-hub/bin/
+marklogic-data-hub/src/main/resources/ml-modules/root/trace-ui
 quick-start/bin/
 build/
 releases/
diff --git a/examples/gradle-advanced/build.gradle b/examples/gradle-advanced/build.gradle
@@ -10,7 +10,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'net.saliman.properties' version '1.4.5'
-    id 'com.marklogic.ml-data-hub' version '1.0.0-beta.5'
+    id 'com.marklogic.ml-data-hub' version '1.0.0-beta.6'
     id 'com.marklogic.ml-gradle' version '2.1.0'
 }
 
diff --git a/examples/gradle-basic/build.gradle b/examples/gradle-basic/build.gradle
@@ -10,7 +10,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'net.saliman.properties' version '1.4.5'
-    id 'com.marklogic.ml-data-hub' version '1.0.0-beta.5'
+    id 'com.marklogic.ml-data-hub' version '1.0.0-beta.6'
     id 'com.marklogic.ml-gradle' version '2.1.0'
 }
 
diff --git a/marklogic-data-hub/build.gradle b/marklogic-data-hub/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'com.jfrog.bintray' version '1.6'
-    id 'com.marklogic.ml-gradle' version '2.2.0-RC1'
+    id 'com.marklogic.ml-gradle' version '2.2.0'
 }
 
 repositories {
@@ -22,8 +22,8 @@ targetCompatibility = 1.8
 dependencies {
     compile 'org.springframework.batch:spring-batch-core:3.0.6.RELEASE'
     compile 'com.marklogic:java-client-api:3.0.4'
-    compile 'com.marklogic:ml-javaclient-util:2.9.0-RC1'
-    compile 'com.marklogic:ml-app-deployer:2.2.0-RC1'
+    compile 'com.marklogic:ml-javaclient-util:2.9.0'
+    compile 'com.marklogic:ml-app-deployer:2.2.0'
     compile 'commons-io:commons-io:2.4'
     testCompile 'org.springframework.batch:spring-batch-test:3.0.6.RELEASE'
     testCompile 'junit:junit:4.12'
@@ -41,6 +41,25 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from sourceSets.main.allSource
 }
 
+task npmInstallTraceUI(type:Exec) {
+    workingDir './src/trace-ui'
+    commandLine 'npm', 'install'
+}
+
+task buildTraceUI(type:Exec) {
+    workingDir './src/trace-ui'
+    commandLine 'npm', 'run', 'build'
+    dependsOn tasks.npmInstallTraceUI
+}
+
+task watchTraceUI(type:Exec) {
+    workingDir './src/trace-ui'
+    commandLine 'npm', 'start'
+    dependsOn tasks.npmInstallTraceUI
+}
+
+build.dependsOn buildTraceUI
+
 javadoc {
    options.overview = 'src/main/resources/overview.html'
 }
diff --git a/marklogic-data-hub/gradle.properties b/marklogic-data-hub/gradle.properties
@@ -28,6 +28,6 @@ mlSchemasDbName=data-hub-SCHEMAS
 
 hubModulesPath=exmaples/hr-hub/plugins
 
-version=1.0.0-beta.5
+version=1.0.0-beta.6
 
 
diff --git a/marklogic-data-hub/src/main/java/com/marklogic/hub/commands/LoadHubModulesCommand.java b/marklogic-data-hub/src/main/java/com/marklogic/hub/commands/LoadHubModulesCommand.java
@@ -1,5 +1,6 @@
 package com.marklogic.hub.commands;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -22,6 +23,7 @@
 import com.marklogic.client.modulesloader.impl.XccAssetLoader;
 import com.marklogic.client.modulesloader.xcc.CommaDelimitedPermissionsParser;
 import com.marklogic.client.modulesloader.xcc.DefaultDocumentFormatGetter;
+import com.marklogic.client.modulesloader.xcc.DocumentFormatGetter;
 import com.marklogic.client.modulesloader.xcc.PermissionsParser;
 import com.marklogic.xcc.Content;
 import com.marklogic.xcc.ContentCreateOptions;
@@ -40,6 +42,7 @@ public class LoadHubModulesCommand extends AbstractCommand {
 
     private DefaultModulesLoader modulesLoader;
     private ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+    private DocumentFormatGetter documentFormatGetter = new DefaultDocumentFormatGetter();
     private PermissionsParser permissionsParser = new CommaDelimitedPermissionsParser();
 
     private String permissions = "rest-admin,read,rest-admin,update,rest-extension-user,execute";
@@ -73,12 +76,7 @@ private List<Resource> findResources(String basePath, String... paths) throws IO
 
     protected void loadFile(String uri, InputStream inputStream, AppConfig config) throws IOException {
         ContentCreateOptions options = new ContentCreateOptions();
-        if (uri.endsWith("xml")) {
-            options.setFormatXml();
-        }
-        else {
-            options.setFormatText();
-        }
+        options.setFormat(documentFormatGetter.getDocumentFormat(new File(uri)));
         options.setPermissions(permissionsParser.parsePermissions(this.permissions));
         if (this.collections != null) {
             options.setCollections(collections);
@@ -107,10 +105,6 @@ protected void loadFile(String uri, InputStream inputStream, AppConfig config) t
     protected void initializeActiveSession(CommandContext context) {
         AppConfig config = context.getAppConfig();
         XccAssetLoader xccAssetLoader = context.getAppConfig().newXccAssetLoader();
-        DefaultDocumentFormatGetter documentFormatGetter = new DefaultDocumentFormatGetter();
-        documentFormatGetter.getBinaryExtensions().add("woff2");
-        documentFormatGetter.getBinaryExtensions().add("otf");
-        xccAssetLoader.setDocumentFormatGetter(documentFormatGetter);
         this.modulesLoader = new DefaultModulesLoader(xccAssetLoader);
         this.modulesLoader.setDatabaseClient(config.newDatabaseClient());
         ContentSource cs = ContentSourceFactory.newContentSource(config.getHost(), port, config.getRestAdminUsername(), config.getRestAdminPassword(), config.getModulesDatabaseName(),
@@ -127,33 +121,39 @@ public void execute(CommandContext context) {
             String rootPath = "/ml-modules/root";
 
             AppConfig appConfig = context.getAppConfig();
-            List<Resource> resources = findResources("classpath*:" + rootPath, "/**/*.x??");
-            for (Resource r : resources) {
-                String path = r.getURL().getPath();
-                if (path.contains("!")) {
-                    String[] splits = path.split("!");
-                    path = splits[splits.length - 1];
-                }
+            ArrayList<String> classpaths = new ArrayList<String>();
+            classpaths.add("/com.marklogic.hub/**/*.x??");
+            classpaths.add("/trace-ui/**/*");
+
+            for (String classpath : classpaths) {
+                List<Resource> resources = findResources("classpath*:" + rootPath, classpath);
+                for (Resource r : resources) {
+                    String path = r.getURL().getPath();
+                    if (path.contains("!")) {
+                        String[] splits = path.split("!");
+                        path = splits[splits.length - 1];
+                    }
 
-                String rootPathAbs = resolver.getResource(rootPath).getURL().getPath();
-                if (rootPathAbs.contains("!")) {
-                    String[] splits = rootPathAbs.split("!");
-                    rootPathAbs = splits[splits.length - 1];
-                }
-                if (path.startsWith(rootPathAbs)) {
-                    path = path.substring(rootPathAbs.length());
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Path without root path: " + path);
+                    String rootPathAbs = resolver.getResource(rootPath).getURL().getPath();
+                    if (rootPathAbs.contains("!")) {
+                        String[] splits = rootPathAbs.split("!");
+                        rootPathAbs = splits[splits.length - 1];
+                    }
+                    if (path.startsWith(rootPathAbs)) {
+                        path = path.substring(rootPathAbs.length());
+                        if (logger.isDebugEnabled()) {
+                            logger.debug("Path without root path: " + path);
+                        }
                     }
-                }
 
-                loadFile(path, r.getInputStream(), appConfig);
+                    loadFile(path, r.getInputStream(), appConfig);
+                }
             }
             activeSession.commit();
 
             logger.info("Loading Service Extensions");
             long startTime = System.nanoTime();
-            resources = findResources("classpath*:/ml-modules/services", "/**/*.xq*");
+            List<Resource> resources = findResources("classpath*:/ml-modules/services", "/**/*.xq*");
             for (Resource r : resources) {
                 ExtensionMetadataAndParams emap = extensionMetadataProvider.provideExtensionMetadataAndParams(r);
                 this.modulesLoader.installService(r, emap.metadata, emap.methods.toArray(new MethodParameters[] {}));
diff --git a/marklogic-data-hub/src/main/resources/scaffolding/build_gradle b/marklogic-data-hub/src/main/resources/scaffolding/build_gradle
@@ -4,7 +4,7 @@ plugins {
     id 'idea'
     id 'net.saliman.properties' version '1.4.5'
     id 'com.marklogic.ml-gradle' version '2.1.0'
-    id 'com.marklogic.ml-data-hub' version '1.0.0-beta.5'
+    id 'com.marklogic.ml-data-hub' version '1.0.0-beta.6'
 }
 
 repositories {
diff --git a/marklogic-data-hub/src/trace-ui/.eslintignore b/marklogic-data-hub/src/trace-ui/.eslintignore
@@ -1 +1,2 @@
-build/
+build/
+src/components/ui-codemirror
diff --git a/marklogic-data-hub/src/trace-ui/package.json b/marklogic-data-hub/src/trace-ui/package.json
@@ -19,7 +19,6 @@
     "angular-messages": "^1.4.1",
     "angular-moment": "^1.0.0-beta.6",
     "angular-touch": "^1.4.0",
-    "angular-ui-codemirror": "^0.3.0",
     "angular-ui-router": "^0.3.0",
     "babel-polyfill": "^6.2.0",
     "codemirror": "^5.15.0",
diff --git a/marklogic-data-hub/src/trace-ui/src/bootstrap.js b/marklogic-data-hub/src/trace-ui/src/bootstrap.js
@@ -8,7 +8,7 @@ window.CodeMirror = CodeMirror;
 import 'codemirror/mode/xml/xml';
 import 'codemirror/mode/javascript/javascript';
 
-import 'angular-ui-codemirror';
+import './components/ui-codemirror/ui-codemirror';
 import 'angular-moment';
 import 'jsonformatter';
 import 'jsonformatter/dist/json-formatter.min.css';
diff --git a/marklogic-data-hub/src/trace-ui/src/components/ui-codemirror/ui-codemirror.js b/marklogic-data-hub/src/trace-ui/src/components/ui-codemirror/ui-codemirror.js
@@ -0,0 +1,149 @@
+'use strict';
+
+/**
+ * Binds a CodeMirror widget to a <textarea> element.
+ */
+angular.module('ui.codemirror', [])
+  .constant('uiCodemirrorConfig', {})
+  .directive('uiCodemirror',  ['$timeout', 'uiCodemirrorConfig', uiCodemirrorDirective]);
+
+/**
+ * @ngInject
+ */
+function uiCodemirrorDirective($timeout, uiCodemirrorConfig) {
+
+  return {
+    restrict: 'EA',
+    require: '?ngModel',
+    compile: function compile() {
+
+      // Require CodeMirror
+      if (angular.isUndefined(window.CodeMirror)) {
+        throw new Error('ui-codemirror needs CodeMirror to work... (o rly?)');
+      }
+
+      return postLink;
+    }
+  };
+
+  function postLink(scope, iElement, iAttrs, ngModel) {
+
+    var codemirrorOptions = angular.extend(
+      { value: iElement.text() },
+      uiCodemirrorConfig.codemirror || {},
+      scope.$eval(iAttrs.uiCodemirror),
+      scope.$eval(iAttrs.uiCodemirrorOpts)
+    );
+
+    var codemirror = newCodemirrorEditor(iElement, codemirrorOptions);
+
+    configOptionsWatcher(
+      codemirror,
+      iAttrs.uiCodemirror || iAttrs.uiCodemirrorOpts,
+      scope
+    );
+
+    configNgModelLink(codemirror, ngModel, scope);
+
+    configUiRefreshAttribute(codemirror, iAttrs.uiRefresh, scope);
+
+    // Allow access to the CodeMirror instance through a broadcasted event
+    // eg: $broadcast('CodeMirror', function(cm){...});
+    scope.$on('CodeMirror', function(event, callback) {
+      if (angular.isFunction(callback)) {
+        callback(codemirror);
+      } else {
+        throw new Error('the CodeMirror event requires a callback function');
+      }
+    });
+
+    // onLoad callback
+    if (angular.isFunction(codemirrorOptions.onLoad)) {
+      codemirrorOptions.onLoad(codemirror);
+    }
+  }
+
+  function newCodemirrorEditor(iElement, codemirrorOptions) {
+    var codemirrot;
+
+    if (iElement[0].tagName === 'TEXTAREA') {
+      // Might bug but still ...
+      codemirrot = window.CodeMirror.fromTextArea(iElement[0], codemirrorOptions);
+    } else {
+      iElement.html('');
+      codemirrot = new window.CodeMirror(function(cm_el) {
+        iElement.append(cm_el);
+      }, codemirrorOptions);
+    }
+
+    return codemirrot;
+  }
+
+  function configOptionsWatcher(codemirrot, uiCodemirrorAttr, scope) {
+    if (!uiCodemirrorAttr) { return; }
+
+    var codemirrorDefaultsKeys = Object.keys(window.CodeMirror.defaults);
+    scope.$watch(uiCodemirrorAttr, updateOptions, true);
+    function updateOptions(newValues, oldValue) {
+      if (!angular.isObject(newValues)) { return; }
+      codemirrorDefaultsKeys.forEach(function(key) {
+        if (newValues.hasOwnProperty(key)) {
+
+          if (oldValue && newValues[key] === oldValue[key]) {
+            return;
+          }
+
+          codemirrot.setOption(key, newValues[key]);
+        }
+      });
+    }
+  }
+
+  function configNgModelLink(codemirror, ngModel, scope) {
+    if (!ngModel) { return; }
+    // CodeMirror expects a string, so make sure it gets one.
+    // This does not change the model.
+    ngModel.$formatters.push(function(value) {
+      if (angular.isUndefined(value) || value === null) {
+        return '';
+      } else if (angular.isObject(value) || angular.isArray(value)) {
+        throw new Error('ui-codemirror cannot use an object or an array as a model');
+      }
+      return value;
+    });
+
+
+    // Override the ngModelController $render method, which is what gets called when the model is updated.
+    // This takes care of the synchronizing the codeMirror element with the underlying model, in the case that it is changed by something else.
+    ngModel.$render = function() {
+      //Code mirror expects a string so make sure it gets one
+      //Although the formatter have already done this, it can be possible that another formatter returns undefined (for example the required directive)
+      var safeViewValue = ngModel.$viewValue || '';
+      codemirror.setValue(safeViewValue);
+    };
+
+
+    // Keep the ngModel in sync with changes from CodeMirror
+    codemirror.on('change', function(instance) {
+      var newValue = instance.getValue();
+      if (newValue !== ngModel.$viewValue) {
+        scope.$evalAsync(function() {
+          ngModel.$setViewValue(newValue);
+        });
+      }
+    });
+  }
+
+  function configUiRefreshAttribute(codeMirror, uiRefreshAttr, scope) {
+    if (!uiRefreshAttr) { return; }
+
+    scope.$watch(uiRefreshAttr, function(newVal, oldVal) {
+      // Skip the initial watch firing
+      if (newVal !== oldVal) {
+        $timeout(function() {
+          codeMirror.refresh();
+        });
+      }
+    });
+  }
+}
diff --git a/ml-data-hub-plugin/gradle.properties b/ml-data-hub-plugin/gradle.properties
@@ -1,2 +1,2 @@
-version=1.0.0-beta.5
+version=1.0.0-beta.6
 group=com.marklogic
diff --git a/quick-start/gradle.properties b/quick-start/gradle.properties
@@ -1 +1 @@
-version=1.0.0-beta.5
+version=1.0.0-beta.6
diff --git a/quick-start/src/main/resources/static/app/directives/headerDirective.js b/quick-start/src/main/resources/static/app/directives/headerDirective.js
@@ -50,12 +50,12 @@
           txt += (scope.tracingEnabled) ? 'Disable' : 'Enable';
           txt += ' Tracing';
           return txt;
-        }
+        };
 
         scope.getTracingUri = function() {
           return 'http://' + scope.status.mlHost + ':' +
             scope.status.mlTracePort + '/';
-        }
+        };
 
         scope.toggleTracing = function() {
           if (scope.tracingEnabled) {
@@ -68,7 +68,7 @@
               scope.tracingEnabled = true;
             });
           }
-        }
+        };
 
         tracingService.isEnabled().then(function(resp) {
           scope.tracingEnabled = resp.data.enabled;

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ plugins {`
`10`	`10`	`id 'eclipse'`
`11`	`11`	`id 'idea'`
`12`	`12`	`id 'net.saliman.properties' version '1.4.5'`
`13`		`- id 'com.marklogic.ml-data-hub' version '1.0.0-beta.5'`
	`13`	`+ id 'com.marklogic.ml-data-hub' version '1.0.0-beta.6'`
`14`	`14`	`id 'com.marklogic.ml-gradle' version '2.1.0'`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ mlSchemasDbName=data-hub-SCHEMAS`
`28`	`28`
`29`	`29`	`hubModulesPath=exmaples/hr-hub/plugins`
`30`	`30`
`31`		`-version=1.0.0-beta.5`
	`31`	`+version=1.0.0-beta.6`
`32`	`32`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`id 'idea'`
`5`	`5`	`id 'net.saliman.properties' version '1.4.5'`
`6`	`6`	`id 'com.marklogic.ml-gradle' version '2.1.0'`
`7`		`- id 'com.marklogic.ml-data-hub' version '1.0.0-beta.5'`
	`7`	`+ id 'com.marklogic.ml-data-hub' version '1.0.0-beta.6'`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-build/`
	`1`	`+build/`
	`2`	`+src/components/ui-codemirror`