Merge branch 'release/1.0.5' into production

This commit is contained in:
Raymond Feng 2014-07-01 10:55:50 -07:00
commit 832ee0a2ae
4 changed files with 13 additions and 11 deletions

View File

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

View File

@ -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 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 Rackspace cloud files. We use [pkgcloud](https://github.com/pkgcloud/pkgcloud) to support the cloud based
storage services including: storage services including:
@ -13,13 +15,13 @@ storage services including:
The binary artifacts are organized with containers and files. A container is the The binary artifacts are organized with containers and files. A container is the
collection of files. Each file will belong to a container. 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 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({ var ds = loopback.createDataSource({
connector: require('loopback-storage-service'), connector: require('loopback-component-storage'),
provider: 'filesystem', provider: 'filesystem',
root: path.join(__dirname, 'storage') root: path.join(__dirname, 'storage')
}); });

View File

@ -45,7 +45,7 @@
<div class="navbar navbar-default"> <div class="navbar navbar-default">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" <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> Storage Service</a>
</div> </div>
</div> </div>

View File

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