946ec3c04e
ignored flaky test:
2018-03-20 16:26:34 +00:00
ac9cb59a6e
Fix RPC flaky test ( #2849 )
...
* fix rpc reconnect flaky test; remove obsolete rpcproxy log message
* rpc client proxy: replace lock with atomic variable
* rpc client proxy: removed volatile property
* RPCStabilityTests: used eventually() method to test async response
* RPCStabilityTests: remove unused import
2018-03-20 16:23:29 +00:00
144632818c
Adding the X509CRL custom serializer. ( #2844 )
...
CORDA-1233
* Adding the X509CRL custom serializer.
* Addressing review comments
2018-03-20 15:42:25 +00:00
182294913a
CORDA-2615: Added description for configFile option in deployNodes Cordform Gradle task. ( #2825 )
2018-03-20 12:53:41 +00:00
cd038ea107
Fixed docsite on incorrect node config filename required for bootstrapping a local network. ( #2848 )
2018-03-20 11:42:48 +00:00
8a62af57e6
Merge pull request #583 from corda/corda/tudor-os-merge-1
2018-03-20 11:32:50 +00:00
4650d803d1
Merge pull request #555 from corda/mnesbit-add-copyright-to-bridge
...
Add copyright to new bridge files
2018-03-20 11:23:09 +00:00
a80be413e0
Merge remote-tracking branch 'open/master' into corda/tudor-os-merge-1
2018-03-20 10:20:17 +00:00
1a1cd94161
ENT-1564 - add additional uploader check to the HashConstraint ( #2845 )
2018-03-20 10:17:44 +00:00
8ed6c556e4
Add copyright to new bridge files
2018-03-20 10:07:08 +00:00
9fff66257b
Merge pull request #569 from corda/mnesbit-socks-proxy-support
...
ENT-1614: Add SOCKS proxy capability to the AMQP Bridges
2018-03-20 09:06:06 +00:00
5abe672d1f
Merge pull request #581 from corda/chrisr3-os-merge
...
Merge from OS up to a4242b58
2018-03-20 08:32:31 +00:00
5a05704d7a
Expands shell limitations section.
2018-03-20 08:14:33 +00:00
b500371b4e
Merge commit 'a4242b5805df362ac562d758f48ea11da18df89b' into chrisr3-os-merge
2018-03-19 20:22:55 +00:00
a4242b5805
CORDA-1224: Remove @JvmStatic annotations. ( #2847 )
2018-03-19 20:11:50 +00:00
2905989d19
Merge pull request #578 from corda/merges/march-19-14-41
...
Merges: March 19th at 14:41
2018-03-19 16:34:20 +00:00
8a561cddbf
Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41
...
# Conflicts:
# client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
# node/src/main/java/CordaCaplet.java
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-03-19 15:17:49 +00:00
24c0588a92
Key store passwords not required in the command line for the private key copying tool. ( #577 )
...
If not provided they will be asked for via the command line.
2018-03-19 15:06:23 +00:00
8591ae2dc9
CordApps back in node classpath ( #2843 ) [CORDA-1232]
2018-03-19 14:34:02 +00:00
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell ( #2831 )
2018-03-19 14:20:10 +00:00
c964e50696
Trying to improve stability of RPCStabilityTests.client reconnects to rebooted server ( #2842 )
...
Prior to this change it was intermittently failing with:
```
net.corda.client.rpc.RPCException: RPC server is not available.
at net.corda.client.rpc.internal.RPCClientProxyHandler.invoke(RPCClientProxyHandler.kt:222)
at com.sun.proxy.$Proxy79.ping(Unknown Source)
at net.corda.client.rpc.RPCStabilityTests$client reconnects to rebooted server$1$pingFuture$1.invoke(RPCStabilityTests.kt:251)
at net.corda.client.rpc.RPCStabilityTests$client reconnects to rebooted server$1$pingFuture$1.invoke(RPCStabilityTests.kt:36)
at net.corda.core.internal.concurrent.ValueOrException$DefaultImpls.capture(CordaFutureImpl.kt:107)
at net.corda.core.internal.concurrent.OpenFuture$DefaultImpls.capture(CordaFutureImpl.kt:65535)
at net.corda.core.internal.concurrent.CordaFutureImpl.capture(CordaFutureImpl.kt:119)
at net.corda.core.internal.concurrent.CordaFutureImplKt$fork$$inlined$also$lambda$1.run(CordaFutureImpl.kt:22)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:748)
```
2018-03-19 13:19:40 +00:00
327d7d8acf
Added sign helper method to CertificateAndKeyPair for producing SignedDataWithCert objects ( #2841 )
2018-03-19 12:47:23 +00:00
6885661b66
Initial cut of SOCKS proxy support
...
Correct the reconnect logic when SOCKS proxy is in the pipeline
Add integration tests and adjust handling of reconnect
Rename parameter
2018-03-19 11:37:46 +00:00
a26c5c1483
Fixing exception logging for the HSM cert generator ( #561 )
2018-03-19 08:26:27 +00:00
fef30e49a8
Merge pull request #576 from corda/merges/1 2018-03-16
...
Merge OS to Enterprise.
2018-03-19 08:18:40 +00:00
060f7cc3cb
Using CordaX500Name in the doorman database entity objects (ENT-1524) ( #573 )
...
certificate_signing_request.legal_name is nullable - invalid names from CSRs are not stored in the db.
2018-03-16 18:45:28 +00:00
908a3badf1
Merge pull request #572 from corda/aslemmer-merge-DP3-bla
...
Squash of changes on DP3
2018-03-16 17:57:26 +00:00
c4dc8accde
Merge remote-tracking branch 'remotes/opensource/master' into merges/1
2018-03-16 17:52:01 +00:00
48ab7193f4
Revert "ENT-1439 Delegate SecureRandom to thread-local ( #551 )" ( #574 )
...
This reverts commit 58e0e8c1f5
2018-03-16 17:48:27 +00:00
dc595792e7
github issue #2630 : missing rpc info at node startup ( #2839 )
2018-03-16 17:14:25 +00:00
fb37a5bcf1
CORDA-792 Fix local shell in trader demo and SIMM valuation demo. ( #2837 )
...
Added rpcSettings to start RPC so the local shell can connect to the node.
2018-03-16 16:41:34 +00:00
58e0e8c1f5
ENT-1439 Delegate SecureRandom to thread-local ( #551 )
...
* Use SHA1PRNG only
* Minimise CryptoUtils diff
2018-03-16 16:26:14 +00:00
5b7f06a39d
Direct bootstrapper link instead of manual build.
2018-03-16 16:07:39 +00:00
bb2643cf2e
Add hard restart test
...
Remove default async db flush
Add in-memory P2P deduplication until we commit the ID persisting tx
Add some explaining comments
Make scheduled state kickoffs atomic with flow starts
2018-03-16 15:43:20 +00:00
d60e0098f2
Removes the glossary and FAQ. Points people to StackOverflow for troubleshooting.
2018-03-16 13:41:38 +00:00
286d1e5add
Propagate cordApp classloader to shell [CORDA-1228] ( #2833 )
2018-03-16 13:28:04 +00:00
6d99f7e5d4
Adding CRL signing ( #528 )
...
* Adding CRL signing
* Adding CRL
* Addressing review comments
* Address review comments
2018-03-16 11:48:41 +00:00
06ec20379c
Clarifies that shell doesn't require RPC permissions.
2018-03-16 11:37:23 +00:00
c2b7755824
Merge pull request #568 from corda/ags_2018-03-16
...
OS merge 2018-03-16
2018-03-16 11:34:30 +00:00
78b2bc7549
network_map table references the network_parameters table (ENT-1524). ( #567 )
2018-03-16 10:57:30 +00:00
a2d65f1a6b
Improve error reporting in case of failure of flaky tests ( #2828 )
...
* Improve error reporting in case of failure of flaky tests
Also eliminate warnings and other minor changes.
* Address code review comments raised by @exFalso
Also improve output for stack traces.
2018-03-16 10:55:48 +00:00
9f80cfa249
Remove superfluous @JvmStatic annotation. ( #2832 )
...
This annotation was applied because of a misunderstanding of what it actually did.
2018-03-16 10:31:48 +00:00
3c38cb9b2a
Merge remote-tracking branch 'open/master' into ags_2018-03-16
2018-03-16 09:58:52 +00:00
59d4a2c7fe
Merge pull request #2806 from corda/merge/CORDA-1075
...
CORDA-1075: Add 'bye' and 'exit' commands to Shell.
2018-03-16 09:57:00 +00:00
2a898658c2
ENT-1561 - Identity copying tool for distributed notary ( #563 )
...
* check in before shelving this task
* keytool in-progress, TODO: Docs and more test
* unit test and doc
* minor typo
2018-03-16 09:42:27 +00:00
180abcb462
CORDA-1208: Remove unnecessary annotation from entity
2018-03-16 09:08:29 +00:00
a99a910730
Removed duplicate SignedNetworkParameters and SignedNetworkMap type aliases ( #562 )
2018-03-15 20:55:40 +00:00
8e3e1d7485
Merge pull request #564 from corda/andrius-merge-1503
2018-03-15 18:16:19 +00:00
ac33e9401a
Post merge fixes:
...
- Fix request log entity annotation
- Regenerate db migration changesets
- Shorten constraint names to fit under 30 chars.
2018-03-15 17:19:24 +00:00
22008327cd
Clarifies that blocking calls should take a timeout
2018-03-15 17:10:39 +00:00
