ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
8,683 Commits 91 Branches 405 Tags 354 MiB
ca8f5050cf
Commit Graph

54 Commits

Author SHA1 Message Date
Mike Hearn
ca8f5050cf Merge branch 'master' into mike-enterprise-merge-june-20th 2017-06-21 19:49:33 +02:00
Mike Hearn
782d4bd731 Merge commit '246de55433f747707b2d0dd6299437c664ea933d' into mike-enterprise-remerge 
Includes API updates to the doorman code.
 2017-06-12 16:25:30 +02:00
Andrzej Cichocki
4bd38d381a Fix tests that check ports are bound/unbound (#756) 
* Specifically, DriverTests and WebserverDriverTests
* RPCDriver.startRpcBroker now waits for port to be unbound, as was probably intended
* Explicitly drop network map future while ensuring the error is logged
 2017-05-31 17:12:25 +01:00
Andrzej Cichocki
bbe4c170c2 BFT notary demo (#725) 
* Rename raft-notary-demo project to notary-demo
* Refactor serialisation filtering to allow BFT SMaRt to work, it no longer relies on the jdk.serialFilter system property
* In NodeBasedTest remove whitespace in node directory names for consistency with cordform and driver
 2017-05-24 12:25:06 +01:00
Andrius Dagys
376a9d399f Merge remote-tracking branch 'open/master' 2017-05-24 12:19:49 +01:00
Andrzej Cichocki
c8d71a96f5 One demo definition for both IntelliJ and gradle (#697) 
* Raft notary demo now defined in one place that both IntelliJ/driver and gradle/runnodes can run
* New module cordform-common for code common to cordformation and corda
* Add single notary demo
 2017-05-18 15:58:35 +01:00
Andrzej Cichocki
1df29ab06f Make webserver reconnect to rebooted node. (#662) 2017-05-12 10:27:27 +01:00
Andrius Dagys
dfb63231e3 Merge remote-tracking branch 'open/master' 2017-05-11 13:59:02 +01:00
Rick Parker
18a0df4239 AMQP serialisation: Part 1 (#581) 
Also turns on `-parameters` for java compiler
 2017-05-05 12:14:02 +01:00
Clinton Alexander
1b5182fe24 Removed robots.txt from repo and added docs/build back to the gitignore list. 2017-03-30 12:23:14 +01:00
Andras Slemmer
528c9efe9d Add sgx build, documentation, verify-enclave 2017-03-24 18:23:04 +00:00
Mike Hearn
27b004962e Ignore some files with scratch names that are sometimes useful 2017-03-13 15:41:54 +01:00
Thomas Schroeter
99721bf8f1 Implement bft-smart notary prototype 2017-02-20 12:08:22 +00:00
Shams Asari
657cfa5d96 FlowException can be thrown from within UntrustworthyData.unwrap for better Java interop, and more checked exception annotations relating to flows 2017-02-06 16:00:52 +00:00
Shams Asari
5432905b4a Clean up NetworkMapCache and InMemoryNetworkMapCache 2016-12-02 14:45:54 +00:00
Shams Asari
56ada37259 Remove checked in node logs and git ignore node/logs 2016-11-28 10:49:44 +00:00
Shams Asari
d8e09f7174 Minor cleanup of attachment demo 2016-11-22 17:06:18 +00:00
Clinton Alexander
f4ab8dc96d Added modules back to gitignore. 2016-11-21 17:32:46 +00:00
Clinton Alexander
c83232e1de Added bintray publush plugin with a first publication. 2016-11-18 12:58:31 +00:00
Mike Hearn
0e6e1e4457 Minor: ˆˆAdd .idea/dataSources to .gitignore 2016-11-18 13:02:11 +01:00
Andras Slemmer
14304d098f .gitignore: Use negative pattern for build/, remove some unused lines 2016-11-04 11:13:57 +00:00
Clinton Alexander
02fa457156 Added another rule to the gitignore to ignore the distributions folder. 2016-11-04 10:41:19 +00:00
Shams Asari
67fdf9b2ff Automatic session management between two protocols, and removal of explict topics 2016-10-03 15:21:27 +01:00
Clinton Alexander
43de27c4c1 Updated Corda in preparation for the merging of the Vega cordapp. Includes 
some minor changes, including gitignore rule changes. The largest change
is replacing the current fresh key for each transaction with a single
static identity in preparation for aimproved and more fleshed out key
sharing infrastructure.
 2016-09-28 14:39:41 +01:00
Andras Slemmer
db9eb060b9 .gitignore: explorer/build 2016-09-19 15:05:22 +01:00
Andras Slemmer
9cda99bbcc client: Add client submodule 2016-09-01 09:36:05 +01: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
sofusmortensen
7b241b6b12 Merge branch 'master' into sofus-generic-contract 2016-07-12 07:47:43 +02:00
Andras Slemmer
d7cc34c9a5 all: Full stops in comments! 2016-07-11 17:58:53 +01:00
Andras Slemmer
7491503a10 docs: .gitignore docs/virtualenv 2016-07-11 14:00:51 +01:00
sofusmortensen
757bddb9f9 added experimental/build to .gitignore 2016-06-27 00:31:23 +02:00
Andras Slemmer
683bb5c50b git: add buildSrc/build/ to .gitignore 2016-06-17 10:37:00 +01:00
Mike Hearn
3974f7b632 Fix the .gitignore file for the internal repo 2016-05-25 13:05:26 +02:00
Mike Hearn
3ef8763d71 Minor: add /node/build to .gitignore 2016-05-17 11:12:15 +02:00
Mike Hearn
1678700826 Minor: Add network-explorer to .gitignore 2016-04-18 19:15:25 +02:00
Mike Hearn
800151b774 Merge branch 'master' into dynamic-loading 2016-04-18 17:56:31 +02:00
Mike Hearn
ea4505b668 Minor: Add {nodeA, nodeB} directories to .gitignore 2016-04-18 17:27:57 +02:00
sofusmortensen
e6ce1e5b76 Fixed unit test with contracts.isolated.jar in classpath when running from IDEA. 2016-03-22 14:48:59 +00:00
sofusmortensen
527b0f4817 Improved unit tests. 
Cleaned up project structure a bit.
 2016-03-22 12:15:47 +00:00
sofusmortensen
3675675277 Custom ClassLoader created from collection of attachments 2016-03-20 20:41:46 +01:00
Sofus Mortensen
2a72f38076 Merged master into dynamic-loading 2016-03-19 19:08:49 +01:00
Mike Hearn
9b102f3f17 Minor: .gitignore the rate-fix-demo-data directory 2016-03-17 13:05:24 +01:00
Vibhu Mohindra
11d14001cd Unified the various StorageService implementations. Made getMap() private. Made the nested tables into instance variables. Moved StorageServiceImpl out into its own file to avoid merge conflicts in the future. 2016-03-15 17:08:28 +00:00
Sofus Mortensen
fb20250726 Merged master into dynamic-loading 2016-03-11 12:12:23 +01:00
Mike Hearn
67602349c6 Minor: gitignore lib/dokka.jar 2016-03-08 18:31:54 +01:00
Sofus Mortensen
65c4eb829e Added unit test for dynamic loading of contracts jar. 2016-03-04 16:58:13 +01:00
Sofus Mortensen
994abb3edb Added new project core. 
Project Contracts depends only on core.
 2016-02-16 17:14:17 +01:00
Mike Hearn
5f9e140545 Put "buyer" and "seller" directories in .gitignore 2016-02-10 16:28:37 +01:00
Mike Hearn
1e8ea8eb2c Implement the beginnings of a serving node. 
It uses Artemis (an embeddable MQ broker) and can run in either a 'serving' mode, in which case it will sit around waiting to sell fake commercial paper assets, or a 'buying' mode in which case it will connect to a specified serving node and run the two party trade protocol.

Most services are either mocked out or too trivial to be useful at this point. They will be fleshed out in the future.
 2016-02-03 16:57:01 +01:00
Mike Hearn
8a3f619480 Check in an "All tests" config and add quasar jar to lib directory to simplify IntelliJ configuration 2016-01-12 16:40:34 +01:00