ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 17:57:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,851 Commits 91 Branches 405 Tags 354 MiB
d28c781597
Commit Graph

225 Commits

Author SHA1 Message Date
Clinton Alexander
2b3f6d9701 Revert "Cordapps now exclude the META-INF of dependencies." 
This reverts commit 68068e5640.
 2017-07-06 15:15:47 +01:00
Clinton Alexander
68068e5640 Cordapps now exclude the META-INF of dependencies. 2017-07-06 15:14:07 +01:00
Clinton
c1088038b7 Cordapps now contain their own dependencies (#915) 
* Cordapps now contain all explicitly specified dependencies (and sub
dependencies).

* Removed some useless compile dependencies for trader demo.

* Dependent Cordapps are excluded from the build.
:Removed unnecessary dependencies of demos.

* Cleaned up exclusion rules for cordapp dependencies.
 2017-06-30 14:18:46 +01:00
Mike Hearn
82f68f212a Minor: add another emoji, import a couple of changes for Enterprise 2017-06-30 13:06:46 +01:00
Clinton Alexander
89e20d6746 Removing repository addition - this can really mess with the ability to control a project's repositories. 2017-06-28 17:57:16 +01:00
Clinton
08cbcac40c Corda publications and JARs now have cord or corda at the start. (#749) 
Core corda publications and JARs now have cord or corda at the start (excluding gradle plugins). Removed an unnecessary dependency on test-utils in node-schemas to prevent an evaluation order bug in gradle.
 2017-06-06 15:05:47 +01:00
Joel Dudley
e5fba5d0af Docsite reorg ahead of beta launch. 2017-06-05 13:37:23 +01:00
Clinton Alexander
964dbcd9a9 Fixed java path for both headless and windowed mode. 2017-06-01 17:05:16 +01:00
Clinton Alexander
4ae8356f35 Reordered a lazy eval to avoid an NPE 2017-06-01 15:46:32 +01:00
Clinton Alexander
ecf85c7448 Fixed noderunner issues on Windows by fixing a windows specific path 
quoting issue.
 2017-06-01 13:31:43 +01:00
Mike Hearn
1c92d554e0 Minor: print a more useful error if you mess up your cordform config. 2017-05-19 16:45:22 +02:00
Mike Hearn
e67521796f NodeRunner/Mac: java_home does not expect to be given a full path to the Java binary, and at the point we get here, we know the full JVM path anyway so we don't need the wrapper. 2017-05-19 16:45:22 +02: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
42d0a3c638 Don't keep xterm open if java was killed by user. (#678) 2017-05-16 10:56:17 +01:00
Andrzej Cichocki
45997ccd13 NodeRunner enhancements (#614) 
* Use same java.home as caller in terminal window case, previously only headless case did that
* Bump gradlePluginsVersion as I've changed NodeRunner

On Linux:
* Prefer JAVA_HOME over PATH
* Use correct escaping
* Start sh on failure so that terminals don't disappear taking error messages with them
 2017-05-09 10:22:22 +01:00
Ross Nicoll
80ad5af8b3 Extract common name from legal name to determine path 
Rewrote node name to extract common name to use as the node path for samples, to work around characters
being incorrectly treated as separators.
 2017-04-28 16:40:48 +01:00
Shams Asari
b5e022f350 Introducing Platform Version and its use by the NMS for min version requirements for the network 2017-04-24 15:31:10 +01:00
Shams Asari
b1e3a2b4e5 Fixed broken NodeRunner on MacOS 2017-04-13 15:19:15 +01:00
Shams Asari
c17fe29a62 Converted FullNodeConfiguration into a data class and added ability to parse Configs into data classes 2017-04-07 17:54:03 +01:00
Clinton
69d6286a5e Args are correctly passed to node runner (#503) 
* Arguments are now correctly passed to the noderunner from platform specific scripts.

* Node runner doesn't start CRaSH shell when running in headless mode.
 2017-04-04 15:56:14 +01:00
Clinton
e8316dedd0 Runnodes now exposes default ports for nodes automatically (#480) 
Cordformation now automatically assigns a debug port
 2017-04-04 11:58:56 +01:00
Patrick Kuo
e6bb2eedc0 bump gradle plugin version to 0.10.3 (#482) 2017-03-31 13:24:58 +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
Clinton Alexander
76eb713777 Added a h2 port configuration to Cordformation. 2017-03-30 17:10:49 +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
Shams Asari
52ea54f742 Upgraded both guava and guava-testlib to 21.0 and made sure they share the same version variable 2017-03-24 17:17:36 +00:00
Andrius Dagys
6a21de74b3 NodeRunner: fix OSX script. Add a delay before starting the next node. (#419) 
* NodeRunner: fix OSX script. Add a delay before starting the next node.

* Only add delay on macOS
 2017-03-24 12:15:57 +00:00
Marek Skocovsky
262c87a5c6 Integrate CRaSH shell (SSHD). Joint effort between Mike Hearn and Marek Skocovsky. 
The shell is embedded in the node and offers the ability to monitor
and control the node via the launching terminal.

Still to do:

* Switch to a fork of CRaSH that we can maintain ourselves, and merge in Marek's SSH patch so we can enable SSH access.
* Add persistent command history that survives restarts.
* Tab completion for the 'flow' and 'run' commands.
* Remove the 'jul' command and replace it with a command that lets you see and tail the log4j logs instead.
* Fix or remove the other crash commands that have bitrotted since 2015.
 2017-03-24 12:44:54 +01:00
tomconte
79d133d9d7 Use tmux instead of xterm if available 2017-03-22 16:50:59 +00:00
Andras Slemmer
eb9ae6b6b0 runnodes: Fix runnodes on Linux, fix nodeName 2017-03-22 16:49:10 +00:00
Clinton
9a5bba9c04 Created a Kotlin node runner (#367) 
* Added a cross platform node runner to replace scripts.

* Added runnodes shell and batch files back.

* Node runner supports new webserver format.

* Runnodes now runs correctly on OSX

* Intermediate commit. Squash me.

* Upgdated gradle plugins version number to 0.10.1

* Further inlined more functions.

* Text display changes for noderunner.
 2017-03-22 14:08:23 +00:00
Mike Hearn
1d6fe30f03 Minor: set file mode explicitly so corda.jar is executable on UNIX when copying from a downloaded jar 2017-03-21 18:01:17 +01:00
Ross Nicoll
486368d926 Clean up messaging/RPC port configuration and docs (#296) 
* Non-ssl artemis acceptor for RPC connection. (#271)

* New non-ssl acceptor in artemis server for RPC connection.

* Rename artemisAddress with messagingAddress

Rename artemisAddress with messagingAddress so that the node configuration file properties match
the code variable names.
Rename artemisPort to messagingPort in Gradle configuration to match node configuration naming.

* Add rpcPort configuration option for Gradle

* Update docs to reflect changes to RPC port configuration

* Renumber ports in example CorDapp to match numbering used elsewhere

* Restructure upgrade guide

* added config file checks on corda startup to make the upgrade path a bit smoother.
 2017-03-17 10:32:14 +00:00
Mike Hearn
a9412b32f3 Allow web servers to be suppressed in runnodes 2017-03-10 17:27:19 +01:00
Clinton Alexander
f786ff9312 Correct CRLF for BAT files and fixed templating of JAR names. 2017-02-27 16:42:28 +00:00
Clinton Alexander
75ff04d5a7 Webserver is now deployed as a capsule. 2017-02-27 16:42:23 +00:00
Clinton Alexander
8414c97a61 Moved JsonSupport to new webserver module. Fixed a few compile errors. 
Fixed compile issues caused by webserver being split to a separate project.
WebServer now starts and stops correctly as a separate module.
 2017-02-27 16:41:48 +00:00
Clinton Alexander
5516093a59 Modified title of the webserver on systems using xterm to run nodes. 2017-02-22 11:51:05 +00:00
Shams Asari
c7abbe8791 Converting groovy GStrings to normal strings for ConfigValueFactory 2017-02-21 20:15:06 +00:00
Shams Asari
7181b697a3 extraAdvertisedServiceIds config is now a list of strings, rather than a comma separated string 2017-02-21 15:21:37 +00:00
Clinton Alexander
4b71b60066 Cordformation now correctly includes and excludes cordapps. 2017-02-10 15:44:04 +00:00
Clinton Alexander
3482452c8b Added webserver to runnodes. 2017-01-27 14:15:08 +00:00
Clinton Alexander
e38167c500 runnodes.bat no longer recursives when creating nodes. 2017-01-11 11:37:20 +00:00
Shams Asari
7cd281364f Removed basedir from the config file as it's always overwritten by the --base-directory cmd line arg 2017-01-10 10:49:28 +00:00
Mike Hearn
7247e7280f Two runnodes fixes for MacOS X: 
1) Support users who run non-bash shells
2) Use /usr/bin/libexec to pick the right Java version, as currently Corda does not start on Java 9
 2017-01-06 12:36:49 +01:00
Clinton Alexander
b49c97d409 runnodes.bat returns the user to the original directory. 2017-01-05 16:07:31 +00:00
Clinton Alexander
857de9df49 runnodes.bat can now run the nodes from any working directory and not cause an infinite loop and system crash. 2017-01-05 15:57:32 +00:00
Shams Asari
08e391579c Node verifies the peer it connects to by checking its TLS common name 2017-01-05 14:22:11 +00:00
Clinton Alexander
884ffffd62 Fixed a bug with building gradle plugins due to an invalid version number used. 2017-01-05 14:11:58 +00:00
Mike Hearn
119d00c384 Upgrade dependencies and centralise some more version numbers in the root gradle file 2017-01-04 15:44:56 +01:00
Clinton Alexander
ba321121e5 Fixed instructions in readme 2016-12-09 15:05:18 +00:00
Clinton Alexander
2f61340945 Fixed review comments. 2016-12-08 16:58:22 +00:00
Clinton Alexander
5b4babf329 Removed redundant gradle extension variable to reduce complexity of build.gradle and clear up the process of changing the version numbers. 2016-12-08 12:18:26 +00:00
Clinton Alexander
f1daae0491 To avoid needing to bump three different files upon updates, a common publish properties file has been added. 2016-12-06 16:29:15 +00:00
Clinton Alexander
87e5c9bf46 Added documentation and buildscript to allow full bootstrapping without modifying build files. 2016-12-06 16:14:06 +00:00
Clinton Alexander
1b052b07ec Returned to using more readable bintray syntax. 2016-12-06 16:06:16 +00:00
Clinton Alexander
a6d1a07670 Added documentation for the new publishing functionality of publish-utils. 2016-12-06 16:06:16 +00:00
Clinton Alexander
41b0b6c0b1 Re-added the capsule file. Fixed deploy with another publish option. 2016-12-06 16:06:16 +00:00
Clinton Alexander
1463cd2b37 Renamec capsule module to corda. 2016-12-06 16:06:16 +00:00
Clinton Alexander
b24c628e34 Publications now publish JARs again. Install task now publishes again. 2016-12-06 16:06:16 +00:00
Clinton Alexander
bf49dda731 Corda now publishes with updated publish utils. 2016-12-06 16:06:16 +00:00
Clinton Alexander
4b2d786724 Bintray configuration block now contains all fields required for the bare minimum POM. 2016-12-06 16:06:16 +00:00
Clinton Alexander
6ac7b9384d All gradle plugins can now be published with the publishing plugin. 2016-12-06 16:06:16 +00:00
Clinton Alexander
e751d80c00 Added documentation for bintray configuration. 2016-12-06 16:06:16 +00:00
Clinton Alexander
6bc118b997 Quasar utils now follows the format required by the new publishing utilities gradle plugin. 2016-12-06 16:06:16 +00:00
Clinton Alexander
46ddd3bd0e Publish utils no longer needs a configuration block per project, just one bintray configuration per project providing it fits certain criteria. 2016-12-06 16:06:16 +00:00
Clinton Alexander
4eb7d3db11 Added more publish utilities for simplifying bintray configuration per project to reduced boilerplate. 2016-12-06 16:06:16 +00:00
Clinton Alexander
1f88d0fa76 Updated plugin versions. 2016-11-30 15:44:09 +00:00
Clinton Alexander
74ea6ab0df Fixed runnodes when JAVA_HOME is not set. 2016-11-30 15:43:27 +00:00
Mike Hearn
5ba9e7a396 Start M7 2016-11-29 20:15:24 +00:00
Clinton Alexander
cc2b472947 Corrected version of the gradle plugins for publishing. 2016-11-29 16:16:15 +00:00
Clinton Alexander
426bae625a Fixed most duplicate dependencies between cordapps and the corda.jar. 2016-11-29 15:00:02 +00:00
Clinton Alexander
c3c0b4b25a Added a fix for the duplicat log4j bindings. 2016-11-29 14:18:01 +00:00
Andrius Dagys
32451bac1d Upped gradle plugin version 2016-11-25 17:11:27 +00:00
Andrius Dagys
946cfda03e Added a distributed notary demo that runs a notary cluster and gets several transactions notarised 2016-11-25 17:09:57 +00:00
Clinton Alexander
1d789d3a45 Fixed gradle plugins version. 2016-11-25 16:39:18 +00:00
Clinton Alexander
2d444fe42b Re-unified the gradle plugin versions. 2016-11-25 16:34:32 +00:00
Clinton Alexander
94166484ca Fixed whitespace issue and documentation. 2016-11-25 16:21:02 +00:00
Clinton Alexander
1e025bded2 Moved the version numbers for the gradle plugins into the individual projects. Added RPC user configuration block. Reformated groovy code with IntelliJ auto refactor. 2016-11-25 15:52:33 +00:00
Clinton Alexander
7858a76542 Merged in clint-gpgpassword (pull request #541) 
Due to updated GPG key that requires a passphrase a passphrase block has been added.
 2016-11-24 18:24:46 +00:00
Clinton Alexander
3c8b544aae Merged in clint-pomdevs (pull request #543) 
Added a required section for publishing POMs to maven central.
 2016-11-24 18:21:44 +00:00
rick.parker
8ec21eedb3 quasarScan removal. 2016-11-24 16:27:51 +00:00
Clinton Alexander
0c80344737 Added a required section for publishing POMs to maven central. 2016-11-24 13:44:11 +00:00
Clinton Alexander
481ce1992e Due to updated GPG key that requires a passphrase a passphrase block has been added. 2016-11-24 12:04:05 +00:00
Clinton Alexander
af379ec176 Set filemode for run scripts to the correct value 2016-11-22 15:54:14 +00:00
Clinton Alexander
7ff8b00666 Fixed another cordformation bug caused by having them in a non-root project. 2016-11-21 17:09:48 +00:00
Clinton Alexander
1f81ac2cc0 Fixed an exception caused when quasar plugin runs on root. 2016-11-21 13:47:54 +00:00
Clinton Alexander
2e73b16454 Removed redundant configuration in samples that misled developers. Fixed the dependency on Cordformation plugin. 2016-11-21 13:46:30 +00:00
Clinton Alexander
063dbec505 Merged in clint-bintray (pull request #496) 
Removed duplicate gradle plugins and added bintray publishing tasks
 2016-11-21 11:20:13 +00:00
Richard Green
c7fedb95f8 Fixing test clock cordformation dsl 2016-11-18 18:17:02 +00:00
Clinton Alexander
a90de1fa49 Cordformation now publishes to bintray. 2016-11-18 13:12:27 +00:00
Clinton Alexander
e3f618fe13 Quasar utils now publishes to bintray. 2016-11-18 13:02:36 +00:00
Clinton Alexander
14ca7847d0 Publishing to jcenter possible via bintrayUpload (with the correct credentials) and corda now has a dependency on the published gradle plugin to allow the split. 2016-11-18 13:02:04 +00:00
Clinton Alexander
8e342e81d3 Moved publishing to bintray to correct gradle file. 2016-11-18 12:59:39 +00:00
Mike Hearn
859542b2df Samples: make the IRS demo usable from the command line again 2016-11-18 13:02:12 +01:00
Mike Hearn
010112e44e Minor: couple more usability tweaks to the runnodes script 2016-11-18 13:02:11 +01:00
Clinton Alexander
b469cd5382 Can now run nodes via a batch file. 2016-11-17 18:21:45 +00:00
Clinton Alexander
559f6866aa fixed version number. 2016-11-17 18:00:15 +00:00
Clinton Alexander
25af5cde96 Updated readme with more accurate instructions. 2016-11-17 17:12:06 +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
179975fe2b Minor: fix a harmless bug in the CordFormation gradle plugin 2016-11-17 18:03:53 +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
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
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
e144df953e More moving 2016-11-10 20:13:43 +01:00
Mike Hearn
ce99f354cb Rename com.r3corda -> net.corda 2016-11-10 17:14:24 +01:00
Clinton Alexander
55e3dceb8f gradle install now works for corda. 2016-11-03 15:57:50 +00:00
Clinton Alexander
18bd53711f Fixed spelling of CorDapp. 2016-11-02 11:23:31 +00:00
Clinton Alexander
69dcd45660 CorDapp dependencies must now be fully qualified maven dependency names. 2016-11-02 11:22:52 +00:00
Clinton Alexander
29e203315b Cordapps now correctly resolve dependencies. 2016-11-02 11:12:31 +00:00
Clinton Alexander
dea9d663ff Fixed node config file being written to the wrong place in Cordformation templates. 2016-11-01 14:11:42 +00:00
Richard Green
c4ce05cc1c Changing permission on scripts runnodes to uog+rx 2016-11-01 11:47:53 +00:00
Clinton Alexander
427049e400 Removed unused functions, added Javadoc to properies. Added advertisedServices as a default field. 2016-10-11 16:41:12 +01:00
Clinton Alexander
b5420ace42 Using correct configuration system now. 2016-10-11 16:20:47 +01:00
Clinton Alexander
9eed177d83 Added a readme explaining the plugins directory. 2016-10-11 14:22:34 +01:00
Clinton Alexander
f6fd793dd7 Advertised services now correctly output. 2016-10-11 13:34:53 +01:00
Clinton Alexander
a927ba095d Removed isNotary part of DSL in response to it being removed from the configuration interface. 2016-10-11 13:29:44 +01:00
Clinton Alexander
2bb8a5a7b6 Using groovy templating. 2016-10-11 13:24:57 +01:00
Clinton Alexander
578344d610 Added comment to explain a line. 2016-10-11 13:05:46 +01:00
Clinton Alexander
1754493490 Fixed review issues. 2016-10-11 13:05:46 +01:00
Clinton Alexander
5d894138c2 Review fixes for documentation and gitignore. 2016-10-11 13:05:46 +01:00
Clinton Alexander
6dd29981dd Made documentation more clear for cordapp plugins. 2016-10-11 13:05:46 +01:00
Clinton Alexander
3d868016ae Moved some documentation into the relevant readmes. 2016-10-11 13:05:46 +01:00
Clinton Alexander
bd1eb16b6c Renamed plugins to gradle plugins for clarity. 2016-10-11 13:05:46 +01:00