Skip to content

Commit

Permalink
FAB-4574 add missing license header
Browse files Browse the repository at this point in the history
Change-Id: I614432eb9b1be6728179355c642557c03a087bd3
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
  • Loading branch information
christo4ferris committed Jun 12, 2017
1 parent f5b46a2 commit 9e3ae8e
Show file tree
Hide file tree
Showing 25 changed files with 139 additions and 12 deletions.
7 changes: 7 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<!--
#
# Copyright DTCC Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
-->
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
Expand Down
7 changes: 7 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<!--
#
# Copyright DTCC All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
-->
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>fabric-sdk-java</name>
Expand Down
8 changes: 7 additions & 1 deletion checkstyle-config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<!--
#
# Copyright DTCC All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
-->
<!--
Checkstyle configuration that checks the sun coding conventions from:
- the Java Language Specification at
Expand Down
7 changes: 6 additions & 1 deletion config.properties
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
#
# Hyperledger Fabric member CA certificates. Used to verify chain of trust on receipt of peer messages
# Note that this is temporary and will go away when the SDK can read the chain's genesis block and
# set up MSP configuration from that.
Expand Down Expand Up @@ -25,4 +30,4 @@ org.hyperledger.fabric.sdk.crypto.hash_algorithm = SHA2
org.hyperledger.fabric.sdk.crypto.certificate_format = X.509
# The algorithm used to generate a signature. Valid values are listed in the JCA Standard Algorithm Name Documentation
# e.g. http://docs.oracle.com/javase/8/docs/technotes/guides/security/StandardNames.html#Signature
org.hyperledger.fabric.sdk.crypto.default_signature_algorithm = SHA256withECDSA
org.hyperledger.fabric.sdk.crypto.default_signature_algorithm = SHA256withECDSA
5 changes: 5 additions & 0 deletions scripts/changelog.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/bin/sh
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#

echo "## $2\n$(date)" >> CHANGELOG.new
echo "" >> CHANGELOG.new
Expand Down
8 changes: 8 additions & 0 deletions settings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<!--
#
# Copyright IBM Corp. All Rights Reserved.
# Copyright DTCC All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
-->
<settings>
<servers>
<server>
Expand Down
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
*/
package org.hyperledger.fabric.sdk;

import java.lang.ref.WeakReference;
Expand Down
6 changes: 5 additions & 1 deletion src/main/resources/commons-logging.properties
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
#
# commons-logging.properties
# jdk handlers
handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler
Expand Down Expand Up @@ -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

6 changes: 5 additions & 1 deletion src/resources/commons-logging.properties
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
#
# commons-logging.properties
# jdk handlers

Expand Down Expand Up @@ -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

7 changes: 6 additions & 1 deletion src/resources/log4j.properties
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
#
# Root logger option
log4j.rootLogger=INFO, stdout

Expand All @@ -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
log4j.category.org.hyperledger.fabric=INFO
5 changes: 5 additions & 0 deletions src/test/cirun.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
7 changes: 6 additions & 1 deletion src/test/fabric_test_commitlevel.sh
Original file line number Diff line number Diff line change
@@ -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
export FABRIC_CA_COMMIT=latest
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
#
---
identities:
user1: {"role": {"name": "member", "mspId": "org1"}}
Expand All @@ -20,4 +25,3 @@ policy:
- 1-of:
- signed-by: "user1"
- signed-by: "userIMBAD"

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
#
---
identities:
user1: {"role": {"name": "member", "mspId": "org1"}}
Expand All @@ -20,4 +25,3 @@ policy:
- 1-of:
- signed-by: "user1"
- signed-by: "user2"

5 changes: 5 additions & 0 deletions src/test/fixture/sdkintegration/.env
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
#
#default env. vars settings
#TLS:
#ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_TLS=true
Expand Down
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
#
---
# A Shotgun policy xx
identities: # list roles to be used in the policy
Expand Down
6 changes: 5 additions & 1 deletion src/test/fixture/sdkintegration/docker-compose.yaml
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
#
version: '2'

services:
Expand Down Expand Up @@ -133,4 +138,3 @@ services:

ccenv:
image: hyperledger/fabric-ccenv${IMAGE_TAG_FABRIC}

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
#
---
################################################################################
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
# ---------------------------------------------------------------------------
# "OrdererOrgs" - Definition of organizations managing orderer nodes
# ---------------------------------------------------------------------------
Expand Down
7 changes: 6 additions & 1 deletion src/test/fixture/sdkintegration/fabric.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -61,4 +66,4 @@ do
exit 1

esac
done
done
5 changes: 5 additions & 0 deletions src/test/fixture/src/downdc.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions src/test/fixture/src/rundc.sh
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
#
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
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
*/
package org.hyperledger.fabric.sdkintegration;

import org.hyperledger.fabric_ca.sdkintegration.HFCAClientEnrollIT;
Expand Down
6 changes: 5 additions & 1 deletion src/test/resources/commons-logging.properties
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
#
# commons-logging.properties
# jdk handlers

Expand Down Expand Up @@ -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

7 changes: 6 additions & 1 deletion src/test/resources/log4j.properties
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
#
# Root logger option
log4j.rootLogger=INFO, stdout

Expand All @@ -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
log4j.category.org.hyperledger.fabric_ca.sdk=INFO

0 comments on commit 9e3ae8e

Please sign in to comment.