Rick Parker
81d6195a07
Merged in parkri-jdbchashmap-lru (pull request #482 )
...
LRU for JDBCHashMap loadOnInit=false, with tests.
2016-11-18 11:23:26 +00:00
rick.parker
5c1d81824e
LRU for JDBCHashMap loadOnInit=false, with tests.
2016-11-18 11:22:25 +00:00
Rick Parker
17c8f4389f
Merged in parkri-fix-jolokia-access-warning (pull request #491 )
...
Move jolokia access config to the config directories, alongside log4j2.xml file. Point samples at top level dev and test config.
2016-11-18 11:20:58 +00:00
rick.parker
cd98b559bf
Move jolokia access config to the config directories, alongside log4j2.xml file. Point samples at top level dev and test config.
2016-11-18 11:11:54 +00:00
Clinton Alexander
dede118c58
Merged in clint-windowsrunnodes (pull request #489 )
...
Can now run nodes via a batch file on windows
2016-11-18 10:39:25 +00:00
Clinton Alexander
92a2ffedd2
Updated documentation regarding the running of nodes on Windows to reflect the new runnodes.bat file.
2016-11-17 18:25:49 +00:00
Clinton Alexander
b469cd5382
Can now run nodes via a batch file.
2016-11-17 18:21:45 +00:00
Clinton Alexander
01adc816a1
Merged in clint-cordformfix (pull request #488 )
...
Gradle plugins can now be built separately from the main repo.
2016-11-17 18:03:16 +00:00
Clinton Alexander
559f6866aa
fixed version number.
2016-11-17 18:00:15 +00:00
Jose Coll
876b17bb12
Transaction notes now stored individually per row.
2016-11-17 17:57:07 +00:00
Clinton Alexander
deb628281a
reverted changes in simm gradle
2016-11-17 17:15:39 +00:00
Clinton Alexander
d217784a55
Removed redundant changes.
2016-11-17 17:13:17 +00:00
Rick Parker
0c9b03411a
Merged in parkri-pending-messages (pull request #481 )
...
Remove need for pending messages map/table and fix start up race between network map and protocols wanting to look up Party
2016-11-17 17:12:35 +00:00
Clinton Alexander
25af5cde96
Updated readme with more accurate instructions.
2016-11-17 17:12:06 +00:00
rick.parker
996b2d13d5
Network map message filtering. Removal of pending messages. Needs cleaning up.
2016-11-17 17:11:10 +00:00
Clinton Alexander
2b96f7e79e
Many fixes to get gradle plugins and other projects working post-merge.
2016-11-17 17:09:31 +00:00
Clinton Alexander
34d1e1583e
Fixed the resolution of the corda_version variable.
2016-11-17 17:09:31 +00:00
Mike Hearn
0a6cdb77c3
Fix a bug in the trader-demo gradle that prevented the sample from working when run from the command line.
2016-11-17 18:04:12 +01:00
Mike Hearn
179975fe2b
Minor: fix a harmless bug in the CordFormation gradle plugin
2016-11-17 18:03:53 +01:00
Mike Hearn
29ace9123f
Minor: remove incorrect copyright header
2016-11-17 18:01:04 +01:00
Mike Hearn
1a9cbf91c3
Minor: add a small delay to the AppleScript that opens new terminal tabs to hack around the fact that AppleScript is racy when used this way :(
2016-11-17 18:00:45 +01:00
Richard Green
c370e01e68
From comment review PR
2016-11-17 16:31:08 +00:00
Mike Hearn
6240ba48e1
Fix up the visualiser tool after the net.corda move and broken instructions from the repo moves
2016-11-17 17:29:58 +01:00
Mike Hearn
f247bc5647
Fixes to the deployNodes tasks for the samples. Improve the error message in the cordformation plugin.
2016-11-17 17:29:58 +01:00
Mike Hearn
f630e15528
Fix build
2016-11-17 16:33:06 +01:00
Mike Hearn
230302c847
Merge branch 'mike-downgrade-stateviewer-to-java6'
2016-11-17 16:10:45 +01:00
Mike Hearn
8654ad72bd
Carry across a couple of changes from corda-samples that missed the cutover
2016-11-17 15:56:11 +01:00
Mike Hearn
90b083926f
Reimport samples to main repo
2016-11-17 15:51:28 +01:00
Mike Hearn
ae49c2bdb2
Java code in Node currently targets Java 6 due to the caplet, until we decide we need to separate it out. This file uses Java 7+ features so downgrade it, which fixes the build (for some reason I could not easily reproduce this failure)
2016-11-17 12:33:57 +01:00
Mike Hearn
02a90014e7
Delete duplicate module lines in modules.xml
2016-11-16 17:41:20 +01:00
Mike Hearn
b56548a427
Make runnodes open up a separate tab for each node on MacOS X and a separate xterm on Linux. Update the docs a bit.
2016-11-16 15:49:10 +01:00
Mike Hearn
a9fc6f5495
Target Java 6 for our Caplet, to ensure the corda.jar capsule-ified build can get as far as capsule's version checks if the users JVM is too old. Without this patch capsule tries to load the caplet and then dies because it targets a newer version of Java than what the user has, so the error message the user sees is useless (a bytecode version mismatch). With this patch the user sees a message like this:
...
"CAPSULE EXCEPTION: Could not find Java installation for requested version [Min. Java version: 1.8.0 JavaVersion: null Min. update version: {}] (JDK required: false). You can override the used Java version with the -Dcapsule.java.home flag. (for stack trace, run with -Dcapsule.log=verbose)"
which isn't awesome either but at least tells the user what to do.
2016-11-16 15:46:50 +01:00
Mike Hearn
556b7f4469
Check for Java 8 directly in the build.gradle file, as the existing checks don't work.
2016-11-16 15:46:50 +01:00
Andras Slemmer
cae9b758ff
core: Fix ErrorOr.combine
2016-11-16 14:43:54 +00:00
Jose Coll
1427baf797
Transaction note retrieval now using indexed field on database table.
2016-11-16 14:07:16 +00:00
Jose Coll
5dfffb1b84
Re-applied changes following net.corda rebase.
2016-11-16 14:07:16 +00:00
Mike Hearn
9d7bfe4229
Publish technical white paper to the docsite
2016-11-16 14:57:14 +01:00
Mike Hearn
b19c6de69a
Tech white paper: new sections on privacy, data distribution groups (aka clubs), notary involvement with data distribution.
2016-11-16 14:55:00 +01:00
Patrick Kuo
eff2f38949
Merged in pat-explorer-corda-branding (pull request #468 )
...
Explorer changes and corda branding
2016-11-16 13:26:57 +00:00
Patrick Kuo
af899a98f4
Explorer corda branding
2016-11-16 13:26:05 +00:00
Andras Slemmer
37ca651ace
loadtest: Fix gradle com.r3corda -> net.corda
2016-11-16 11:16:42 +00:00
Richard Green
d65ff747b3
Merged in clint-capletfix (pull request #466 )
...
Fixed classpath augmentation for plugins.
2016-11-16 10:39:27 +00:00
Mike Hearn
8a680b3726
Minor style tweaks to the universal contract.
2016-11-15 19:17:30 +01:00
Mike Hearn
d1b279c2b2
Remove experimental trade finance code: it's not maintained, hasn't been code reviewed and we don't wish to release it as open source.
2016-11-15 19:08:14 +01:00
Andras Slemmer
3c09056e22
Remove :Any restriction from ErrorOr's type parameter
2016-11-15 18:05:00 +00:00
Shams Asari
012fa855a1
Moved RPCUserServiceImplTest into correct package
2016-11-15 17:36:35 +00:00
Andras Slemmer
7335fba633
Merged in aslemmer-loadtest-dsl (pull request #441 )
...
Load testing framework
2016-11-15 17:21:08 +00:00
Andras Slemmer
07df9f17b3
loadtest: Add loadtest code
2016-11-15 17:21:26 +00:00
Andras Slemmer
9078676521
Merged in aslemmer-generic-protocol-start (pull request #465 )
...
Aslemmer generic protocol start
2016-11-15 16:51:57 +00:00
Andras Slemmer
e6f9570fff
docs: Update Client RPC API tutorial with how to initiate protocols
2016-11-15 16:51:07 +00:00
