Updated license to Apache 2.0
Project: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/commit/fca2b08e Tree: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/tree/fca2b08e Diff: http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/diff/fca2b08e Branch: refs/heads/master Commit: fca2b08eaddf32237b1522d966bca4108d88e321 Parents: 7d3b487 Author: brandon <[email protected]> Authored: Thu Feb 18 10:56:50 2016 -0800 Committer: brandon <[email protected]> Committed: Thu Feb 18 10:56:50 2016 -0800 ---------------------------------------------------------------------- LICENSE | 29 +++++++++-------------------- examples/api-proxy/app.js | 7 +++++++ helpers/args.js | 14 ++++++++++++++ helpers/build.js | 14 ++++++++++++++ helpers/cb.js | 14 ++++++++++++++ helpers/client.js | 14 ++++++++++++++ helpers/config.js | 14 ++++++++++++++ helpers/index.js | 14 ++++++++++++++ helpers/mutability.js | 14 ++++++++++++++ helpers/query.js | 14 ++++++++++++++ helpers/time.js | 14 ++++++++++++++ helpers/user.js | 14 ++++++++++++++ lib/appAuth.js | 14 ++++++++++++++ lib/asset.js | 14 ++++++++++++++ lib/auth.js | 14 ++++++++++++++ lib/client.js | 14 ++++++++++++++ lib/entity.js | 14 ++++++++++++++ lib/query.js | 14 ++++++++++++++ lib/request.js | 14 ++++++++++++++ lib/response.js | 14 ++++++++++++++ lib/responseError.js | 14 ++++++++++++++ lib/user.js | 14 ++++++++++++++ lib/userAuth.js | 14 ++++++++++++++ package.json | 2 +- usergrid.js | 14 ++++++++++++++ 25 files changed, 325 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index bafd6d5..d955a86 100644 --- a/LICENSE +++ b/LICENSE @@ -1,22 +1,11 @@ -The MIT License (MIT) +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at -Copyright (c) 2015 Brandon Shelley - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/examples/api-proxy/app.js ---------------------------------------------------------------------- diff --git a/examples/api-proxy/app.js b/examples/api-proxy/app.js index 608f17f..feed0ac 100644 --- a/examples/api-proxy/app.js +++ b/examples/api-proxy/app.js @@ -6,6 +6,13 @@ var express = require('express'), Usergrid.init() +console.log(Usergrid.appAuth) +Usergrid.authenticateApp(function(err, usergridResponse) { + if (usergridResponse.ok) { + console.log('app is now authenticated') + } +}) + app.get('/:collection/:uuidOrName?', function(req, res) { Usergrid.GET(req.params.collection, req.params.uuidOrName, function(error, usergridResponse, entities) { res.json(entities); http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/helpers/args.js ---------------------------------------------------------------------- diff --git a/helpers/args.js b/helpers/args.js index ecef57b..6f221a5 100644 --- a/helpers/args.js +++ b/helpers/args.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var _ = require('lodash') http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/helpers/build.js ---------------------------------------------------------------------- diff --git a/helpers/build.js b/helpers/build.js index 88656a1..3697fee 100644 --- a/helpers/build.js +++ b/helpers/build.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var urljoin = require('url-join'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/helpers/cb.js ---------------------------------------------------------------------- diff --git a/helpers/cb.js b/helpers/cb.js index 8c62591..109ef27 100644 --- a/helpers/cb.js +++ b/helpers/cb.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var ok = require('objectkit'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/helpers/client.js ---------------------------------------------------------------------- diff --git a/helpers/client.js b/helpers/client.js index 4d4d311..ccea0d5 100644 --- a/helpers/client.js +++ b/helpers/client.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var Usergrid = require('../usergrid'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/helpers/config.js ---------------------------------------------------------------------- diff --git a/helpers/config.js b/helpers/config.js index 1de27e7..50af670 100644 --- a/helpers/config.js +++ b/helpers/config.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var util = require('util'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/helpers/index.js ---------------------------------------------------------------------- diff --git a/helpers/index.js b/helpers/index.js index 954e353..6a46b6d 100644 --- a/helpers/index.js +++ b/helpers/index.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var args = require('./args'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/helpers/mutability.js ---------------------------------------------------------------------- diff --git a/helpers/mutability.js b/helpers/mutability.js index 1762264..b948d2b 100644 --- a/helpers/mutability.js +++ b/helpers/mutability.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var ok = require('objectkit'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/helpers/query.js ---------------------------------------------------------------------- diff --git a/helpers/query.js b/helpers/query.js index c0f4394..f019545 100644 --- a/helpers/query.js +++ b/helpers/query.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var util = require('util'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/helpers/time.js ---------------------------------------------------------------------- diff --git a/helpers/time.js b/helpers/time.js index 06e8d84..d3452b1 100644 --- a/helpers/time.js +++ b/helpers/time.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' module.exports = { http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/helpers/user.js ---------------------------------------------------------------------- diff --git a/helpers/user.js b/helpers/user.js index 470cf06..45dcde4 100644 --- a/helpers/user.js +++ b/helpers/user.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var _ = require('lodash') http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/appAuth.js ---------------------------------------------------------------------- diff --git a/lib/appAuth.js b/lib/appAuth.js index 157db3e..d1a32ef 100644 --- a/lib/appAuth.js +++ b/lib/appAuth.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var UsergridAuth = require('./auth'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/asset.js ---------------------------------------------------------------------- diff --git a/lib/asset.js b/lib/asset.js index 5d9799a..681db0c 100644 --- a/lib/asset.js +++ b/lib/asset.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var Usergrid = require('../usergrid'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/auth.js ---------------------------------------------------------------------- diff --git a/lib/auth.js b/lib/auth.js index 2422d30..d3872d8 100644 --- a/lib/auth.js +++ b/lib/auth.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var UsergridAuth = function(token, expiry) { http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/client.js ---------------------------------------------------------------------- diff --git a/lib/client.js b/lib/client.js index 509b50c..dadf4b8 100644 --- a/lib/client.js +++ b/lib/client.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var helpers = require('../helpers'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/entity.js ---------------------------------------------------------------------- diff --git a/lib/entity.js b/lib/entity.js index fe35d58..eda1086 100644 --- a/lib/entity.js +++ b/lib/entity.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var Usergrid = require('../usergrid'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/query.js ---------------------------------------------------------------------- diff --git a/lib/query.js b/lib/query.js index a1d46b4..0ffb669 100644 --- a/lib/query.js +++ b/lib/query.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var helpers = require('../helpers'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/request.js ---------------------------------------------------------------------- diff --git a/lib/request.js b/lib/request.js index 3a4b1c3..70bb851 100644 --- a/lib/request.js +++ b/lib/request.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var request = require('request'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/response.js ---------------------------------------------------------------------- diff --git a/lib/response.js b/lib/response.js index 3cd21e1..2aa7ad4 100644 --- a/lib/response.js +++ b/lib/response.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var ok = require('objectkit'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/responseError.js ---------------------------------------------------------------------- diff --git a/lib/responseError.js b/lib/responseError.js index 1de62b9..38df35c 100644 --- a/lib/responseError.js +++ b/lib/responseError.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var ok = require('objectkit') http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/user.js ---------------------------------------------------------------------- diff --git a/lib/user.js b/lib/user.js index 6743575..e9e6d15 100644 --- a/lib/user.js +++ b/lib/user.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var UsergridEntity = require('./entity'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/lib/userAuth.js ---------------------------------------------------------------------- diff --git a/lib/userAuth.js b/lib/userAuth.js index e6fa8ff..5c61e5c 100644 --- a/lib/userAuth.js +++ b/lib/userAuth.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var UsergridAuth = require('./auth'), http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index fddb36c..a07c150 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "url": "git://github.com/r3mus/usergrid-nodejs.git" }, "keywords": [], - "license": "MIT", + "license": "Apache 2.0", "main": "usergrid.js", "name": "usergrid", "private": false, http://git-wip-us.apache.org/repos/asf/usergrid-nodejs/blob/fca2b08e/usergrid.js ---------------------------------------------------------------------- diff --git a/usergrid.js b/usergrid.js index d4fe3cd..765378f 100644 --- a/usergrid.js +++ b/usergrid.js @@ -1,3 +1,17 @@ +/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + 'use strict' var Usergrid = {
