Skip to content

Commit

Permalink
Merge branch 'develop' of /Users/sstone1/git/Concerto-Admin into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Stone committed Jan 5, 2017
2 parents dfcc96e + 76ce6b2 commit 2689269
Show file tree
Hide file tree
Showing 28 changed files with 1,275 additions and 0 deletions.
12 changes: 12 additions & 0 deletions packages/concerto-admin/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
47 changes: 47 additions & 0 deletions packages/concerto-admin/.eslint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
env:
es6: true
node: true
mocha: true
extends: 'eslint:recommended'
parserOptions:
sourceType:
- script
rules:
indent:
- error
- 4
linebreak-style:
- error
- unix
quotes:
- error
- single
semi:
- error
- always
no-unused-vars:
- error
- args: none
no-console: off
curly: error
eqeqeq: error
no-throw-literal: error
strict: error
no-var: error
dot-notation: error
no-tabs: error
no-trailing-spaces: error
# no-use-before-define: error
no-useless-call: error
no-with: error
operator-linebreak: error
require-jsdoc:
- error
- require:
ClassDeclaration: true
MethodDefinition: true
FunctionDeclaration: true
valid-jsdoc:
- error
- requireReturn: false
yoda: error
4 changes: 4 additions & 0 deletions packages/concerto-admin/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
coverage
node_modules
out
lib/introspect/parser.js
47 changes: 47 additions & 0 deletions packages/concerto-admin/.eslintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
env:
es6: true
node: true
mocha: true
extends: 'eslint:recommended'
parserOptions:
sourceType:
- script
rules:
indent:
- error
- 4
linebreak-style:
- error
- unix
quotes:
- error
- single
semi:
- error
- always
no-unused-vars:
- error
- args: none
no-console: off
curly: error
eqeqeq: error
no-throw-literal: error
strict: error
no-var: error
dot-notation: error
no-tabs: error
no-trailing-spaces: error
# no-use-before-define: error
no-useless-call: error
no-with: error
operator-linebreak: error
require-jsdoc:
- error
- require:
ClassDeclaration: true
MethodDefinition: true
FunctionDeclaration: true
valid-jsdoc:
- error
- requireReturn: false
yoda: error
48 changes: 48 additions & 0 deletions packages/concerto-admin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules
jspm_packages

# Optional npm cache directory
.npm

# Optional REPL history
.node_repl_history

# JSDoc
out

# Mac files.
**/.DS_Store

*.swp

# Build generated files should be ignored by git, but not by npm.
index.d.ts
19 changes: 19 additions & 0 deletions packages/concerto-admin/.istanbul.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
instrumentation:
excludes:
- "lib/codegen/*"
- "lib/codegen/fromcto/golang/**"
- "lib/codegen/fromcto/plantuml/**"
- "lib/codegen/fromcto/typescript/**"
- "lib/codegen/fromjs/**"
- "lib/tools/changelog.js"
- "lib/tools/plantumltoimage.js"
- "lib/introspect/parser.js"
- "out/**"
- "scripts/**"
- "systest/**"
check:
global:
statements: 97
branches: 95
functions: 99
lines: 97
48 changes: 48 additions & 0 deletions packages/concerto-admin/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules
jspm_packages

# Optional npm cache directory
.npm

# Optional REPL history
.node_repl_history

# JSDoc
out

# Mac files.
**/.DS_Store

*.swp

# Build generated files should be ignored by git, but not by npm.
# index.d.ts
9 changes: 9 additions & 0 deletions packages/concerto-admin/.tern-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"ecmaVersion": 6,
"libs": [
"chai"
],
"plugins": {
"node": {}
}
}
16 changes: 16 additions & 0 deletions packages/concerto-admin/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
language: node_js
node_js:
- '4'
- '6'
dist: trusty
before_install: |
set -ev
npm install -g npm
npm config set @ibm:registry https://npm-registry.whitewater.ibm.com
npm config set //npm-registry.whitewater.ibm.com/:_authToken ${NPM_TOKEN}
deploy:
provider: script
script: ./scripts/deploy.sh
skip_cleanup: true
on:
all_branches: true
8 changes: 8 additions & 0 deletions packages/concerto-admin/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
IBM Confidential
OCO Source Materials
IBM Concerto - Blockchain Solution Framework
Copyright IBM Corp. 2016

