ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 17:57:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,311 Commits 91 Branches 405 Tags 354 MiB
fe2b76ffd5
Commit Graph

10311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
szymonsztuka
5e901d4950 [ENT-1153] fix merge - database description was duplicated, adhere to OS version 2017-11-29 11:37:48 +00:00
Katelyn Baker
a81352acbb
Merge pull request #2138 from corda/kat/feature/enumEvolution 
CORDA-553 - Plumb the transform schema into the AMQP serialisation framework
 2017-11-29 11:28:19 +00:00
szymonsztuka
c32c21bc48 [ENT-1153] fix merge - revert feature for database integration test (Enterprise feature) 2017-11-29 10:51:49 +00:00
Andrzej Cichocki
dbe2dca7b9
CORDA-654 Make VaultFiller a class so I can change its hardcoded bits (#2141) 2017-11-29 09:49:34 +00:00
Viktor Kolomeyko
1b5eeaaad0
Create a dedicated Log4J2 file for NodeExplorer and output logging configuration used. (#2142) 2017-11-28 17:51:30 +00:00
Michele Sollecito
cb1fa2e017
Corda now works with H2 without the need to allow Hibernate to create the database automatically. (#2124) 
[CORDA-815]: Corda now instructs Hibernate to either adjust or validate the schema based on `devMode` property.

Also renamed property `database.initDatabase` to `database.createSchemaAutomatically`.

* [CORDA-815]: Renamed database.initDatabase to database.adjustSchemas.

* Code review changes: removed property `database.initDatabase` altogether.

* Code review changes: removed property `database.initDatabase` altogether.

* Code review changes: removed property `database.initDatabase` altogether.

* Code review changes: removed property `database.initDatabase` altogether.
 2017-11-28 17:33:02 +00:00
Katelyn Baker
c88c6202b9 CORDA-553 - Review comments 2017-11-28 17:27:53 +00:00
Christian Sailer
f84be2a86b Put in correct notary name 2017-11-28 16:50:39 +00:00
Christian Sailer
c82d167296 Order of parameters 2017-11-28 16:49:16 +00:00
Christian Sailer
d9e0aa9068 Add missing constructor parameter 2017-11-28 16:37:14 +00:00
Christian Sailer
277d528849 Fix names in jmx request 2017-11-28 16:33:40 +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
Andrzej Cichocki
74bf00c155
Show origin test in ThreadLeakException. (#2143) 
and downgrade an error to warn
 2017-11-28 14:11:22 +00:00
Patrick Kuo
cc1fba641e
Integration test for http network map service (#2078) 
* make node info file copying optional by setting "compatabilityZoneURL" in driver
integration test for node using http network map using driver
some bug fixes

* rebase to feature branch and fixup

* add initialRegistration flag to driver

* remove useFileBaseNetworkMap flag, add network map server to DriverTest

* remove useFileBaseNetworkMap flag, add network map server to DriverTest

* use PortAllocation.Incremental instead of random

* * use PortAllocation.Incremental instead of random
* fix NodeInfoWatcher thread leak issue

* reset scheduler before create notary

* move port allocation out of companion object

* move port allocation out of companion object

* make node info file copier lateinit to avoid observable thread pool get created on init
 2017-11-28 13:58:48 +00:00
Andrzej Cichocki
ff9e7474b1
CORDA-654 Make MOCK_IDENTITIES less special (#2114) 
* Make rigorousMock usable from Java
* Show args in mock failure message
 2017-11-28 11:35:59 +00:00
Tudor Malene
7d75d95dc2 [ENT-1153]: fix merge 2017-11-28 10:42:40 +00:00
bpaunescu
614779d4ec
ENT-1128 fix node restarts when using AzureSQLServer (#2139) 2017-11-28 10:32:30 +00:00
Katelyn Baker
4c2f0d7913 Fix broken unit test 
At the moment the test just asserts we can't evolve enums, it's a
placeholder for the next phase of the changes
 2017-11-28 10:03:01 +00:00
Katelyn Baker
f135d57820 CORDA-553 - Plumb the transform schema into the AMQP serialisation framework 
This change doesn't enable anything, it just changes the code to pass
around both relevant schemas instead of a single one from the AMQP
envelope. The actual evolver will build ontop of this
 2017-11-27 19:23:12 +00:00
Andrzej Cichocki
4bd6fef0f9
StateMachineManager is no longer lateinit. (#2123) 2017-11-27 17:55:08 +00:00
Shams Asari
9fefabbb88 Merge branch 'master' into shams-master-merge-271117 2017-11-27 17:08:13 +00:00
Shams Asari
4ca54b73fe Added tests to make sure the platform version is correctly available 2017-11-27 17:04:19 +00:00
Tudor Malene
a982bb2ae6 [ENT-1153]: fix merge 2017-11-27 16:55:06 +00:00
Tudor Malene
e8d833c2fe Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT 
# Conflicts:
#	.idea/compiler.xml
#	docs/source/changelog.rst
#	node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
 2017-11-27 16:52:29 +00:00
Shams Asari
2ceb6283af Moved X509Utilities, and some other crypto utilities in node, into node-api so that they can be used by services outside of the node. 
There's also some cleanup as well.
 2017-11-27 15:49:33 +00:00
Tudor Malene
0e3713237b
rename table "link_nodeinfo_party" to "node_link_nodeinfo_party" (#2135) 2017-11-27 15:08:52 +00:00
Shams Asari
1705df4d1f Made the database config option typesafe, rather than relying on String properties 2017-11-27 13:51:53 +00:00
Joel Dudley
c4b333c50c
Updates permissioning docs to address RGB review comments. 2017-11-27 13:36:52 +00:00
Andrzej Cichocki
449155cea3
IdentityService is no longer obtained lazily. (#2130) 2017-11-27 12:34:33 +00:00
Christian Sailer
8240f7ba2f Add second request type 2017-11-27 11:09:51 +00:00
Patrick Kuo
20337aaa25 Network permissioning new doc 2017-11-24 18:06:01 +00:00
Christian Sailer
aab2ad58d9 Hook up anonymised payment and add test for that + some code reformatting 2017-11-24 14:54:57 +00:00
Christian Sailer
0b7678b8ec Flow to issue cash and pay using the returned tx id rather than a vault 
query to find the new state
 2017-11-24 14:25:56 +00:00
Christian Sailer
792089e179 Unit test for CashIssueAndPaymentFlow 2017-11-24 14:23:37 +00:00
David Lee
71681e0e0a
Merge pull request #106 from corda/dl-float-design-doc 
Current design doc baselined - please raise future updates via a separate PR
 2017-11-24 14:02:05 +00:00
josecoll
1befa35055
Design Review Process (#94) 
Design Review Process V1.0
 2017-11-24 13:39:13 +00:00
Alberto Arri
ffd693719a
docs for additional-node-infos (#2107) 
* docs for additional-node-infos
 2017-11-24 13:27:30 +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
Christian Sailer
2fa39dc7d3 Merge branch 'master' of https://github.com/corda/enterprise into christians-jmeter-flows 2017-11-24 10:05:35 +00:00
Viktor Kolomeyko
c516a4b028
R3NET-546: Business Network PoC work (#101) 2017-11-24 09:59:35 +00:00
Rick Parker
ca2267f87f
Tidy up (#128) 2017-11-23 17:19:30 +00:00
Maksymilian Pawlak
ce9b6c1f18
CORDA-311-post PR merged fixes (#2106) 
* SSH server integration
 2017-11-23 16:34:57 +00:00
Konstantinos Chalkias
502d0df630
Mutual TLS auth - mixed RSA and ECDSA keys (#2095) 2017-11-23 16:07:08 +00:00
Tudor Malene
cdf061379e
ENT-1142 - added ddl scripts for postgres and missing idx to sqlserver (#127) 2017-11-23 15:59:59 +00:00
Christian Sailer
b38036cf67 Merge branch 'master' of https://github.com/corda/enterprise into christians-jmeter-flows 2017-11-23 15:35:03 +00:00
Christian Sailer
936d25db16 Add issue and pay sampler 2017-11-23 15:30:19 +00:00
Ross Nicoll
026d88a2b9 Add X500 name constraints for non-organisation attributes (#2108) 
Enforce X500 name constraints consistently across all attributes
 2017-11-23 12:42:45 +00:00
Joel Dudley
228b29110e Adds upgrade notes for v1 to v2. Minor tweaks (e.g. ToC). 2017-11-23 12:42:45 +00:00
Ross Nicoll
8bf6dae29d Re-introduce demo docs (#1981) 
Document the included samples in the docs again so there's some continuity from v1 docs, while making it clear they're not best practice examples but instead illustrate solutions to various use-cases.
 2017-11-23 12:42:45 +00:00
Joel Dudley
20b57a359f Removes outdated devmode cert info, links to existing docs to avoid duplication. 2017-11-23 12:42:45 +00:00