ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-16 09:05:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13,742 Commits 99 Branches 407 Tags
Commit Graph

2961 Commits

Author SHA1 Message Date
Shams Asari
1c012f6403
Back porting clean up of FlowFrameworkTests.kt made in ENT (#4218) 2018-11-12 18:38:47 +00:00
Anthony Keenan
369f23e306
CORDA-1817: Fix issue with misleading capsule error messages (#4215) 
* Make caplet respect all acceptable combinations of cmd line parameters

* If cordapp dir fails to create, still run corda.jar and let it fail gracefully

* Don't parse additional options as the parameter for the previous one.

* Remove commented lines
 2018-11-12 17:22:22 +00:00
Michele Sollecito
dc62b20c5d
[CORDA-1879]: Ensure Node dies on unrecoverable errors. (#4213) 2018-11-12 15:56:04 +00:00
Matthew Nesbit
2600376773 Acknowledge all artemis messages 2018-11-12 14:01:45 +00:00
Michele Sollecito
ac23fcdf24
[CORDA-2208]: NodeHandles hashcode attemps an RPC invocation. (#4217) 2018-11-12 13:50:10 +00:00
Shams Asari
fab0c5cd2c
Merge pull request #1561 from corda/os-merge-99e9864 
O/S merge 99e9864
 2018-11-12 12:37:31 +00:00
Konstantinos Chalkias
23907c40d9
[CORDA-2210] Add matching party on the first X500 attribute match (#4211) 2018-11-12 11:59:04 +00:00
Shams Asari
2e9d7ce811 CORDA-2129: Ported changes in SingleThreadedStateMachineManager to MultiThreadedStateMachineManager 
Introduced a new FlowFrameworkTestsUsingMultithreadedSMM test class to test the changes. In the process extracted out the multiple test classes in FlowFrameworkTests.kt.
 2018-11-12 10:44:40 +00:00
Konstantinos Chalkias
81418ca7e7
[CORDA-2200][CORDA-2202] More tests for BCCryptoService and CryptoServiceException (#4190) 2018-11-12 09:38:06 +00:00
Roger Willis
4684259970
Expose JPA to flows (#4140) 
* First pass
* Update test.
* Address review comments.
* Added docs and kdocs.
* Clean-up.
* Add extra test.
* Changes to docsite.
* Added try/catch block as recommended by Andras.
* Removed try catch block. It's not required as the checkpoint serialiser deals with this.
* Re-used existing DB session instead of creating a new session.
* Entity manager auto flushes.
* Added java friendly api.
* Addressed review comments.
 2018-11-09 17:47:36 +00:00
bpaunescu
7fbe8e7de7
renamed external artemis config properties for consistency (#1555) 2018-11-09 16:47:12 +00:00
Michal Kit
32ff24ddc7
ENT-2706 Fixing the CRL issuer cert lookup (#1556) 
* ENT-2706 Fixing the CRL issuer cert lookup

* Addressing review comments

* Reverting imports
 2018-11-09 16:20:00 +00:00
Shams Asari
4801942a87 Merge branch 'merge-99e9864' into os-merge-99e9864 
# Conflicts:
#	.gitignore
#	.idea/codeStyles/Project.xml
 2018-11-09 14:53:26 +00:00
Andrius Dagys
336185de23
CORDA-2190: Improve notary service flow exception handling (#4200) 
* CORDA-2190: Improve notary service flow exception handling

- Refactored notary flows to reduce validation code duplication
- Improved notarisation error handling to provide more helpful responses to the client
 2018-11-09 14:00:40 +00:00
Michal Kit
2f644039b5
CORDA-2205 Fixing CRL issuer store lookup (#4205) 2018-11-09 13:45:23 +00:00
Michele Sollecito
72be3aa830
Merge pull request #1553 from corda/merges/08_11_2018_16_05 
Merges: 08/11/2018 at 16:05
 2018-11-09 10:50:39 +00:00
Michele Sollecito
420b2ccd40 Merge branch 'master' into merges/08_11_2018_16_05 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/config/EnterpriseConfiguration.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-11-08 18:20:02 +00:00
Michele Sollecito
6a90f42eba Added enterprise specific fields to V1NodeConfigurationSpec. 2018-11-08 18:00:47 +00:00
Michele Sollecito
b6b37ad6f4 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:54:09 +00:00
Michele Sollecito
545dd25ef3 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:25:41 +00:00
Michele Sollecito
69921669e7 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:18:44 +00:00
Michele Sollecito
92ab3ab025 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:17:26 +00:00
Matthew Nesbit
0b134eee86 Improve artemis client shutdown time when disconnected and don't block on commit if Artemis is already closing. 2018-11-08 17:04:13 +00:00
Shams Asari
d4474e87e1
CORDA-2129: Attempts to initiate a flow that's unknown is paused and instead sent to the flow hospital (#4181) 
This allows for the case of a missing CorDapp to be installed on node restart and recover the original flow initiate request.
 2018-11-08 17:03:17 +00:00
Michele Sollecito
1671f7da31 Working on merging changes to NodeConfigurationImpl. 2018-11-08 17:00:03 +00:00
Michele Sollecito
fe581f8cf1 Working on merging changes to NodeConfigurationImpl. 2018-11-08 16:52:30 +00:00
Michele Sollecito
bd336ed4a7 Fixed compilation for NodeConfigurationImplTest 2018-11-08 16:48:11 +00:00
Michele Sollecito
11c7c879eb Merge remote-tracking branch 'remotes/open/master' into merges/08_11_2018_16_05 
# Conflicts:
#	docs/source/corda-configuration-file.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-11-08 16:39:09 +00:00
bpaunescu
41f5c530b2
ENT-2577 Custom SSL props for external Artemis connections (#1549) 
* ENT-2577 added additional node config for external artemis ssl config

* ENT-2577 update tests for external p2p broker

* ENT-2577 rename new config
 2018-11-08 16:31:02 +00:00
Michele Sollecito
6c749889d0
[CORDA-1993]: Replace reflection-based NodeConfiguration parsing with versioned property-based parsing mechanism. (#4132) 2018-11-08 15:56:00 +00:00
Rick Parker
9277042db8
ENT-2695 Restore async logging (#4195) 
* Replace error code generation technique with custom event re-writer.
Switch to RandomAccessFile appenders because they supposedly give higher throughput.

* Review feedback
 2018-11-08 14:33:45 +00:00
szymonsztuka
bac265d418
Merge pull request #1548 from corda/merges/os-merge-to-ecbf23a 
Merge OS ->ENT to ecbf23a.
 2018-11-08 12:02:31 +00:00
Viktor Kolomeyko
400346fff0
ENT-2669: Introduce option for HTTP proxy for outbound Bridge connectivity (#1537) 
* ENT-2669: Introduce option for HTTP proxy for outbound Bridge connectivity

One of our customers currently using HTTP proxy without which outbound connection from Corda Node cannot be established.
Also, propagate `trace` setting correctly down the Bridge stack.

* ENT-2669: Compilation fixes.

* ENT-2669: Revert deleted constructor back.

* ENT-2669: First stub on HTTP Proxy integration test.

* ENT-2669: Minor changes.

* ENT-2669: Reduce test to bare minimum.

* ENT-2669: Attempt to write own HttpProxy.

* ENT-2669: Another attempt to make programmatic HttpProxy work.

* ENT-2697: Disable DNS resolution before sending requests to proxies.

* ENT-2669: Switch to use Jetty HttpProxy for integration testing.

* Adds a pipeline logger ahead of the proxy stage if trace is set. The logging is removed once the proxy completes.

Define a constant for pipeline stage.
 2018-11-08 09:04:36 +00:00
szymonsztuka
44dfa23ad5 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-ecbf23a 2018-11-07 18:17:29 +00:00
Stefano Franz
90597e1736
really disable building installer dist on OS X (#1547) 2018-11-07 18:16:51 +00:00
Dominic Fox
f3b372d31d
CORDA-2099 make serializer factory interface (#4137) 
* Separate SerializerFactory construction from concrete implementation

* Fewer build methods

* Method naming that doesn't fatally confuse determinisation

* Extract SerializerFactory interface

* Reset to master's version of compiler.xml

* Un-ignore flickering test

* Remove unnecessary build method

* Whitespace

* Unused import

* Change build method

* Formatting fixes

* Fix test
 2018-11-07 13:48:45 +00:00
szymonsztuka
19510315b4 Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-to-6f00560 
# Conflicts:
#	core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalMockNetwork.kt
 2018-11-07 09:49:23 +00:00
Michal Kit
6f005605aa
CORDA-2187 & CORDA-2038: reverting maxTransactionSize <= maxMessageSize (#4166) 
* CORDA-2187 reverting maxTransactionSize <= maxMessageSize

* Addressing review comments

* Increasing the maxTransactionSize for the Bootstrapper

* Updating the testNetworkParameters
 2018-11-07 09:28:27 +00:00
josecoll
b692c59553
Merge pull request #1543 from corda/colljos-merge-to-015a36dad 
OS -> ENT merge
 2018-11-06 22:16:13 +00:00
Anthony Keenan
6fd724338a
CORDA-2183: Show root cause of error in console to aid with debugging (#4178) 
* Show root cause of error in console

* Add more explicit logical separator between message and root error

* Add default if e.cause is null
 2018-11-06 22:15:22 +00:00
szymonsztuka
d33aeb9881
Disable integration test with timing to run in database mode. (#1541) 
Disable TimedFlowMultiThreadedSMMTests running in database mode.
Added new logins for Azure SQL reference setup.
 2018-11-06 18:09:31 +00:00
josecoll
356941a733 Merge commit '015a36dad67998236eda7e45309e66e5d58b6374' 2018-11-06 16:29:24 +00:00
Christian Sailer
105091548e
Merge pull request #1540 from corda/christians/merge_3260d9f 
Merge up to  3260d9f
 2018-11-06 16:07:41 +00:00
szymonsztuka
d9c5350d4a Add SQL schema setup to new test. (#1538) 2018-11-06 13:14:46 +00:00
Konstantinos Chalkias
106eb9df4a
[CORDA-2011] [CORDA-2057] CryptoService interface and BC HSM simulation (#4099) 2018-11-06 12:57:13 +00:00
Rick Parker
59504b4439
ENT-2691 Soft locking got regressed in Enterprise (#1539) 
* Fix soft locking regression

* Fix caffeine version in core

* Fix default cache bound
 2018-11-06 11:40:28 +00:00
Christian Sailer
1f5436dcfc
CORDA-2175 Fix attachment service tests on Windows (#4168) 
* Switch to directory per test and suppress deletion exception on windows
to deal with the fact that NTFS keeps files locked to the running process
once opened.

* Closing files when we're done makes all the file locking issues go away.
 2018-11-06 11:31:23 +00:00
Christian Sailer
4d335843b2 Remove blank line and formatting 2018-11-06 11:27:18 +00:00
Christian Sailer
bbb26bc6ba Merge commit '3260d9f2c419463fb68178ce70633dd34079bd1e' into christians/merge_3260d9f 2018-11-06 11:20:55 +00:00
josecoll
015a36dad6
CORDA 2131 - Extend Network Bootstrapper to enable registration of Java Package Namespaces. (#4116) 
* Package Ownership Network Parameters: add register / unregister CLI options to network bootstrapper.

* Fix 2 failing unit tests.

* Fix failing unit tests.

* Added changelog, documentation and cosmetic changes.

* Fixed exception message.

* Address PR review feedback.

* Fix typo.

* Resolve conflicts.

* Rebase, resolve conflicts and remove PackageOwner class.

* Address latest PR review feedback.

* Fix incorrect imports.

* Fix broken JUnit

* Add support for key store passwords including delimiter characters.

* Updated and improved documentation.

* Minor doc update.

* Documentation changes following PR review feedback

* Replace Bank Of Corda with Example CorDapp.
Remove references to locally built network bootstrapper.
 2018-11-06 09:28:55 +00:00