The source code for this program is not published or otherwise
divested of its trade secrets, irrespective of what has
been deposited with the U.S. Copyright Office.
2 changes: 2 additions & 0 deletions packages/concerto-admin/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Concerto-Admin
The Concerto administration API. The admin API allows users to deploy/undeploy/update BusinessNetworkDefinitions.
14 changes: 14 additions & 0 deletions packages/concerto-admin/api.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
class AdminConnection {
+ void constructor(Object,Object)
+ Promise connect(string,string,string,string)
+ Promise createProfile(string,Object)
+ Promise deleteProfile(string)
+ Promise getProfile(string)
+ Promise getAllProfiles()
+ Promise disconnect()
+ Promise deploy(BusinessNetworkDefinition)
+ Promise undeploy(string)
+ Promise update(BusinessNetworkDefinition)
+ Promise ping()
+ Promise list()
}
37 changes: 37 additions & 0 deletions packages/concerto-admin/changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#
# This is the changelog for IBM Concerto. It lists all significant changes to
# functionality and public API.
#
# The most recent entry in the changelog should be at the top of this file
# and must follow the format: Version <number> {public api digest} <date>. The version
# number must match that specified in package.json. The public api digest is computed
# and validated using ./scripts/api-changelog.sh
#
# Any changes to the public API must have an associated changelog entry.
#
# Note that the latest public API is documented using JSDocs and is available in api.txt.
#

Version 0.2.0 {af35a7b1a5872beed588f70d3ee0f345} 2016-12-16
- Playback 1

Version 0.1.6 {8104f3c63cfe1b16b94e32ea3f811012} 2016-12-14
- Added the ability to optionally connect to a business network

Version 0.1.5 {cf91d9289c591bbc9a70bb69edae3f7b} 2016-12-08
- Removed registerUser method (method moving to client API).

Version 0.1.4 {3c171e68f06729b2ceada25d43667b4f} 2016-12-06
- Added registerUser method.

Version 0.1.3 {cf91d9289c591bbc9a70bb69edae3f7b} 2016-12-01
- Removed unimplemented parameter

Version 0.1.2 {65d463428565e7b1a2662b77b9611c1f} 2016-11-29
- Added update and undeploy methods. Removed force parameter from deploy.

Version 0.1.1 {f9dcdecdc5b3fe404d06330086d8ef7c} 2016-11-28
- Renamed Admin class to AdminConnection and AdminConnection.createConnectionProfile to AdminConnection.createProfile

Version 0.1.0 {381a30441aab8066ed57615f174388a2} 2016-11-24
- Initial admin API
9 changes: 9 additions & 0 deletions packages/concerto-admin/header.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*
* IBM Confidential
* OCO Source Materials
* IBM Concerto - Blockchain Solution Framework
* Copyright IBM Corp. 2016
* The source code for this program is not published or otherwise
* divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*/
29 changes: 29 additions & 0 deletions packages/concerto-admin/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* IBM Confidential
* OCO Source Materials
* IBM Concerto - Blockchain Solution Framework
* Copyright IBM Corp. 2016
* The source code for this program is not published or otherwise
* divested of its trade secrets, irrespective of what has
* been deposited with the U.S. Copyright Office.
*/

'use strict';

/**
* <p>
* The ibm-concerto-admin module. Defines the administration API for Concerto.
* </p>
* <p>
* Concerto is a framework for creating blockchain backed digital networks and
* exchanging assets between participants via processing transactions.
* </p>
* @module ibm-concerto-admin
*/
module.exports.AdminConnection = require('./lib/adminconnection');

/**
* Expose key concerto-common classes to simplify client application dependencies
* @ignore
*/
module.exports.BusinessNetworkDefinition = require('@ibm/ibm-concerto-common').BusinessNetworkDefinition;
33 changes: 33 additions & 0 deletions packages/concerto-admin/jsdoc.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"tags": {
"allowUnknownTags": true,
"dictionaries": ["jsdoc","closure"]
},
"source": {
"includePattern": ".+\\.js(doc|x)?$",
"excludePattern": "(^|\\/|\\\\)_|(chaincode|node_modules|out|scripts).+"
},
"plugins": [],
"templates": {
"logoFile": "",
"cleverLinks": false,
"monospaceLinks": false,
"dateFormat": "ddd MMM Do YYYY",
"outputSourceFiles": true,
"outputSourcePath": true,
"systemName": "IBM Concerto",
"footer": "",
"copyright": "Copyright IBM Corp. 2016",
"navType": "vertical",
"theme": "spacelab",
"linenums": true,
"collapseSymbols": false,
"inverseNav": true,
"protocol": "html://",
"methodHeadingReturns": false
},
"markdown": {
"parser": "gfm",
"hardwrap": true
}
}
Loading

0 comments on commit 2689269

Please sign in to comment.