Commit Graph

133 Commits

Author SHA1 Message Date
josecoll
c72b33841b Merge branch 'master' into colljos-os-hc02-merge-121217 2017-12-12 17:42:21 +00:00
Ross Nicoll
96d8ec9640
Dynamically add BouncyCastle provider (#185) 2017-12-12 17:07:35 +00:00
josecoll
fe2b76ffd5 Moved "TODO:fix me" comment as per Shams request. 2017-12-12 15:19:02 +00:00
josecoll
2c57165002 Fixed Doorman TEST dependencies and compilation errors following rebase from OS.
Commented out 3 test which require re-coding.
2017-12-12 15:07:58 +00:00
josecoll
7eabee1241 Fixed Doorman dependencies and compilation errors following rebase from OS. 2017-12-12 14:20:59 +00:00
josecoll
cc770e1145 Re-enabled Doorman build and removed hard dependency on specific OS branch. 2017-12-12 11:31:52 +00:00
Patrick Kuo
8af7dc977f
Doorman refactoring and improve UX (#160)
* * change corda dependencies to 3.0-NETWORKMAP_SNAPSHOT
* packages move fix

* address PR issues

* * refactorings
* cleaned up network management server start up code.
* renamed a few classes
* segregate doorman and network map config and startup code.
* make `config-file` optional, default to ./networkManagement.conf

* readme.md and UX changes

* added dependency on rpc for the serilization env

* move init serilization env to main method to avoid interfering with test

* move cert path check to the storage, and remove redundant checks in NodeInfoWebService.

* minor fix

* some refactoring

* fix broken test and added steps to start the network

* address PR issues

* write root cert to pem file

* address PR issues
fix bugs in doorman where it try to transit jira ticket to done multiple times

* address PR issue

* approve request no longer throws exception when approve again, it will simply ignore, test is no longer relevant
2017-12-11 10:06:29 +00:00
Clinton
b1bac9e103
ENT-1216: Various fixes to the doorman publishing that allows doorman (#164)
* Added corda release bucket to allow resolving gradle plugins from teamcity.
* Fixed the classifiers for doorman jar to ensure the correct one is published.
2017-12-08 16:28:28 +00:00
Patrick Kuo
b3ca36132f
Use network map objects from corda instead of stubs (#146)
* * change corda dependencies to 3.0-NETWORKMAP_SNAPSHOT
* packages move fix

* fix up after rebase

* rename test

* address PR issues

* address PR issues

* fix failing test
2017-12-07 13:22:41 +00:00
Alberto Arri
0c667fe9d3
Renable doorman test (#156)
Re-enable doorman tests
2017-12-05 14:40:32 +00:00
Alberto Arri
1a1d5c695c
Add support for TICKET_CREATED to PersistentCertificateRequestStorage (#143) 2017-12-05 14:04:12 +00:00
Alberto Arri
10635dfbfd
Disable failing doorman tests, fix is under way (#155) 2017-12-05 11:35:57 +00:00
Patrick Kuo
60bde88777
upgrade dependencies to latest (#153) 2017-12-04 23:01:50 +00:00
Clinton
bbe8fce686
Doorman and doorman HSM can now be published to artifactory and maven (#151)
Doorman and doorman HSM can now be published to artifactory and maven local.
2017-12-01 23:04:29 +00:00
Patrick Kuo
d81e4809bb
Upgrade Doorman corda dependencies to 3.0-NETWORKMAP-SNAPSHOT (#145)
* * change corda dependencies to 3.0-NETWORKMAP_SNAPSHOT
* packages move fix

* update network map corda dependencies to 3.0-NETWORKMAP-20171201.110332-5

* some refactoring and address PR issues

* remove dependency on corda core and test util

* add back testCompile dependency

* add back testCompile dependency
2017-12-01 16:16:07 +00:00
Clinton
faf6b1d5bd
Added command line flag to set mode (#130)
Added command line flag to set mode and removed it from the config. This is to provide a programmatic interface to doorman configuration for downstream
projects.
2017-12-01 15:13:41 +00:00
Clinton
7b54b82273
Removed trampoline to allow unzipping by most unzip tools. (#149) 2017-12-01 14:46:32 +00:00
mkit
c40e8e4518
Overriding network parameters if they are specified in the deployment… (#136)
* Overriding network parameters if they are specified in the deployment configuration

* Addressing review comments

* Addressing review comments

* Changing the getCurrentNetworkMap return type to be nullable
2017-11-29 16:46:36 +00:00
Alberto Arri
91c9dad6cc
Make doorman print the help if commands are missing from the command line (#139) 2017-11-28 14:20:14 +00:00
mkit
c5e17d90f2
Adding HSM signing service docs (#122)
* Adding HSM signing service docs

* Addressing review comments

* Addressing review comments - round 2

* Addressing review comments - round 3

* Fixing method comment
2017-11-24 11:32:12 +00:00
Clinton
855c22218a
Doorman can now be published to maven local (#125)
* Doorman can now be published to maven local for testing against other projects locally.

* Fixed the classifier for the JAR
2017-11-22 17:50:51 +00:00
Alberto Arri
523b064356
ENT-964 doorman jira downtimes (#120)
* ENT-964 Make doorman resilient to Jira downtimes
2017-11-22 14:54:24 +00:00
Viktor Kolomeyko
6a631ec626
Remove "?" from method name or else Windows build in IntelliJ fails (#116)
Specific error is:
Error:Kotlin: [Internal Error] java.lang.IllegalStateException: java.io.FileNotFoundException: Z:\corda-ent\network-management\out\test\classes\com\r3\corda\networkmanage\doorman\DoormanParametersTest$should throw ShowHelpException when -? is on the command line$1.class (The filename, directory name, or volume label syntax is incorrect)
	at org.jetbrains.kotlin.codegen.CompilationErrorHandler.lambda$static$0(CompilationErrorHandler.java:24)
	at org.jetbrains.kotlin.codegen.PackageCodegenImpl.generate(PackageCodegenImpl.java:74)
	at org.jetbrains.kotlin.codegen.KotlinCodegenFacade.generatePackage(KotlinCodegenFacade.java:100)
	at org.jetbrains.kotlin.codegen.KotlinCodegenFacade.doGenerateFiles(KotlinCodegenFacade.java:78)
	at org.jetbrains.kotlin.codegen.KotlinCodegenFacade.compileCorrectFiles(KotlinCodegenFacade.java:45)
	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.generate(KotlinToJVMBytecodeCompiler.kt:450)
	at org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler.compileModules(KotlinToJVMBytecodeCompiler.kt:152)
	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:158)
	at org.jetbrains.kotlin.cli.jvm.K2JVMCompiler.doExecute(K2JVMCompiler.kt:61)
	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.java:107)
	at org.jetbrains.kotlin.cli.common.CLICompiler.execImpl(CLICompiler.java:51)
	at org.jetbrains.kotlin.cli.common.CLITool.exec(CLITool.kt:92)
2017-11-20 15:27:36 +00:00
mkit
c1ae6e9647
Removing NodeInfo signing process - this task is moved to node itself (#112)
* Removing NodeInfo signing process - this task is moved to node itself

* Addressing review comments

* Introducing HSM simulator polling

* Addressing review comments
2017-11-20 12:52:30 +00:00
Alberto Arri
233f1fb8e2
Move all the configuration for running doorman in its configuration f… (#104)
* Move all the configuration for running doorman in its configuration files
2017-11-15 13:04:16 +00:00
mkit
fffcdb47da
Introducing the InputReader interface (#102)
* Introducing the InputReader interface

* Addressing review comments

* Addressing review comments
2017-11-15 08:36:24 +00:00
Alberto Arri
c56ea4088f
fix enterprise build (#108)
fix enterprise build
2017-11-14 17:27:03 +00:00
mkit
40cf4ad191
Small clean-up (#98)
* Small clean-up

* Unifying enum casing

* Adding TODOs
2017-11-14 09:44:48 +00:00
mkit
1ec40ee983
Network Map signing (#87)
* Network Map signing

* Fixing failing tests

* Fixing integration tests

* Addressing review comments

* Addressing review comments

* Rebasing to the new network parameters + network map ownership redesign

* Addressing review comments

* Addressing review comments

* Splitting the PR

* Reverting enum uppercasing

* Fixing the NetworkMapEntity comment

* Addressing review comments - round 3

* Fixing docs and adding some TODOS

* Removing nullification of the common name
2017-11-14 08:29:07 +00:00
Alberto Arri
523a6db0b9
ENT-990 Make doorman read an initial set of Network parameters from d… (#96)
ENT-990 Make doorman read an initial set of Network parameters from disk at start-up time
2017-11-13 15:40:44 +00:00
mkit
4c7dc58135
Adding HSM simulator to integration tests (#92)
* Adding HSM simulator to integration tests

* Addressing review comments

* Adjusting implementation to the agreed TC setup

* Addressing review comments

* Addressing review comments - round 2
2017-11-13 11:50:24 +00:00
alberto.arri@r3.com
bc2fd3948f Fix the description of --mode flag in doorman 2017-11-09 10:14:22 +00:00
mkit
dfb226fbbb Merging signing service and doorman (#72)
* Merging signing service and doorman

* Addressing review comments

* Removing redundant package name space from method call

* Adding description field to gradle
2017-10-20 17:19:50 +01:00