Merge "FAB-4109 add missing license headers"

.travis.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 language: go
 go:
  - 1.7

bddtests/bdd-docker/docker-compose-4-consensus-batch-nosnapshotbuffer.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 vp0:
   environment:
     # The combination of the following two environment variables ensures that a state snapshot will be pulled

bddtests/compose-defaults.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: "2"
 
 services:
@@ -27,4 +32,4 @@ services:
 
 volumes:
 
-    peer:
+    peer:

bddtests/docker-compose-1-profiling.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. 2017 All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 vp0:
   extends:
     file: compose-defaults.yml

bddtests/docker-compose-next-4-couchdb.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. 2017 All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 
 services:

bddtests/docker-compose-next-4.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: "2"
 
 services:

bddtests/docker-compose-next.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: "2"
 
 services:

bddtests/docker-compose-orderer-base.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: "2"
 
 services:

bddtests/docker-compose-orderer-kafka.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 
 services:

bddtests/docker-compose-orderer-solo.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 
 services:

bddtests/docker-compose-with-orderer.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 networks:
    bridge:

bddtests/environment.py

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. 2017 All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 import subprocess
 
 from steps.docgen import DocumentGenerator

bddtests/environments/kafka/docker-compose.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 services:
   zookeeper:

bddtests/environments/orderer-1-kafka-1/docker-compose.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 services:
   zookeeper:

bddtests/environments/orderer-1-kafka-3/docker-compose.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 services:
   zookeeper:

bddtests/features/bootstrap.feature

@@ -1,4 +1,10 @@
 #
+#
+# Copyright IBM Corp. 2016 All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 # Test Bootstrap function
 #
 # Tags that can be used and will affect test internals:

bddtests/features/endorser.feature

@@ -1,4 +1,10 @@
 #
+#
+# Copyright IBM Corp. 2016 All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 # Test Endorser function
 #
 # Tags that can be used and will affect test internals:

bddtests/features/orderer.feature

@@ -1,3 +1,10 @@
+
+#
+# Copyright IBM Corp. 2016 All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 # Tags that can be used and will affect test internals:
 #  @doNotDecompose will NOT decompose the named compose_yaml after scenario ends.
 #  Useful for setting up environment and reviewing after scenario.

bddtests/orderer-3-kafka-1.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 services:
   orderer1:

bddtests/orderer-3-kafka-3.yml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 services:
   orderer1:

bddtests/steps/contexthelper.py

@@ -1,3 +1,7 @@
+# Copyright IBM Corp. 2017 All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
 import uuid
 import os

bddtests/steps/coverage.py

@@ -1,3 +1,9 @@
+
+# Copyright IBM Corp. 2017 All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 import cStringIO
 import os
 import glob

core/chaincode/chaincodetest.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 # CA server parameters
 #
 server:

core/endorser/endorser_test.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 # CA server parameters
 #
 server:

docs/Makefile

@@ -1,3 +1,32 @@
+# License for Sphinx
+# ==================
+# 
+# Copyright (c) 2007-2017 by the Sphinx team (see AUTHORS file).
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# 
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 # Minimal makefile for Sphinx documentation
 #
 
@@ -17,4 +46,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

examples/chaincode/chaintool/example02/chaincode.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 
 # ----------------------------------
 # chaincode example02

examples/cluster/compose/docker-compose.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 
 services:

examples/cluster/compose/peer-base/peer-base.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 services:
   peer-base:

examples/cluster/config/configtx.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 ---
 ################################################################################
 #

examples/cluster/config/core.yaml

@@ -1,3 +1,18 @@
+# Copyright IBM Corp. 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.
+# 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.
+#
+
 ###############################################################################
 #
 #    LOGGING section

examples/cluster/config/cryptogen.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 OrdererOrgs:
   - Name: Orderer
     Domain: orderer.net

examples/cluster/config/fabric-ca-server-config.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 #############################################################################
 #   This is a configuration file for the fabric-ca-server command.
 #

examples/cluster/config/orderer.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 ---
 ################################################################################
 #

examples/e2e_cli/base/docker-compose-base.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 
 services:

examples/e2e_cli/base/peer-base.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 services:
   peer-base:

examples/e2e_cli/configtx.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 ---
 ################################################################################
 #

examples/e2e_cli/crypto-config.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 # ---------------------------------------------------------------------------
 # "OrdererOrgs" - Definition of organizations managing orderer nodes
 # ---------------------------------------------------------------------------

examples/e2e_cli/docker-compose-cli.yaml

@@ -1,3 +1,8 @@
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 version: '2'
 
 services: