diff --git a/index.js b/index.js index e5802780..8594093e 100644 --- a/index.js +++ b/index.js @@ -15,4 +15,4 @@ loopback.Memory = require('./lib/connectors/memory'); * Types */ -loopback.GeoPoint = require('jugglingdb/lib/geo').GeoPoint; \ No newline at end of file +loopback.GeoPoint = require('loopback-data/lib/geo').GeoPoint; \ No newline at end of file diff --git a/lib/application.js b/lib/application.js index 390bc68d..4f8fa7f9 100644 --- a/lib/application.js +++ b/lib/application.js @@ -2,8 +2,8 @@ * Module dependencies. */ -var DataSource = require('jugglingdb').DataSource - , ModelBuilder = require('jugglingdb').ModelBuilder +var DataSource = require('loopback-data').DataSource + , ModelBuilder = require('loopback-data').ModelBuilder , assert = require('assert') , RemoteObjects = require('sl-remoting'); diff --git a/lib/connectors/memory.js b/lib/connectors/memory.js index ce027f27..3bfa4a75 100644 --- a/lib/connectors/memory.js +++ b/lib/connectors/memory.js @@ -13,7 +13,7 @@ var Connector = require('./base-connector') , util = require('util') , inherits = util.inherits , assert = require('assert') - , JdbMemory = require('jugglingdb/lib/adapters/memory'); + , JdbMemory = require('loopback-data/lib/adapters/memory'); /** * Create a new `Memory` connector with the given `options`. diff --git a/lib/loopback.js b/lib/loopback.js index c97a73d2..b0f0164b 100644 --- a/lib/loopback.js +++ b/lib/loopback.js @@ -8,8 +8,8 @@ var express = require('express') , path = require('path') , proto = require('./application') , utils = require('express/node_modules/connect').utils - , DataSource = require('jugglingdb').DataSource - , ModelBuilder = require('jugglingdb').ModelBuilder + , DataSource = require('loopback-data').DataSource + , ModelBuilder = require('loopback-data').ModelBuilder , assert = require('assert') , i8n = require('inflection'); diff --git a/lib/models/acl.js b/lib/models/acl.js index 9fe28310..7c70af43 100644 --- a/lib/models/acl.js +++ b/lib/models/acl.js @@ -45,7 +45,7 @@ var ACLSchema = { // readAccess, writeAccess --> public, userId, role module.exports = function(dataSource) { - dataSource = dataSource || new require('jugglingdb').ModelBuilder(); + dataSource = dataSource || new require('loopback-data').ModelBuilder(); var ACL = dataSource.define('ACL', ACLSchema); return ACL; } \ No newline at end of file diff --git a/lib/models/application.js b/lib/models/application.js index 4907a3b9..e66e29da 100644 --- a/lib/models/application.js +++ b/lib/models/application.js @@ -89,7 +89,7 @@ function generateKey(hmacKey, algorithm) { } module.exports = function (dataSource) { - dataSource = dataSource || new require('jugglingdb').ModelBuilder(); + dataSource = dataSource || new require('loopback-data').ModelBuilder(); // var AuthenticationScheme = dataSource.define('AuthenticationScheme', AuthenticationSchemeSchema); // ApplicationSchema.authenticationSchemes = [AuthenticationScheme]; diff --git a/lib/models/installation.js b/lib/models/installation.js index 28d8ee8d..d54b3246 100644 --- a/lib/models/installation.js +++ b/lib/models/installation.js @@ -20,7 +20,7 @@ var InstallationSchema = { }; module.exports = function(dataSource) { - dataSource = dataSource || new require('jugglingdb').ModelBuilder(); + dataSource = dataSource || new require('loopback-data').ModelBuilder(); var Installation = dataSource.define('Installation', InstallationSchema); return Installation; } diff --git a/lib/models/role.js b/lib/models/role.js index 5259d8b3..810897e2 100644 --- a/lib/models/role.js +++ b/lib/models/role.js @@ -12,7 +12,7 @@ var RoleSchema = { } module.exports = function(dataSource) { - dataSource = dataSource || new require('jugglingdb').ModelBuilder(); + dataSource = dataSource || new require('loopback-data').ModelBuilder(); var Role = dataSource.define('Role', RoleSchema); return Role; } \ No newline at end of file diff --git a/package.json b/package.json index 3b8a071a..19add248 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "dependencies": { "debug": "latest", "express": "~3.1.1", - "jugglingdb": "git+ssh://git@github.com:strongloop/jugglingdb.git", + "loopback-data": "git+ssh://git@github.com:strongloop/loopback-data.git", "sl-remoting": "git+ssh://git@github.com:strongloop/sl-remoting.git", "inflection": "~1.2.5" },