From 9e3ae8ed82eea81b87ba567e5bcde21d0388d618 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Mon, 12 Jun 2017 15:38:01 -0400 Subject: [PATCH] FAB-4574 add missing license header Change-Id: I614432eb9b1be6728179355c642557c03a087bd3 Signed-off-by: Christopher Ferris --- .classpath | 7 +++++++ .project | 7 +++++++ checkstyle-config.xml | 8 +++++++- config.properties | 7 ++++++- scripts/changelog.sh | 5 +++++ settings.xml | 8 ++++++++ .../java/org/hyperledger/fabric/sdk/ProposalResponse.java | 5 +++++ src/main/resources/commons-logging.properties | 6 +++++- src/resources/commons-logging.properties | 6 +++++- src/resources/log4j.properties | 7 ++++++- src/test/cirun.sh | 5 +++++ src/test/fabric_test_commitlevel.sh | 7 ++++++- .../badusertestCCEPPolicy.yaml | 6 +++++- .../testCCEPPolicy.yaml | 6 +++++- src/test/fixture/sdkintegration/.env | 5 +++++ .../sdkintegration/chaincodeendorsementpolicy.yaml | 5 +++++ src/test/fixture/sdkintegration/docker-compose.yaml | 6 +++++- .../sdkintegration/e2e-2Orgs/channel/configtx.yaml | 5 +++++ .../sdkintegration/e2e-2Orgs/channel/crypto-config.yaml | 5 +++++ src/test/fixture/sdkintegration/fabric.sh | 7 ++++++- src/test/fixture/src/downdc.sh | 5 +++++ src/test/fixture/src/rundc.sh | 5 +++++ .../fabric/sdkintegration/IntegrationSuite.java | 5 +++++ src/test/resources/commons-logging.properties | 6 +++++- src/test/resources/log4j.properties | 7 ++++++- 25 files changed, 139 insertions(+), 12 deletions(-) diff --git a/.classpath b/.classpath index 56e6d3b4..c9d49fff 100644 --- a/.classpath +++ b/.classpath @@ -1,3 +1,10 @@ + diff --git a/.project b/.project index a2238889..78151536 100644 --- a/.project +++ b/.project @@ -1,3 +1,10 @@ + fabric-sdk-java diff --git a/checkstyle-config.xml b/checkstyle-config.xml index 87f23653..44ddee60 100644 --- a/checkstyle-config.xml +++ b/checkstyle-config.xml @@ -2,7 +2,13 @@ - + diff --git a/src/main/java/org/hyperledger/fabric/sdk/ProposalResponse.java b/src/main/java/org/hyperledger/fabric/sdk/ProposalResponse.java index 8a13fadd..f1c5ab98 100644 --- a/src/main/java/org/hyperledger/fabric/sdk/ProposalResponse.java +++ b/src/main/java/org/hyperledger/fabric/sdk/ProposalResponse.java @@ -1,3 +1,8 @@ +/* + Copyright IBM Corp. All Rights Reserved. + + SPDX-License-Identifier: Apache-2.0 +*/ package org.hyperledger.fabric.sdk; import java.lang.ref.WeakReference; diff --git a/src/main/resources/commons-logging.properties b/src/main/resources/commons-logging.properties index f3829744..52d66dc4 100644 --- a/src/main/resources/commons-logging.properties +++ b/src/main/resources/commons-logging.properties @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# # commons-logging.properties # jdk handlers handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler @@ -25,4 +30,3 @@ java.util.logging.FileHandler.limit=50000 # Optional - The number of files to cycle through, by # appending an integer to the base file name: java.util.logging.FileHandler.count=10 - diff --git a/src/resources/commons-logging.properties b/src/resources/commons-logging.properties index 0bf6cb11..de6a2e4d 100644 --- a/src/resources/commons-logging.properties +++ b/src/resources/commons-logging.properties @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# # commons-logging.properties # jdk handlers @@ -34,4 +39,3 @@ java.util.logging.FileHandler.limit=50000 # Optional - The number of files to cycle through, by # appending an integer to the base file name: java.util.logging.FileHandler.count=10 - diff --git a/src/resources/log4j.properties b/src/resources/log4j.properties index 462ce5c7..65b866c7 100644 --- a/src/resources/log4j.properties +++ b/src/resources/log4j.properties @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# # Root logger option log4j.rootLogger=INFO, stdout @@ -11,4 +16,4 @@ log4j.appender.stdout.layout=org.apache.log4j.EnhancedPatternLayout # log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601}{GMT} %-5p %c{1}:%L - %m%n -log4j.category.org.hyperledger.fabric=INFO \ No newline at end of file +log4j.category.org.hyperledger.fabric=INFO diff --git a/src/test/cirun.sh b/src/test/cirun.sh index b232b5a8..23281464 100755 --- a/src/test/cirun.sh +++ b/src/test/cirun.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# #Script for continuous integration run. Cleanup, start docker containers for fabric and fabric ca #Start integration tests. # expect WD env set HLJSDK directory. diff --git a/src/test/fabric_test_commitlevel.sh b/src/test/fabric_test_commitlevel.sh index cdc4acf6..c72dcfae 100644 --- a/src/test/fabric_test_commitlevel.sh +++ b/src/test/fabric_test_commitlevel.sh @@ -1,6 +1,11 @@ #!/usr/bin/env bash +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# #file used for automatic integration build test #This should always match what's in the README.md export FABRIC_COMMIT=latest -export FABRIC_CA_COMMIT=latest \ No newline at end of file +export FABRIC_CA_COMMIT=latest diff --git a/src/test/fixture/sample_chaincode_endorsement_policies/badusertestCCEPPolicy.yaml b/src/test/fixture/sample_chaincode_endorsement_policies/badusertestCCEPPolicy.yaml index 0bfed823..c2da4b14 100644 --- a/src/test/fixture/sample_chaincode_endorsement_policies/badusertestCCEPPolicy.yaml +++ b/src/test/fixture/sample_chaincode_endorsement_policies/badusertestCCEPPolicy.yaml @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# --- identities: user1: {"role": {"name": "member", "mspId": "org1"}} @@ -20,4 +25,3 @@ policy: - 1-of: - signed-by: "user1" - signed-by: "userIMBAD" - diff --git a/src/test/fixture/sample_chaincode_endorsement_policies/testCCEPPolicy.yaml b/src/test/fixture/sample_chaincode_endorsement_policies/testCCEPPolicy.yaml index e4a2fe1b..a2ced5d5 100644 --- a/src/test/fixture/sample_chaincode_endorsement_policies/testCCEPPolicy.yaml +++ b/src/test/fixture/sample_chaincode_endorsement_policies/testCCEPPolicy.yaml @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# --- identities: user1: {"role": {"name": "member", "mspId": "org1"}} @@ -20,4 +25,3 @@ policy: - 1-of: - signed-by: "user1" - signed-by: "user2" - diff --git a/src/test/fixture/sdkintegration/.env b/src/test/fixture/sdkintegration/.env index 5bfaf51d..4cedd0db 100644 --- a/src/test/fixture/sdkintegration/.env +++ b/src/test/fixture/sdkintegration/.env @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# #default env. vars settings #TLS: #ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_TLS=true diff --git a/src/test/fixture/sdkintegration/chaincodeendorsementpolicy.yaml b/src/test/fixture/sdkintegration/chaincodeendorsementpolicy.yaml index 14b7ee50..fc06fdba 100644 --- a/src/test/fixture/sdkintegration/chaincodeendorsementpolicy.yaml +++ b/src/test/fixture/sdkintegration/chaincodeendorsementpolicy.yaml @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# --- # A Shotgun policy xx identities: # list roles to be used in the policy diff --git a/src/test/fixture/sdkintegration/docker-compose.yaml b/src/test/fixture/sdkintegration/docker-compose.yaml index 6a85067f..d4452cf0 100644 --- a/src/test/fixture/sdkintegration/docker-compose.yaml +++ b/src/test/fixture/sdkintegration/docker-compose.yaml @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# version: '2' services: @@ -133,4 +138,3 @@ services: ccenv: image: hyperledger/fabric-ccenv${IMAGE_TAG_FABRIC} - diff --git a/src/test/fixture/sdkintegration/e2e-2Orgs/channel/configtx.yaml b/src/test/fixture/sdkintegration/e2e-2Orgs/channel/configtx.yaml index 31bd9e6f..3284ee9a 100644 --- a/src/test/fixture/sdkintegration/e2e-2Orgs/channel/configtx.yaml +++ b/src/test/fixture/sdkintegration/e2e-2Orgs/channel/configtx.yaml @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# --- ################################################################################ # diff --git a/src/test/fixture/sdkintegration/e2e-2Orgs/channel/crypto-config.yaml b/src/test/fixture/sdkintegration/e2e-2Orgs/channel/crypto-config.yaml index 85535310..f5a66e94 100644 --- a/src/test/fixture/sdkintegration/e2e-2Orgs/channel/crypto-config.yaml +++ b/src/test/fixture/sdkintegration/e2e-2Orgs/channel/crypto-config.yaml @@ -1,4 +1,9 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# # --------------------------------------------------------------------------- # "OrdererOrgs" - Definition of organizations managing orderer nodes # --------------------------------------------------------------------------- diff --git a/src/test/fixture/sdkintegration/fabric.sh b/src/test/fixture/sdkintegration/fabric.sh index 63d70ed0..a7102f71 100755 --- a/src/test/fixture/sdkintegration/fabric.sh +++ b/src/test/fixture/sdkintegration/fabric.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# # simple batch script making it easier to cleanup and start a relatively fresh fabric env. if [ ! -e "docker-compose.yaml" ];then @@ -61,4 +66,4 @@ do exit 1 esac -done \ No newline at end of file +done diff --git a/src/test/fixture/src/downdc.sh b/src/test/fixture/src/downdc.sh index 8d5d8a38..c9ed886f 100755 --- a/src/test/fixture/src/downdc.sh +++ b/src/test/fixture/src/downdc.sh @@ -1,2 +1,7 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# DOCKERFILE=docker-compose.yml docker-compose -f $DOCKERFILE down diff --git a/src/test/fixture/src/rundc.sh b/src/test/fixture/src/rundc.sh index eaf291cc..7b3da3eb 100755 --- a/src/test/fixture/src/rundc.sh +++ b/src/test/fixture/src/rundc.sh @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# DOCKERFILE=docker-compose.yml docker-compose -f $DOCKERFILE down ;rm -rf /tmp/keyValStore*; rm -rf /tmp/kvs-hfc-e2e ~/test.properties; rm -rf /var/hyperledger/* ; docker-compose -f $DOCKERFILE up --force-recreate #docker-compose -f $DOCKERFILE down ;rm -rf /tmp/keyValStore*; rm -rf /tmp/kvs-hfc-e2e ; rm -rf /var/hyperledger/* ; docker-compose -f $DOCKERFILE up --force-recreate diff --git a/src/test/java/org/hyperledger/fabric/sdkintegration/IntegrationSuite.java b/src/test/java/org/hyperledger/fabric/sdkintegration/IntegrationSuite.java index b00f795b..bac73b88 100644 --- a/src/test/java/org/hyperledger/fabric/sdkintegration/IntegrationSuite.java +++ b/src/test/java/org/hyperledger/fabric/sdkintegration/IntegrationSuite.java @@ -1,3 +1,8 @@ +/* + Copyright IBM Corp. All Rights Reserved. + + SPDX-License-Identifier: Apache-2.0 +*/ package org.hyperledger.fabric.sdkintegration; import org.hyperledger.fabric_ca.sdkintegration.HFCAClientEnrollIT; diff --git a/src/test/resources/commons-logging.properties b/src/test/resources/commons-logging.properties index 679bea2e..b47f77f5 100644 --- a/src/test/resources/commons-logging.properties +++ b/src/test/resources/commons-logging.properties @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# # commons-logging.properties # jdk handlers @@ -34,4 +39,3 @@ java.util.logging.FileHandler.limit=50000 # Optional - The number of files to cycle through, by # appending an integer to the base file name: java.util.logging.FileHandler.count=10 - diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties index b7c69e3c..6551e24e 100644 --- a/src/test/resources/log4j.properties +++ b/src/test/resources/log4j.properties @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# # Root logger option log4j.rootLogger=INFO, stdout @@ -12,4 +17,4 @@ log4j.appender.stdout.layout=org.apache.log4j.EnhancedPatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601}{GMT} %-5p %c{1}:%L - %m%n log4j.category.org.hyperledger.fabric=DEBUG -log4j.category.org.hyperledger.fabric_ca.sdk=INFO \ No newline at end of file +log4j.category.org.hyperledger.fabric_ca.sdk=INFO