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

3802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton
fcdcb0bdcf Merge pull request #469 from corda/clint-reducebuildsize 
Webserver no longer depends on node.
 2017-03-31 11:54:13 +01:00
josecoll
73c0fdc118 CashExitFlow now uses coin selection with soft locking. (#481) 2017-03-31 11:47:59 +01:00
Clinton Alexander
570f5a7675 Reduced the number of explicit dependencies in the webserver module. 2017-03-31 11:31:20 +01:00
Clinton
79e9c3f5c7 Merge pull request #476 from corda/clint-cordformationh2 
Added H2 port to cordformation config
 2017-03-31 11:19:38 +01:00
Chris Rankin
035857e992 Test configuring DB port number. (#475) 2017-03-31 11:12:47 +01:00
Clinton Alexander
e201569ac9 Made casing of h2Port more consistent with other node properties in Cordformation. 2017-03-31 10:36:34 +01:00
Konstantinos Chalkias
d72b75caa4 Observable.subscribe().unsubscribe() and ListenableFuture.cancel() (#397) 
Observable.subscribe().unsubscribe() dance to free up the MQ resources server-side.

* remove an unused import

* implement a FlowHandle<Transaction>.finalize method

* Rename finalize() to discard() - remove the collection and run discard individually

* Remove unused imports

* Observable.notUsed helper function

* Tweaks to comments

* FlowHandle implements AutoClosable

* Resolving conflicts and move notUsed to RPC module

* Copy Observable.notUsed in core module.

* delete discard method
 2017-03-31 10:08:12 +01:00
Matthew Nesbit
b62f901892 Merge pull request #462 from corda/mnesbit-tactical-patch-explorer 
Tactical fix for Explorer crash issue under Kotlin 1.1.1
 2017-03-31 09:38:28 +01:00
Chris Rankin
b3936a2159 Exclude commons-logging for all projects at top level. (#473) 2017-03-30 20:59:50 +01:00
Clinton Alexander
f9fc3a3ac2 Added m ore defaults to the new web reference. 2017-03-30 18:45:45 +01:00
Clinton Alexander
e87184d1eb Corrected logging location - broken by initialising logger before logging was configured. 2017-03-30 17:57:32 +01:00
Matthew Nesbit
0695374d72 Tactical fix for Explorer crash issue under Kotlin 1.1.1. Original code compiles, but then throws a typecast expression at runtime when trying to process the lambdas. 
Update docs
 2017-03-30 17:44:23 +01:00
Clinton Alexander
da88a43e40 Moved webserver to root project. 2017-03-30 17:34:32 +01:00
Clinton Alexander
73a7c62a07 Gradle plugins version update from 0.10.2 to 0.10.3 2017-03-30 17:11:15 +01:00
Clinton Alexander
76eb713777 Added a h2 port configuration to Cordformation. 2017-03-30 17:10:49 +01:00
Patrick Kuo
c7e5cf5079 Fixed : Message value in NotaryException is always null (#470) 2017-03-30 16:59:23 +01:00
Clinton Alexander
e3872c1469 Fixed logging to log file for webserver at startup. Removed more redundant config. 2017-03-30 16:59:07 +01:00
Chris Rankin
f15a22d828 Replace kotlinx-support-jdk8 with kotlin-stdlib-jre8. (#463) 
* Replace kotlinx-support-jdk8 with kotlin-stdlib-jre8.
* Add kotlinVersion to constants.properties.

* Remove unused variable.
 2017-03-30 16:27:01 +01:00
Matthew Nesbit
cedfc4e1ad Add a concept of token size to Amount<T> so that conversion to/from indicative and displayable BigDecimal works sensibly 
Add an AmountTransfer type to express the concept of asset flows.

Unify the currency amount creators and fix a few old style display conversions in teh explorer cash dialogs.

Modifications according to PR comments.

Change TransferAmount display string as it may not always be a payment.

Update docs
 2017-03-30 16:16:11 +01:00
Clinton
63a70f46a4 Merge pull request #466 from corda/clint-manualkapt 
Kapt now must be run manually in order for IntelliJ to compile Corda.
 2017-03-30 16:14:19 +01:00
Andrius Dagys
f116c02149 Remove webPort from demo nodes so that no unnecessary web servers are started 2017-03-30 15:57:08 +01:00
Andrius Dagys
55af8cff74 Update Copycat (Raft lib) version to 1.2.3 2017-03-30 15:55:47 +01:00
Clinton Alexander
5d8217bbc7 Fixed compile issue when testing the webserver. 2017-03-30 14:51:16 +01:00
Clinton Alexander
d4e0ab52fe Moved the webserver from being a subproject of node to a subproject of client. 2017-03-30 14:43:18 +01:00
Clinton Alexander
27e7a4226e Removed unnecessary config for webserver. 2017-03-30 14:33:26 +01:00
Clinton Alexander
561b2e50a6 Webserver no longer depends on node. Added a configuration parser for the webserver. Size of resulting JAR now 16MB smaller. 2017-03-30 14:27:18 +01:00
Clinton Alexander
e9cfbde287 Kapt now must be run manually in order for IntelliJ to compile Corda. 
Replaced compileKotlin with kaptKotlin in docs to reduce build times for users following documentation.
 2017-03-30 14:18:27 +01:00
Mike Hearn
577b2c2c22 CORDA-319: Shell: use ExternalResolver to load our commands 
This eliminates JIT java compilation and the consequent need for
tools.jar (which doesn't get shipped in DemoBench). It also makes
development more pleasant by avoiding weird IDE integration issues
that came from having java-in-resources.
 2017-03-30 14:58:59 +02:00
Mike Hearn
527e571bc3 CORDA-312: Shell: point at our own fork of CRaSH. 2017-03-30 14:58:59 +02:00
Clinton
3e1b4aaef4 Merge pull request #431 from corda/clint-gradledocs 
Docsite can be built from gradle
 2017-03-30 13:48:24 +01:00
Qian Hong
03deffa955 MQSecurityTest: Make sure no actual message is received. 2017-03-30 14:01:29 +02:00
Clinton Alexander
796d475e0b Removed repositories from docs build.gradle. 2017-03-30 12:24:06 +01:00
Clinton Alexander
5ef66d8fd6 Removed old information about Dokka from the building docs documentation. 
Make docsite no longer cleans. Now gradle should be used for cleaning the docs.

Corrected docs building gradle script.
 2017-03-30 12:23:20 +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
Clinton Alexander
8862920f9a Removed docs build directory from repo. 
Make docsite is back in a shell file due to issues invokving outside of the virtualenv.
 2017-03-30 12:22:59 +01:00
Clinton Alexander
b80aaa0e9d Moved the build docs functionality into build.gradle. 
Removed redundant parts of the docsite generator.

Gradle now calls the docsite requirements installation script when building docs via buildDocs

Added docs build script and moved all docs building related code into it

Corrected directories for build.
 2017-03-30 12:22:15 +01:00
Chris Rankin
ade9a7dba8 Filter zero bytes from CRaSH input stream. (#460) 
* Work around JavaFX injecting 0 bytes into JediTerm's STDIN stream.

* Add (disabled) unit tests for running JediTerm in both Swing and JavaFX.

* Remove tests for running JediTerm under Swing and JavaFX.
 2017-03-30 11:04:51 +01:00
Patrick Kuo
78a0024e00 Fix various deprecated warnings 
* Changed deprecated kotlin.reflect.primaryConstructor to kotlin.reflect.full.primaryConstructor
* Changed deprecated kotlin.reflect.memberProperties to kotlin.reflect.full.memberProperties
* Changed deprecated kotlin.reflect.declaredMemberProperties to kotlin.reflect.full.declaredMemberProperties
* Changed deprecated AllComposition to AllOf
* Changed deprecated AnyComposition to AnyOf
* Changed deprecated kotlin.reflect.KotlinReflectionInternalError to kotlin.reflect.jvm.internal.KotlinReflectionInternalError
* Changed deprecated HostAndPort.hostText to HostAndPort.host
* Removed duplicated method net.corda.core.node.recordTransactions
 2017-03-30 10:00:46 +01:00
Richard Green
86b5915ae7 changed reference from r3prototyping to corda 2017-03-29 17:45:41 +01:00
Matthew Nesbit
062dc67ab6 Add Any constraint to Amount token 
Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
 2017-03-29 17:11:30 +01:00
Matthew Nesbit
e0a2c76f39 Remove unnecessary parameters to copy() 
Signed-off-by: Ross Nicoll <ross.nicoll@r3.com>
 2017-03-29 17:11:30 +01:00
Patrick Kuo
9a7d0a0fb5 Replace unused variables with _ after kotlin 1.1.1 upgrade (#456) 
* Replace unused variables with _ after kotlin 1.1.1 upgrade
 2017-03-29 13:54:40 +01:00
josecoll
7eada1408e Reduce warning and info messages in node log files (Artemis) (#449) 
* Reduce warning and info messages in node log files (Artemis)
Add an additional lof message for conflicting states identified by the Notary.

* Upgraded severity of user login message from trace to debug.

* Suppress Artemis log4j WARNING's for core.server.checkDeadLetterAddressAndExpiryAddress
 2017-03-29 11:40:19 +01:00
josecoll
3497e42f7c Upgrade to Requery 1.2.1 with Composite Key support (#443) 
* Test SELECT WHERE IN composite key using requery 1.2.0

Upgraded Vault Service code to use Requery 1.2.0 SELECT .. WHERE IN

Updated generated schema code with Requery 1.2.0

Upgrade to Requery 1.2.1

Upgrade to Requery 1.2.1 - converted to use update DSL with composite key
Removed redundant JDBC SQL test cases.

Minor updates following PR review comments from RP.

* Streamline companion object initialisation.
 2017-03-29 10:51:02 +01:00
josecoll
bafedc21e2 Display Corda node legal name in JVisualVM Console for MockNode testing. (#444) 
* Display Corda node legal name in JVisualVM Console for MockNode testing.

* Removed dash in displayed corda node name.

* Reinstated the dash in displayed corda node name (as JVisualVM does not parse the space correctly)
 2017-03-29 09:22:01 +01:00
Patrick Kuo
6ca0dffa6c use sshdPortAllocation for sshdAddress instead of portAllocation to fix broken demos due to port shift. 2017-03-29 10:15:14 +02:00
Matthew Nesbit
b75913c24a Merge pull request #451 from corda/mnesbit-fix-flaky-tests 
Fixes some charset encoding and timing tests problems on windows
 2017-03-28 18:21:29 +01:00
Rick Parker
8ef1d767c9 Consolidate maven repositories (#445) 
* Consolidate repositories into root build.gradle
 2017-03-28 17:17:40 +01:00
Clinton
2f2d4b64b5 Merge pull request #442 from corda/clint-verifierpublish 
Verifier is now correctly publishing
 2017-03-28 16:52:03 +01:00
Matthew Nesbit
8f1d58a508 Fix unit tests causing problems on windows 2017-03-28 16:39:29 +01:00