Merge remote-tracking branch 'upstream/1.0' into 1.1

Author: pontusmelke

.gitignore

@@ -9,5 +9,4 @@ build
 node_modules
 .idea
 docs/build
-/lib
 .npmrc

.npmignore

@@ -1,2 +1,11 @@
+docs/
 src/
 build/
+test/
+lib/browser/neo4j-web.test.js
+bower.json
+.gitignore
+esdoc.json
+gulpfile.js
+runTests.sh
+runTests.ps1

README.md

@@ -9,6 +9,8 @@ Find detailed docs at [alpha.neohq.net](http://alpha.neohq.net/docs/javascript-d
 
 ```shell
 npm install neo4j-driver
+// or
+bower install neo4j-driver
 ```
 
 ```javascript

bower.json

@@ -0,0 +1,37 @@
+{
+  "name": "neo4j-driver",
+  "description": "Connect to Neo4j 3.0.0 and up from JavaScript",
+  "main": "lib/browser/neo4j-web.min.js",
+  "authors": [{
+    "name": "Neo Technology Inc."
+  }],
+  "license": "Apache-2.0",
+  "keywords": [
+    "neo4j"
+  ],
+  "moduleType": [
+    "amd",
+    "es6",
+    "globals",
+    "node"
+  ],
+  "ignore": [
+    "docs",
+    "src",
+    "test",
+    "build",
+    "node_modules",
+    "lib/browser/neo4j-web.test.js",
+    "package.json",
+    ".gitignore",
+    ".npmignore",
+    "esdoc.json",
+    "gulpfile.js",
+    "runTests.sh",
+    "runTests.ps1"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/neo4j/neo4j-javascript-driver.git"
+  }
+}

gulpfile.js

@@ -43,6 +43,7 @@ var path = require('path');
 var childProcess = require("child_process");
 var minimist = require('minimist');
 var cucumber = require('gulp-cucumber');
+var merge = require('merge-stream');
 
 gulp.task('default', ["test"]);
 
@@ -184,8 +185,20 @@ gulp.task('download-neo4j', function() {
 });
 
 gulp.task('set-password', ['download-neo4j'], function() {
-  return gulp.src('test/resources/auth')
-    .pipe(gulp.dest(neo4jHome + "/data/dbms/"));
+  var setPassword = gulp.src('test/resources/auth')
+  .pipe(gulp.dest(neo4jHome + "/data/dbms/"));
+
+  if(isWin)
+  {
+    var setServerName = gulp.src('test/resources/neo4j-wrapper.conf')
+    .pipe(gulp.dest(neo4jHome + "/conf/"));
+
+    return merge(setPassword, setServerName);
+  }
+  else
+  {
+    return setPassword;
+  }
 });
 
 var featureFiles   = 'https://s3-eu-west-1.amazonaws.com/remoting.neotechnology.com/driver-compliance/tck.tar.gz';
@@ -207,8 +220,7 @@ gulp.task('run-tck', ['download-tck', 'nodejs'], function() {
 
 var runPowershell = function( cmd ) {
     var spawn = childProcess.spawn, child;
-    child = spawn("powershell.exe",[
-        'Import-Module ' + neo4jHome + '/bin/Neo4j-Management.psd1;' + cmd]);
+    child = spawn("powershell.exe",[cmd]);
     child.stdout.on("data",function(data){
         console.log("Powershell Data: " + data);
     });
@@ -235,8 +247,7 @@ gulp.task('set', function() {
 
 gulp.task('start-neo4j', ['set-password'], function() {
   if(isWin) {
-    runPowershell('Install-Neo4jServer -Neo4jServer ' + neo4jHome + ' -Name neo4j-js;' +
-                  'Start-Neo4jServer -Neo4jServer ' + neo4jHome + ' -ServiceName neo4j-js');
+    return runPowershell(neo4jHome + '/bin/neo4j.bat install-service;' + neo4jHome + '/bin/neo4j.bat start');
   }
   else {
     return gulp.src('').pipe(shell([
@@ -248,8 +259,7 @@ gulp.task('start-neo4j', ['set-password'], function() {
 
 gulp.task('stop-neo4j', function() {
   if(isWin) {
-    runPowershell('Stop-Neo4jServer -Neo4jServer ' + neo4jHome + ' -ServiceName neo4j-js;' +
-                  'Uninstall-Neo4jServer -Neo4jServer ' + neo4jHome + ' -ServiceName neo4j-js');
+    return runPowershell(neo4jHome + '/bin/neo4j.bat stop;' + neo4jHome + '/bin/neo4j.bat uninstall-service');
   } else {
     return gulp.src('').pipe(shell([
       neo4jHome + '/bin/neo4j stop',

package.json

@@ -23,7 +23,7 @@
     "esdoc": "^0.4.0",
     "esdoc-importpath-plugin": "0.0.1",
     "glob": "^5.0.14",
-    "gulp": "^3.9.0",
+    "gulp": "^3.9.1",
     "gulp-babel": "^5.2.1",
     "gulp-batch": "^1.0.5",
     "gulp-concat": "^2.6.0",
@@ -39,6 +39,7 @@
     "gulp-util": "^3.0.6",
     "gulp-watch": "^4.3.5",
     "jasmine-reporters": "^2.0.7",
+    "merge-stream": "^1.0.0",
     "minimist": "^1.2.0",
     "phantomjs2-ext": "^0.1.0",
     "run-sequence": "^1.1.4",

test/resources/neo4j-wrapper.conf

@@ -0,0 +1,74 @@
+#********************************************************************
+# JVM Parameters
+#********************************************************************
+
+# Java Heap Size: by default the Java heap size is dynamically
+# calculated based on available system resources.
+# Uncomment these lines to set specific initial and maximum
+# heap size in MB.
+#dbms.memory.heap.initial_size=512
+#dbms.memory.heap.max_size=512
+
+# G1GC generally strikes a good balance between throughput and tail
+# latency, without too much tuning.
+dbms.jvm.additional=-XX:+UseG1GC
+
+# Have common exceptions keep producing stack traces, so they can be
+# debugged regardless of how often logs are rotated.
+dbms.jvm.additional=-XX:-OmitStackTraceInFastThrow
+
+# Reduce probability of objects getting the same identity hash code
+# via a race, by computing them with thread-local PRNGs.
+dbms.jvm.additional=-XX:hashCode=5
+
+# Make sure that `initmemory` is not only allocated, but committed to
+# the process, before starting the database. This reduces memory
+# fragmentation, increasing the effectiveness of transparent huge
+# pages. It also reduces the possibility of seeing performance drop
+# due to heap-growing GC events, where a decrease in available page
+# cache leads to an increase in mean IO response time.
+# Try reducing the heap memory, if this flag degrades performance.
+dbms.jvm.additional=-XX:+AlwaysPreTouch
+
+# Trust that non-static final fields are really final.
+# This allows more optimisations and improves overall performance.
+# NOTE: Disable this if you use embedded mode, or have extensions or depencies that may use reflection or serialization
+# to change the value of final fields!
+dbms.jvm.additional=-XX:+UnlockExperimentalVMOptions
+dbms.jvm.additional=-XX:+TrustFinalNonStaticFields
+
+# Disable explicit garbage collection, which is occasionally invoked by the JDK itself.
+dbms.jvm.additional=-XX:+DisableExplicitGC
+
+# Remote JMX monitoring, uncomment and adjust the following lines as needed.
+# Also make sure to update the jmx.access and jmx.password files with appropriate permission roles and passwords,
+# the shipped configuration contains only a read only role called 'monitor' with password 'Neo4j'.
+# For more details, see: http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html
+# On Unix based systems the jmx.password file needs to be owned by the user that will run the server,
+# and have permissions set to 0600.
+# For details on setting these file permissions on Windows see:
+#     http://docs.oracle.com/javase/7/docs/technotes/guides/management/security-windows.html
+#dbms.jvm.additional=-Dcom.sun.management.jmxremote.port=3637
+#dbms.jvm.additional=-Dcom.sun.management.jmxremote.authenticate=true
+#dbms.jvm.additional=-Dcom.sun.management.jmxremote.ssl=false
+#dbms.jvm.additional=-Dcom.sun.management.jmxremote.password.file=conf/jmx.password
+#dbms.jvm.additional=-Dcom.sun.management.jmxremote.access.file=conf/jmx.access
+
+# Some systems cannot discover host name automatically, and need this line configured:
+#dbms.jvm.additional=-Djava.rmi.server.hostname=$THE_NEO4J_SERVER_HOSTNAME
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+#  using this configuration file has been installed as a service.
+#  Please uninstall the service before modifying this section.  The
+#  service can then be reinstalled.
+
+# Name of the service
+dbms.windows_service_name=js-driver-test-neo4j-server
+
+#********************************************************************
+# Other Neo4j system properties
+#********************************************************************
+dbms.jvm.additional=-Dunsupported.dbms.udc.source=zip

test/v1/tck/steps/util.js

@@ -362,7 +362,7 @@ function restart(callback) {
 
 function startDatabase() {
   if(isWin) {
-    runPowerShell('Start-Neo4jServer -Neo4jServer ' + neo4jHome + ' -ServiceName neo4j-js');
+    return runPowershell(neo4jHome + '/bin/neo4j.bat install-service;' + neo4jHome + '/bin/neo4j.bat start');
   } else {
     childProcess.execSync(neo4jHome + '/bin/neo4j start', function (err, stdout, stderr) {
       if (err) throw err;
@@ -372,26 +372,25 @@ function startDatabase() {
 
 function stopDatabase() {
   if(isWin) {
-    runPowerShell('Stop-Neo4jServer -Neo4jServer ' + neo4jHome + ' -ServiceName neo4j-js;');
+    runPowershell(neo4jHome + '/bin/neo4j.bat stop;' + neo4jHome + '/bin/neo4j.bat uninstall-service');
   } else {
     childProcess.execSync(neo4jHome + '/bin/neo4j stop', function (err, stdout, stderr) {
       if (err) throw err;
     });
   }
 }
 
-function runPowerShell( cmd ) {
-  var spawn = childProcess.spawn, child;
-  child = spawn("powershell.exe",[
-    'Import-Module ' + neo4jHome + '/bin/Neo4j-Management.psd1;' + cmd]);
-  child.stdout.on("data",function(data){
-    console.log("Powershell Data: " + data);
-  });
-  child.stderr.on("data",function(data){
-    console.log("Powershell Errors: " + data);
-  });
-  child.on("exit",function(){
-    console.log("Powershell Script finished");
-  });
-  child.stdin.end(); //end input
-}
+var runPowershell = function( cmd ) {
+    var spawn = childProcess.spawn, child;
+    child = spawn("powershell.exe",[cmd]);
+    child.stdout.on("data",function(data){
+        console.log("Powershell Data: " + data);
+    });
+    child.stderr.on("data",function(data){
+        console.error("Powershell Errors: " + data);
+    });
+    child.on("exit",function(){
+        console.log("Powershell Script finished");
+    });
+    child.stdin.end(); //end input
+};