Merge branch 'release/1.0.5' into production

LICENSE

@@ -1,7 +1,7 @@
 Copyright (c) 2013-2014 StrongLoop, Inc.
 
-loopback-storage-service uses a 'dual license' model. Users may use
-loopback-storage-service under the terms of the Artistic 2.0 license, or under
+loopback-component-storage uses a 'dual license' model. Users may use
+loopback-component-storage under the terms of the Artistic 2.0 license, or under
 the StrongLoop License. The text of both is included below.
 
 Artistic License 2.0

README.md

@@ -1,6 +1,8 @@
-# loopback-storage-service
+# LoopBack Storage Component
 
-LoopBack storage service provides Node.js and REST APIs to manage binary contents
+**NOTE: The loopback-component-storage module supersedes [loopback-storage-service](https://www.npmjs.org/package/loopback-storage-service). Please update your package.json accordingly.**
+
+LoopBack storage component provides Node.js and REST APIs to manage binary contents
 using pluggable storage providers, such as local file systems, Amazon S3, or
 Rackspace cloud files. We use [pkgcloud](https://github.com/pkgcloud/pkgcloud) to support the cloud based
 storage services including:
@@ -13,13 +15,13 @@ storage services including:
 The binary artifacts are organized with containers and files. A container is the
 collection of files. Each file will belong to a container.
 
-## Define a model with the loopback-storage-service connector
+## Define a model with the loopback-component-storage connector
 
 LoopBack exposes the APIs using a model that is attached to a data source configured
-with the loopback-storage-service connector.
+with the loopback-component-storage connector.
 
     var ds = loopback.createDataSource({
-        connector: require('loopback-storage-service'),
+        connector: require('loopback-component-storage'),
         provider: 'filesystem',
         root: path.join(__dirname, 'storage')
     });

example/public/index.html

@@ -45,7 +45,7 @@
     <div class="navbar navbar-default">
         <div class="navbar-header">
             <a class="navbar-brand"
-               href="https://github.com/strongloop/loopback-storage-service">LoopBack
+               href="https://github.com/strongloop/loopback-component-storage">LoopBack
                 Storage Service</a>
         </div>
     </div>

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "loopback-storage-service",
+  "name": "loopback-component-storage",
   "description": "Loopback Storage Service",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "index.js",
   "scripts": {
     "test": "./node_modules/.bin/mocha --timeout 30000 test/*test.js"
@@ -20,7 +20,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/strongloop/loopback-storage-service.git"
+    "url": "https://github.com/strongloop/loopback-component-storage.git"
   },
   "license": {
     "name": "Dual Artistic-2.0/StrongLoop",