Mike Hearn
|
4356cef1cd
|
Regen docsite
|
2016-06-30 14:49:28 +02:00 |
|
Ross Nicoll
|
f2185089b7
|
Merged in rnicoll-cash-asset (pull request #197)
Rename com.r3cord.contracts.cash package to ...asset
|
2016-06-30 13:38:25 +01:00 |
|
Ross Nicoll
|
2121824662
|
Rename com.r3cord.contracts.cash package to ...asset
|
2016-06-30 13:31:59 +01:00 |
|
Ross Nicoll
|
a30a6cb389
|
Merged in rnicoll-obligation-cash-asset (pull request #195)
Replace references to cash, with (fungible) asset
|
2016-06-30 12:47:49 +01:00 |
|
Ross Nicoll
|
6dad7efa22
|
Replace references to cash, with (fungible) asset
|
2016-06-30 12:47:18 +01:00 |
|
Shams Asari
|
a02263937c
|
send and sendAndReceive use Party for the destination
|
2016-06-30 12:04:39 +01:00 |
|
Mike Hearn
|
aef111114f
|
Merged in mike-m1-docs-refresh (pull request #196)
Refresh docs for M1 release.
|
2016-06-30 13:01:07 +02:00 |
|
Mike Hearn
|
15a135f648
|
Merged master into mike-m1-docs-refresh
|
2016-06-30 13:00:34 +02:00 |
|
Mike Hearn
|
63cc3a04ce
|
Review feedback
|
2016-06-30 12:59:19 +02:00 |
|
Andrius Dagys
|
b30e431766
|
Update release notes regarding use of TransactionBuilder
|
2016-06-30 11:46:26 +01:00 |
|
Andras Slemmer
|
9e174d3e3a
|
irsdemo: Fix api address in Date role
|
2016-06-30 11:30:05 +01:00 |
|
Mike Hearn
|
55675ef799
|
Refresh docs for M1 release.
|
2016-06-30 12:23:27 +02:00 |
|
Rick Parker
|
4213da31b2
|
Merged in cor-133-events-modelling (pull request #132)
Scheduled activities / events support
|
2016-06-30 09:11:37 +01:00 |
|
rick.parker
|
5271882dcd
|
Event scheduling and docs for event scheduling
|
2016-06-30 08:51:52 +01:00 |
|
Ross Nicoll
|
b3af0ce218
|
Merged in rnicoll-upgrade-infrastructure (pull request #193)
Infrastructure ahead of contract upgrade support
|
2016-06-29 17:26:44 +01:00 |
|
Ross Nicoll
|
11eff398a0
|
Minor: Typo (classfiles -> class files)
|
2016-06-29 17:16:47 +01:00 |
|
Ross Nicoll
|
c767638127
|
Move DummyContract.State into its own file
DummyContract.State isn't actually used by the DummyContract any more, so shouldn't
be part of that contract class.
|
2016-06-29 17:16:46 +01:00 |
|
Ross Nicoll
|
779034691e
|
Add AbstractTransactionSubstitutionProtocol
Abstracts the NotaryChangeProtocol to be extensible for other use-cases.
|
2016-06-29 17:16:46 +01:00 |
|
Andrius Dagys
|
dd9a653ab4
|
TransactionBuilder: added a comment explaining the default notary parameter purpose
|
2016-06-29 16:32:29 +01:00 |
|
Andras Slemmer
|
d29dd121ff
|
integtest: Change timestamp format to be compatible with Windows
|
2016-06-29 13:58:19 +01:00 |
|
Ross Nicoll
|
22e5a5dddc
|
Merged in rnicoll-warnings (pull request #192)
Remove warnings from Obligation contract
|
2016-06-29 13:49:05 +01:00 |
|
Ross Nicoll
|
dc304199c8
|
Remove warnings from Obligation contract
|
2016-06-29 13:27:00 +01:00 |
|
Rick Parker
|
549a72bf77
|
Merged in fix-zip-path (pull request #191)
Fix up bug in attachment Zip file processing when path might not be normalised to start with
|
2016-06-29 09:26:33 +01:00 |
|
rick.parker
|
cfe54c5f21
|
Fix up bug in attachment Zip file processing when path might not be normalised to start with
|
2016-06-29 09:10:18 +01:00 |
|
Andras Slemmer
|
d17e649137
|
integtest: Double polling retry count
|
2016-06-28 17:55:04 +01:00 |
|
Andras Slemmer
|
5eefbaf622
|
Merged in add-integrationTest-to-test (pull request #190)
build: add integrationTest as a test dependency
|
2016-06-28 17:31:41 +01:00 |
|
Andras Slemmer
|
2daa8098c9
|
build: add integrationTest as a test dependency
|
2016-06-28 16:46:45 +01:00 |
|
Mike Hearn
|
93ea1db17c
|
Merged in irsdemotest (pull request #136)
Added integration build step and created two integration tests (IRS Demo and Trader Demo tests)
|
2016-06-28 17:37:32 +02:00 |
|
Andras Slemmer
|
9e5bf7c32c
|
integtest: Use separate folder for each integtest run, provide api address
|
2016-06-28 14:03:32 +01:00 |
|
Andras Slemmer
|
aa82d4441e
|
irs-demo: Fix advertised services
|
2016-06-28 14:03:32 +01:00 |
|
Andras Slemmer
|
54967afb78
|
irs-demo: Rework CLI parsing, add api-address
|
2016-06-28 14:03:32 +01:00 |
|
Andras Slemmer
|
1e15e7a206
|
trader-demo: Put demo directory under build/, add corresponding cli option
|
2016-06-28 14:03:32 +01:00 |
|
Andras Slemmer
|
f2505fb504
|
integtest: Put delay in status polling
|
2016-06-28 14:03:32 +01:00 |
|
Andras Slemmer
|
e54dad9a8b
|
node: Add apiAddress constructor parameter
|
2016-06-28 14:03:32 +01:00 |
|
Andras Slemmer
|
429d8aab74
|
node, integtest: Code style
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
ffa9ad1bc9
|
Added port argument for IRS demo to allow web servers to not have binding collisions during testing and to allow more granular control over demos.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
4900c7eb26
|
Ports now randomised during demo tests.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
b52f344eb3
|
Ensured that nodes are killed by process.destroyForcibly. Added random port numbers to test.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
68867d21bb
|
Fixed merge conflict problems.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
5bf5e37572
|
Demos now fully handle process managment except in the case where the process is killed with something like pkill or the JVM being ended by task manager.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
9d4f75f241
|
Improved readability and brevity of hasEmojiTerminal.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
5858ff5c45
|
Ensured that test passes under correct conditions, which may be slow, but also that the node lives until the end.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
ad45b5deaf
|
Tests now fail if spawned processes take too long to finish.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
9a2a7165a5
|
Fixed merge errors.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
21dc8e7fd4
|
Increased timeout time for reads during HTTP connections to avoid demo failing when date it set far in the future.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
609d80e630
|
Integration test module set correctly.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
7a4a1363cb
|
Removed unnecessary changes.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
5a4215a312
|
Fixed a change resulting from an incorrect merge.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
9973f8a33e
|
Moved integration test utilities into a utility folder.
|
2016-06-28 14:03:32 +01:00 |
|
Clinton Alexander
|
9638ea5b9e
|
IRS demo test now uses the new status endpoint
|
2016-06-28 14:03:32 +01:00 |
|