Commit Graph

1700 Commits

Author SHA1 Message Date
Ross Nicoll
4d0b23ab6f Add log4j-web to node
Add log4j-web to node so it stops complaining that it's running in a web environment without that option.
Longer term we may want to split the web parts into their own optional extra for node, but for now I think
this is a sensible solution.
2016-09-01 16:15:15 +01:00
Ross Nicoll
9cccc7a2b7 Correct warnings 2016-09-01 16:15:15 +01:00
Ross Nicoll
b913b18e02 Merged in rnicoll-simulations (pull request #314)
Move test code from node to test-utils
2016-09-01 15:21:34 +01:00
Ross Nicoll
102e3f2048 Merged in rnicoll-clause-remove-concrete (pull request #316)
Merge ConcreteClause into Clause
2016-09-01 13:42:56 +01:00
Matthew Nesbit
a77556f72c Merged in mnesbit-exclude-bouncycastle-jdk14 (pull request #317)
Remove bouncycastle-jdk14 that is causing problems for one of the member banks.
2016-09-01 11:26:46 +01:00
Ross Nicoll
868b23a923 Move simulations to top level 2016-09-01 11:15:05 +01:00
Ross Nicoll
07f44e9e2a Move test code from node to test-utils 2016-09-01 11:15:05 +01:00
Matthew Nesbit
039229cdfd Remove bouncycastle-jdk14 that is causing problems for one of the member banks.
Only need testCompile scope
2016-09-01 11:04:48 +01:00
Andras Slemmer
6af7945dc6 Merged in aslemmer-node-client (pull request #305)
Aslemmer node client
2016-09-01 10:22:50 +01:00
Andras Slemmer
1f095533be client: Remove when (this) 2016-09-01 10:14:37 +01:00
Andras Slemmer
5d04bd2cad client: Small comment correction 2016-09-01 09:38:04 +01:00
Andras Slemmer
0f54aec6ac client: Add repeat\(n\) to Expect dsl 2016-09-01 09:36:06 +01:00
Andras Slemmer
af641ab977 client: Small cosmetics 2016-09-01 09:36:06 +01:00
Andras Slemmer
20ed97ff96 client: Port Expect reactfx->rx 2016-09-01 09:36:06 +01:00
Andras Slemmer
f682d7f173 client: Hide public Expect.kt types 2016-09-01 09:36:06 +01:00
Andras Slemmer
a2ace973ff client: reactfx->rx 2016-09-01 09:36:06 +01:00
Andras Slemmer
86d6ee0110 node: Cash Issue doesn't require notary 2016-09-01 09:36:06 +01:00
Andras Slemmer
2f7b022c8e client: Add WalletMonitorClient, Expect DSL and some tests for the client 2016-09-01 09:36:06 +01:00
Andras Slemmer
cfebccc495 node: Remove TransactionBuildResult.Complete, add pretty printing of ServiceToClientEvent 2016-09-01 09:36:06 +01:00
Andras Slemmer
9cda99bbcc client: Add client submodule 2016-09-01 09:36:05 +01:00
Ross Nicoll
203c4fb3d8 Merge ConcreteClause into Clause
Change Clause to an abstract class, and merge ConcreteClause into it. CompositeClause now
overrides defaults provided in Clause which are more suitable for composition of clauses.
2016-08-31 17:55:36 +01:00
Ross Nicoll
d81cbebe96 Merged in rnicoll-test-utils (pull request #313)
Move test utilities into their own package
2016-08-31 16:38:07 +01:00
Mike Hearn
89f5d9c4f7 Begin release M4 2016-08-31 17:22:52 +02:00
Mike Hearn
f7b2834461 Regen docsite 2016-08-31 17:16:06 +02:00
Mike Hearn
75a9c498a4 Fixup release notes 2016-08-31 17:14:42 +02:00
Ross Nicoll
232db9a1fd Move test utilities into their own package
This moves a lot of the test support code into its own package which is only imported for tests,
so it's not shipped as a part of core Corda. The node currently depends on this support code to
compile, although future work could try to separate this out. This change highlights that parts
of production code is dependent on test elements (i.e. dummy keys), and makes it harder for
such accidental crosses to occur later.

An integration test category is also added as part of this work, to contribute towards COR-345.
2016-08-31 15:40:54 +01:00
Matthew Nesbit
ce6d333914 Merged in mnesbit-document-corda-configuration (pull request #312)
Add some documentation of the configuration options of the standalone corda.jar
2016-08-31 11:48:24 +01:00
Matthew Nesbit
638dfc902a docs
Include database config section for completeness

Incorporate comments from review

Incorporate comments from review
2016-08-31 11:47:25 +01:00
Clinton Alexander
5439e0980f Merged in clint-driver-debug-fix (pull request #308)
Fixed driver debug mode.
2016-08-31 11:31:02 +01:00
Mike Hearn
25ae224c44 Merged in mike-m3-release-notes (pull request #309)
Release notes for M3
2016-08-31 11:43:45 +02:00
Clinton Alexander
0c4a80453a Used lists instead of strings for appending to JavaArgs in driver. 2016-08-30 14:01:54 +01:00
Mike Hearn
baac38c936 Release notes for M3 2016-08-30 14:40:12 +02:00
Matthew Nesbit
eee765237e Merged in mnesbit-https-support (pull request #306)
Add switchable HTTPS to Node web server
2016-08-30 13:18:06 +01:00
Matthew Nesbit
8756b49794 Add switchable HTTPS to Node web server
Explain change of cipher

Include extracted Dev Corda Root certificate so that it can be installed by HTTPS users.
2016-08-30 13:07:40 +01:00
Mike Hearn
89419f2444 Regen docsite 2016-08-30 13:05:32 +02:00
Clinton Alexander
82b416cb88 Fixed driver debug mode. 2016-08-30 12:03:31 +01:00
Mike Hearn
cc2209f7b1 Docsite: add a warning to the index page about the docsite being for master, and update the release process doc to remind the release master to remove it on the branch. 2016-08-30 12:53:34 +02:00
Mike Hearn
5a5377f0a1 Docs: Remove warning that says Corda is developed on MacOS, it is no longer true as we have a mix of platforms in the team these days. 2016-08-30 12:48:33 +02:00
sofusmortensen
2680687dcb Universal: Fixing and reduction 2016-08-29 22:29:24 +02:00
Mike Hearn
e11732dad3 Merged in mike-refresh-docs-for-m3 (pull request #299)
Refresh the documentation site (developer guide): fresh docs are happy docs!
2016-08-26 18:57:27 +02:00
Ross Nicoll
478e4bb75c Merged in rnicoll-clause-composition (pull request #294)
Rework clauses to use composition
2016-08-26 17:48:04 +01:00
Ross Nicoll
13b040ecd6 Rework clauses to use composition
Rework clauses so that rather than defining match/no-match behaviour themselves, they are
now composed by nesting them within clauses that understand how to match their child clauses.
This unifies a lot of the structure of clauses and removes corner cases needed for the first
design, as well as moving towards a model which is easier to prove.
2016-08-26 17:35:52 +01:00
RogerWillis
6cf01f614f Added getFreeLocalPorts() for grabbing more than one port. Fixes bug in freeLocalHostAndPort() where the same port can be picked multiple times. 2016-08-26 13:46:11 +01:00
Andras Slemmer
d6c595da37 Merged in aslemmer-canonicalizer-plugin-in-buildsrc (pull request #303)
build: Move definition of CanonicalizerPlugin into buildSrc
2016-08-26 13:23:15 +01:00
Andras Slemmer
1f14fe0705 build: Fix CanonicalizerPlugin dependencies 2016-08-26 12:31:09 +01:00
Andras Slemmer
f783d8466d build: Move definition of CanonicalizerPlugin into buildSrc 2016-08-26 12:11:23 +01:00
Mike Hearn
3e94fc1921 More review fixes 2016-08-26 13:05:26 +02:00
Mike Hearn
2f35dbc339 Refresh the documentation site (developer guide): fresh docs are happy docs! 2016-08-26 12:58:33 +02:00
Ross Nicoll
22a8b0adb4 Merged in rnicoll-commit-tx-protocol (pull request #286)
Add CommitTransactionProtocol
2016-08-25 16:37:03 +01:00
Ross Nicoll
ad8ffca0b4 Add CommitTransactionProtocol
Add new protocol which manages the entire process of taking a signed transaction ready
for notarisation, through notarisation and onto recording it both locally and informing
remote nodes.

This protocol also optionally can include the ClientToServiceCommand which triggered a transaction
being created, to give the remote nodes context on why a change occurred (i.e. "You are being sent
£100")
2016-08-25 16:30:39 +01:00