Skip to content

Commit

Permalink
FAB-3963 add missing license headers
Browse files Browse the repository at this point in the history
Change-Id: Ie751115eaf1e8b86fbfd8103bd3cf0ff8ad1b106
Signed-off-by: Christopher Ferris <[email protected]>
  • Loading branch information
christo4ferris committed Jun 17, 2017
1 parent 012f721 commit 02154b1
Show file tree
Hide file tree
Showing 38 changed files with 127 additions and 12 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,3 @@ Check [the documentation on how to contribute to this project](http://hyperledge
## License <a name="license"></a>

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s
5 changes: 4 additions & 1 deletion devenv/Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

# Copyright IBM Corp All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
# This vagrantfile creates a VM with the development environment
# configured and ready to go.
#
Expand Down
4 changes: 4 additions & 0 deletions devenv/limits.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright IBM Corp All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
# /etc/security/limits.conf
#
#Each line describes a limit for a user in the form:
Expand Down
6 changes: 5 additions & 1 deletion devenv/tools/couchdb
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env bash

#
# Copyright IBM Corp All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
couchDbContainerStatus() {
for s in created restarting running paused exited dead ; do
if [ -n "$(docker ps --all --quiet --filter name=couchdb --filter status=$s)" ] ; then
Expand Down
5 changes: 5 additions & 0 deletions docs/custom_theme/searchbox.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<!--
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
-->
<div role="search">
<form id ="rtd-search-form-alt" class="wy-form" action="{{ base_url }}/search.html" method="get">
<input type="text" name="q" placeholder="Search docs" />
Expand Down
4 changes: 4 additions & 0 deletions examples/chaincode/go/utxo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# FIXME: someone from the UTXO team will need to verify or rework this
# Copyright London Stock Exchange Group All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
FROM ubuntu:latest

RUN apt-get update && apt-get install pkg-config autoconf libtool -y
Expand Down
4 changes: 4 additions & 0 deletions examples/cluster/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
PEERS += $(patsubst %,peer%,$(shell seq 1 4))
NODES += $(PEERS)
NODES += orderer
Expand Down
3 changes: 3 additions & 0 deletions examples/cluster/usage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ Example:
Prerequisites:

- Ensure you run "make docker" in both fabric.git and fabric-ca.git prior to execution

Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
4 changes: 4 additions & 0 deletions examples/e2e_cli/end-to-end.rst
Original file line number Diff line number Diff line change
Expand Up @@ -907,3 +907,7 @@ back and recreate your channel artifacts.
- If you continue to see errors, share your logs on the **# fabric-questions**
channel on `Hyperledger Rocket Chat <https://chat.hyperledger.org/home>`__.

.. Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
5 changes: 4 additions & 1 deletion examples/e2e_cli/scripts/script.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Copyright London Stock Exchange Group All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
echo
echo " ____ _____ _ ____ _____ _____ ____ _____ "
echo "/ ___| |_ _| / \ | _ \ |_ _| | ____| |___ \ | ____|"
Expand Down
Binary file removed images/Lock.png
Binary file not shown.
Binary file removed images/Requirements.png
Binary file not shown.
4 changes: 4 additions & 0 deletions images/buildenv/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
FROM _BASE_NS_/fabric-baseimage:_BASE_TAG_
COPY payload/protoc-gen-go /usr/local/bin/
ADD payload/gotools.tar.bz2 /usr/local/bin/
4 changes: 4 additions & 0 deletions images/ccenv/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
FROM _BASE_NS_/fabric-baseimage:_BASE_TAG_
COPY payload/chaintool payload/protoc-gen-go /usr/local/bin/
ADD payload/goshim.tar.bz2 $GOPATH/src/
Expand Down
4 changes: 4 additions & 0 deletions images/couchdb/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
FROM _BASE_NS_/fabric-baseimage:_BASE_TAG_

# Based on https://github.com/klaemo/docker-couchdb/blob/master/2.0.0/Dockerfile
Expand Down
Binary file removed images/handshake.png
Binary file not shown.
4 changes: 4 additions & 0 deletions images/javaenv/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
FROM _BASE_NS_/fabric-baseimage:_BASE_TAG_
RUN curl -sSL https://services.gradle.org/distributions/gradle-2.12-bin.zip > /tmp/gradle-2.12-bin.zip
RUN unzip -qo /tmp/gradle-2.12-bin.zip -d /opt && rm /tmp/gradle-2.12-bin.zip
Expand Down
4 changes: 4 additions & 0 deletions images/kafka/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
FROM _BASE_NS_/fabric-baseimage:_BASE_TAG_

ENV SCALA_VERSION=2.11 \
Expand Down
4 changes: 4 additions & 0 deletions images/orderer/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
FROM _BASE_NS_/fabric-baseos:_BASE_TAG_
ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
RUN mkdir -p /var/hyperledger/production $FABRIC_CFG_PATH
Expand Down
4 changes: 4 additions & 0 deletions images/peer/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
FROM _BASE_NS_/fabric-baseos:_BASE_TAG_
ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
RUN mkdir -p /var/hyperledger/production $FABRIC_CFG_PATH
Expand Down
Binary file removed images/sContracts.png
Binary file not shown.
4 changes: 4 additions & 0 deletions images/testenv/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
FROM _NS_/fabric-buildenv:_TAG_

# fabric configuration locations
Expand Down
5 changes: 4 additions & 1 deletion images/tools/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
FROM _BASE_NS_/fabric-baseimage:_BASE_TAG_
ENV FABRIC_CFG_PATH /etc/hyperledger/fabric
VOLUME /etc/hyperledger/fabric
ADD payload/sampleconfig.tar.bz2 $FABRIC_CFG_PATH
COPY payload/cryptogen /usr/local/bin
COPY payload/configtxgen /usr/local/bin
COPY payload/peer /usr/local/bin

Binary file removed images/what.png
Binary file not shown.
4 changes: 4 additions & 0 deletions images/zookeeper/Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Greg Haskins All Rights Reserved
#
# SPDX-License-Identifier: Apache-2.0
#
FROM _BASE_NS_/fabric-baseimage:_BASE_TAG_
# Based on https://github.com/31z4/zookeeper-docker/blob/master/3.4.9/Dockerfile

Expand Down
6 changes: 5 additions & 1 deletion msp/testdata/external/config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright London Stock Exchange Group All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
OrganizationalUnitIdentifiers:
- Certificate: "intermediatecerts/intermediatecert.pem"
OrganizationalUnitIdentifier: "Hyperledger Testing"
OrganizationalUnitIdentifier: "Hyperledger Testing"
4 changes: 4 additions & 0 deletions protos/gossip/message.proto
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright IBM Corp. All Rights Reserved.
//
// SPDX-License-Identifier: Apache-2.0
//
syntax = "proto3";

option go_package = "github.com/hyperledger/fabric/protos/gossip" ;
Expand Down
5 changes: 4 additions & 1 deletion release/templates/get-docker-images.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash -eu

# Copyright London Stock Exchange Group All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# This script pulls docker images from the Dockerhub hyperledger repositories

# set the default Docker namespace and tag
Expand Down
2 changes: 2 additions & 0 deletions release_notes/v1.0.0-beta.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ BCCSP content in the configtx.yaml has been [removed](https://github.com/hyperle
Java Chaincode support has been disabled until post 1.0.0 as it is not yet fully mature. It may be re-enabled for experimentation by cloning the hyperledger/fabric repository, reversing [this commit](https://github.com/hyperledger/fabric/commit/29e0c40) and building your own fork.

## [Change Log](https://github.com/hyperledger/fabric/blob/master/CHANGELOG.md#v100-beta)

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
7 changes: 5 additions & 2 deletions test/feature/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ The docker images for ``peer``, ``orderer``, ``kafka``, and ``zookeeper`` are ne
=========================
Building tool executables
=========================
The **configtxgen** and **cryptogen** tools are used when bootstrapping the networks in these tests. As a result, you must perform a ``make configtxgen && make cryptogen`` in the ``/path/to/hyperledger/fabric`` directory.
The **configtxgen** and **cryptogen** tools are used when bootstrapping the networks in these tests. As a result, you must perform a ``make configtxgen && make cryptogen`` in the ``/path/to/hyperledger/fabric`` directory.


How to Contribute
Expand Down Expand Up @@ -204,7 +204,7 @@ Python implementation steps are identified using decorators which match the keyw
====================
Docker-Compose Files
====================
These docker composition files are used when setting up and tearing down networks of different configurations. Different tests can use different docker compose files depending on the test scenario. We are currently using `version 2 docker compose`_ files.
These docker composition files are used when setting up and tearing down networks of different configurations. Different tests can use different docker compose files depending on the test scenario. We are currently using `version 2 docker compose`_ files.

.. _version 2 docker compose: https://docs.docker.com/compose/compose-file/compose-file-v2/

Expand Down Expand Up @@ -274,3 +274,6 @@ Helpful Docker Commands
* ``$ docker networks ls``
* Remove a specific residual network
* ``$ docker networks rm <network_name>``

.. Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
4 changes: 4 additions & 0 deletions test/feature/configs/configtx.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
---
################################################################################
#
Expand Down
5 changes: 5 additions & 0 deletions test/feature/steps/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
3 changes: 3 additions & 0 deletions test/regression/daily/README.rst.orig
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,6 @@ Option 2. (Useful for GO tests):
[Test Descriptions](README_testdescriptions.rst)

[ChainCode Tests descriptions and how-to](chaincodeTests/README.rst)

.. Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
2 changes: 2 additions & 0 deletions test/regression/daily/chaincodeTests/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,5 @@ In case of trouble, here is how to deactivate docker network manually:
``cd /path/to/fabric/test/regression/daily/chaincodeTests/envsetup``
``./network_setup.sh down``

.. Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
This is a place holder to keep custom chaincodes

.. Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
7 changes: 5 additions & 2 deletions test/tools/LTE/scripts/parameters_daily_CI.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
DataDir="/tmp/fabric/test/tools/LTE/data"
NumChains=10
NumParallelTxPerChain=10
Expand All @@ -8,4 +12,3 @@ NumTotalTx=1000000
NumKeysInEachTx=4
BatchSize=50
KVSize=200

3 changes: 3 additions & 0 deletions test/tools/OTE/README.rst
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
Orderer Traffic Engine
======================

.. Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
6 changes: 5 additions & 1 deletion test/tools/PTE/pte_driver.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
#
# usage: ./pte_driver.sh <user input file>
# example: ./pte_driver.sh runCases.txt
Expand Down

0 comments on commit 02154b1

Please sign in to comment.