8d03da2f8d
Fix compilation error
2018-09-06 11:34:12 +01:00
b8a4b68495
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180906
...
# Conflicts:
# docs/source/contributing-index.rst
# docs/source/contributing.rst
# docs/source/running-a-node.rst
# node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/main/kotlin/net/corda/node/Corda.kt
# node/src/main/kotlin/net/corda/node/NodeArgsParser.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
2018-09-06 11:20:45 +01:00
536ecdfe67
CORDA-1760 CLI UX guidelines ( #3686 )
...
* Create CLI UX Guidelines
* More tweaking
* Address review comments
* More tweaks
* Add recommendation for generating and installing completion files
* Update documentation to include base class information
* Use ExitCodes base class
2018-09-06 09:37:30 +01:00
3284a61afd
CORDA-1755: Modify the node to run using picocli ( #3872 )
...
* Modify Corda Node to use picocli
* Make --sshd parameter actually work
* * Some refactoring
* Fixing the issue with the --confg-file parameter
* Updating the tests
* Restore original devMode behaviour
* Update documentation
* Add return code to network bootstrapper
* Use the root jar for the shell alias for jars packaged with capsule
* Update Corda jar description
* Fix issue with logging not initialising early enough in node
Make initLogging overridable
Combine --verbose and --log-to-console options
* Tidy up
* Make sure all command line options are documented properly
* Fix compilation error
* Remove code that's no longer needed (single slash options no longer supported unless explicitly specified)
* Remove comment
* Remove pointless comment
* Log commandline arguments
* Address review comments
* Address more review comments
* Remove ConfigFilePathArgsParser
* Remove some unused importss
* Only display config when in dev mode
* Force Ansi ON if on Windows else set to AUTO.
* Make ExitCodes class open
2018-09-06 09:37:04 +01:00
304dba704e
Support HA without load balancer ( #3889 )
...
Allow configuration in node for additional advertised addresses.
fix logic error
Use empty list as default config not null
Allow multiple addresses in NodeInfo
Describe new additionalP2PAddresses property in docs.
Add integration test of additionalP2PAddress feature
Fixup after rebase
Address PR comment
Address PR comments by removing unused element of NodeAddress
2018-09-05 17:46:46 +01:00
e3ece00bea
ENT-1906: Publish DJVM artifact with its dependency information. ( #3897 )
...
Also migrate enclavelet code into testing:common jar.
2018-09-05 15:57:12 +01:00
9373c0fb8e
Removed the superfluous NetworkMapCacheImpl class ( #3882 )
...
NetworkMapCacheImpl and NetworkMapCacheBaseInternal interface merged into PersistentNetworkMapCache and NetworkMapCacheInternal interface respectively.
2018-09-05 14:10:37 +01:00
541a0d7d5b
ENT-1906: Remove SLF4J's JUL logging bridge from DJVM. ( #3895 )
...
* Remove SLF4J's JUL logging bridge from DJVM.
* Refactor SLF4J's Log4J back end into the CLI.
2018-09-05 14:05:52 +01:00
4ee63c77d7
Merge pull request #1371 from corda/os_ent_merges/caseSensitiveOsFix
...
Fixed compilation error for case-insensitive operating systems. (#3896 )
2018-09-05 13:31:43 +01:00
ce0bf9eb2e
Fixing compilation.
2018-09-05 13:11:53 +01:00
481f2c1b93
Fixed compilation error for case-insensitive operating systems. ( #3896 )
...
(cherry picked from commit 2fbeab1365
2018-09-05 13:10:05 +01:00
2fbeab1365
Fixed compilation error for case-insensitive operating systems. ( #3896 )
2018-09-05 13:06:05 +01:00
f2784197c7
Minor: fix old warning in Corda 1.0 docs, don't recommend use of Jigsaw yet.
2018-09-05 13:22:56 +02:00
7f3bcbe7c3
Tidy up DemoBench's fallback logging configuration for JUL. ( #3894 )
2018-09-05 12:14:35 +01:00
be45096082
CORDA-1864: Added getter for network parameters to RPC ( #3892 )
2018-09-05 11:17:13 +01:00
ce65a58c7c
CorDapp minimum and target version design doc. ( #3798 )
2018-09-05 11:12:35 +01:00
5b255c81a8
ENT-1906: Trivial tweaks to DJVM code. ( #3890 )
...
* Trivial tweaks to DJVM code.
- Use ASM Type.getInternalName()
- Use @JvmDefault annotation
- Declare test base class as abstract
- Ensure test Log4J configuration has precedence
- Replace assert() with require()
- Replace simple lambdas with function references
* Publish corda-djvm artifact.
* Migrate Utilities class into the CLI tool.
* Configure unit tests for console logging.
2018-09-05 10:12:48 +01:00
1032b44f18
Merge pull request #1370 from corda/fixes/certificateStoreStubs
...
OS -> ENT merge: fixing a bug in certificate store stubs.
2018-09-04 17:42:19 +01:00
b36240a7e7
Merge remote-tracking branch 'remotes/open/master' into fixes/certificateStoreStubs
2018-09-04 17:33:29 +01:00
0b495098a8
[CORDA-1937]: Fixes to enterprise float and bridge.
2018-09-04 17:33:05 +01:00
a7f9320985
Fixedd a mistake in CertificateStoreStubs. ( #3893 )
2018-09-04 17:31:42 +01:00
4931b77dd4
Update labels of nightly performance test plan ( #1366 )
2018-09-04 16:24:43 +01:00
b4a64625fc
Merge pull request #1368 from corda/os_ent_merges/CORDA-1937
...
OS -> ENT merges: CORDA-1937
2018-09-04 13:39:03 +01:00
c77a75bc10
[CORDA-1937]: Fixes to enterprise float and bridge.
2018-09-04 11:28:21 +01:00
31e58dd2e5
[CORDA-1937]: Fixes to enterprise float and bridge.
2018-09-04 11:20:34 +01:00
a28fa69865
Updated repository lists to reduce dependency on Jitpack and removed unused repositories.
2018-09-04 11:19:03 +01:00
fbaa31e9d2
Merge remote-tracking branch 'open/master' into os_ent_merges/CORDA-1937
...
# Conflicts:
# client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt
# core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-09-04 11:07:50 +01:00
487d227d71
Merge pull request #1365 from corda/mike-merge-f6ee263db10
...
Merge to f6ee263db1
2018-09-04 11:03:56 +01:00
5356eddcca
Fix another case where platformVersion=1
2018-09-04 11:33:50 +02:00
d01dd22419
[CORDA-1937]: Refactor NodeConfiguration hierarchy. ( #3856 )
2018-09-04 10:26:10 +01:00
97aef9c8a1
Merge remote-tracking branch 'open/master' into mike-merge-f6ee263db10
2018-09-03 20:13:38 +02:00
f6ee263db1
Minor: improve docs for CordaRPCClientConfiguration and deprecate a field that is no longer used.
2018-09-03 19:05:47 +02:00
33f5aa4190
RPC: make the client library require the platform version it is built for.
...
Remove an unnecessary override on the CordaRPCOps interface.
2018-09-03 19:05:47 +02:00
0f8a6e44ea
RPC: allow trackRpcCallSites to be set from the command line. Add logging.
2018-09-03 19:05:47 +02:00
f856a77c96
Fix demo bench issue stopping nodes starting up with max transaction size > max message size
2018-09-03 19:05:17 +02:00
f6466cde41
Make UI better when labels overflow.
2018-09-03 19:05:17 +02:00
ceb47c9938
RELEASE - Fixed build.gradle issues that break maven central publishing and standardised dependency specification.
2018-09-03 19:04:21 +02:00
9eae4e5303
Clarify user to create the "corda" users
...
root/sys admin should create the corda user
2018-09-03 19:01:41 +02:00
c3c245e7ac
Fix codestyle
2018-09-03 18:58:16 +02:00
643ad31736
Add tests to confirm that if a Hibernate error occurs the transaction will fail and no states will be persisted
...
Add tests to NodeVaultServiceTest
Add VaultFlowTest
Add UniqueDummyFungibleContract and UniqueLinearContract to be used in the constraint tests
2018-09-03 18:58:16 +02:00
11e2bef240
ENT-2473: Removed copyright headers ( #1364 )
2018-09-03 16:38:52 +01:00
793a52c57a
[CORDA-1542]: Exception error codes aren't stable (fixed). ( #3887 )
2018-09-03 14:27:24 +01:00
91dfa277e3
CORDA-1938 adding VersionInfo to the node info submission ( #3886 )
2018-09-03 14:04:36 +01:00
112f78c012
Nightly test of the firewall ( #1359 )
2018-09-03 09:07:40 +01:00
bdc67f453e
Stop bootstrapper errors caused by maxTransactionSize > maxMessageSize
2018-09-01 13:15:27 +02:00
9544fac2c0
Clean up of MerkleTransaction.kt ( #3880 )
...
Primarily making the deserialiseComponentGroup method simpler.
2018-08-31 12:44:53 +01:00
8e6a9818b7
CORDA-1932 Fixing network map certificate path verification ( #3843 )
...
* CORDA-1932 Fixing network map certificate path verification to be certificate hierarchy agnostic
* Addressing review comments
2018-08-31 09:35:36 +01:00
d7b85b4928
CORDA-1934 Renaming INTERMEDIATE_CA certificate role to DOORMAN_CA certificate role ( #3844 )
2018-08-31 09:35:06 +01:00
f22d9ad411
CORDA-1938 Adding version info to the node info submission request ( #3854 )
2018-08-31 09:34:42 +01:00
06bc0048e1
Merge pull request #1362 from corda/szymonsztyka/os-merge-20180830
...
OS -> ENT merge 20180830
2018-08-30 17:21:51 +01:00
