Skip to content

Commit

Permalink
Consolidate copyright headers into LICENSE.txt and update year
Browse files Browse the repository at this point in the history
  • Loading branch information
lsegal committed Jan 2, 2014
1 parent 9d70663 commit 5ae1bd9
Show file tree
Hide file tree
Showing 248 changed files with 4 additions and 3,513 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright 2012-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License"). You
may not use this file except in compliance with the License. A copy of
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ This SDK is distributed under the
[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).

```no-highlight
Copyright 2012. Amazon Web Services, Inc. All Rights Reserved.
Copyright 2012-2014. Amazon Web Services, Inc. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
13 changes: 0 additions & 13 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file 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.

require 'json'

def write_configuration
Expand Down
16 changes: 1 addition & 15 deletions dist-tools/browser-builder.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
#!/usr/bin/env node
/**
* Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"). You
* may not use this file except in compliance with the License. A copy of
* the License is located at
*
* http://aws.amazon.com/apache2.0/
*
* or in the "license" file accompanying this file. This file 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.
*/

var fs = require('fs');
var path = require('path');
Expand All @@ -26,7 +12,7 @@ var bundleHelpers = require('./bundle-helpers');
var version = JSON.parse(fs.readFileSync('package.json')).version;
var licenseHeader = [
'// AWS SDK for JavaScript v' + version,
'// ' + fs.readFileSync(bundleHelpers.mainFile).toString().
'// ' + fs.readFileSync(__dirname + '/../LICENSE.txt').toString().
match(/(Copyright\s+.+?Amazon.+?)\n/)[1],
'// License at https://sdk.amazonaws.com/js/BUNDLE_LICENSE.txt'
].join('\n') + '\n';
Expand Down
15 changes: 0 additions & 15 deletions dist-tools/bundle-helpers.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/**
* Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"). You
* may not use this file except in compliance with the License. A copy of
* the License is located at
*
* http://aws.amazon.com/apache2.0/
*
* or in the "license" file accompanying this file. This file 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.
*/

var fs = require('fs');
var path = require('path');

Expand Down
15 changes: 0 additions & 15 deletions dist-tools/bundle-transform.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/**
* Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"). You
* may not use this file except in compliance with the License. A copy of
* the License is located at
*
* http://aws.amazon.com/apache2.0/
*
* or in the "license" file accompanying this file. This file 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.
*/

var fs = require('fs');
var util = require('util');
var path = require('path');
Expand Down
15 changes: 0 additions & 15 deletions dist-tools/server.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/**
* Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"). You
* may not use this file except in compliance with the License. A copy of
* the License is located at
*
* http://aws.amazon.com/apache2.0/
*
* or in the "license" file accompanying this file. This file 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.
*/

var zlib = require('zlib');
var url = require('url');
var domain = require('domain');
Expand Down
13 changes: 0 additions & 13 deletions dist-tools/test/browser-builder.spec.coffee
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file 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.

helpers = require('./helpers')
builder = require('../browser-builder')
domain = require('domain')
Expand Down
13 changes: 0 additions & 13 deletions dist-tools/test/bundle-transform.spec.coffee
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file 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.

helpers = require('./helpers')
transform = require('../bundle-transform')
bundleHelpers = require('../bundle-helpers')
Expand Down
13 changes: 0 additions & 13 deletions dist-tools/test/helpers.coffee
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file 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.

through = require('through')
fs = require('fs')

Expand Down
13 changes: 0 additions & 13 deletions dist-tools/test/server.spec.coffee
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file 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.

request = require('supertest')
express = require('express')
server = require('../server')
Expand Down
2 changes: 1 addition & 1 deletion dist/BUNDLE_LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The bundled package of the AWS SDK for JavaScript is available under the
Apache License, Version 2.0:

Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Copyright 2012-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License"). You
may not use this file except in compliance with the License. A copy of
Expand Down
15 changes: 0 additions & 15 deletions dist/appinfo.sample.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/**
* Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"). You
* may not use this file except in compliance with the License. A copy of
* the License is located at
*
* http://aws.amazon.com/apache2.0/
*
* or in the "license" file accompanying this file. This file 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.
*/

// Fill these in with your application details
appInfo = {
amazon: {
Expand Down
14 changes: 0 additions & 14 deletions dist/console.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
<!DOCTYPE html>
<!--
Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"). You
may not use this file except in compliance with the License. A copy of
the License is located at
http://aws.amazon.com/apache2.0/
or in the "license" file accompanying this file. This file 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.
-->
<html>
<head>
<title>AWS SDK for JavaScript - Console</title>
Expand Down
14 changes: 0 additions & 14 deletions dist/s3upload.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
<!DOCTYPE html>
<!--
Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"). You
may not use this file except in compliance with the License. A copy of
the License is located at
http://aws.amazon.com/apache2.0/
or in the "license" file accompanying this file. This file 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.
-->
<html>
<head>
<title>AWS SDK for JavaScript - Console</title>
Expand Down
14 changes: 0 additions & 14 deletions dist/tests.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
<!DOCTYPE html>
<!--
Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License"). You
may not use this file except in compliance with the License. A copy of
the License is located at
http://aws.amazon.com/apache2.0/
or in the "license" file accompanying this file. This file 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.
-->
<html>
<head>
<meta charset="utf-8">
Expand Down
15 changes: 0 additions & 15 deletions doc-src/templates/default/layout/html/footer.erb
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
<%
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file 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.
%>

<div id="footer">
Generated on <%= Time.now.strftime("%c") %> by
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
Expand Down
15 changes: 0 additions & 15 deletions doc-src/templates/default/layout/html/layout.erb
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
<%
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file 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.
%>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
Expand Down
13 changes: 0 additions & 13 deletions features/autoscaling/autoscaling.feature
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file 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.

# language: en
@autoscaling
Feature: Auto Scaling
Expand Down
15 changes: 0 additions & 15 deletions features/autoscaling/step_definitions/autoscaling.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/**
* Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"). You
* may not use this file except in compliance with the License. A copy of
* the License is located at
*
* http://aws.amazon.com/apache2.0/
*
* or in the "license" file accompanying this file. This file 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.
*/

module.exports = function() {
this.Before("@autoscaling", function (callback) {
this.service = new this.AWS.AutoScaling.Client();
Expand Down
13 changes: 0 additions & 13 deletions features/cloudformation/cloudformation.feature
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file 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.

# language: en
@cloudformation
Feature: AWS CloudFormation
Expand Down
15 changes: 0 additions & 15 deletions features/cloudformation/step_definitions/cloudformation.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/**
* Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"). You
* may not use this file except in compliance with the License. A copy of
* the License is located at
*
* http://aws.amazon.com/apache2.0/
*
* or in the "license" file accompanying this file. This file 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.
*/

module.exports = function() {
this.Before("@cloudformation", function (callback) {
this.service = new this.AWS.CloudFormation.Client();
Expand Down
13 changes: 0 additions & 13 deletions features/cloudfront/cloudfront-2012-05-05.feature
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You
# may not use this file except in compliance with the License. A copy of
# the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "license" file accompanying this file. This file 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.

# language: en
@cloudfront @cloudfront-2012-05-05
Feature: Amazon CloudFront
Expand Down
Loading

0 comments on commit 5ae1bd9

Please sign in to comment.