Commit Graph

109 Commits

Author SHA1 Message Date
Chris Rankin
0e3005518e Exclude kotlin-reflect artifact from any CorDapp. (#1555) 2017-09-19 15:05:54 +01:00
Chris Rankin
5eab71caae Filter for Open Source and Enterprise modules. (#1514) 2017-09-15 09:01:50 +01:00
Ross Nicoll
ae2183c8a1 Reduce use of X500Name bridges (#1483)
* Change to using strings in CordformContext; X500Name is an external API dependency we're trying to avoid, X500Principal rearranges the order of the elements in a way we don't want, and trying to put CordaX500Name into Groovy in the time available is impractical. As such having pre-formatted strings used in the Cordform plugin makes most sense right now.
* Remove uses of CordaX500Name.x500
* Remove old X.500 parsing tools
* Move CordaX500Name.x500 into X500NameUtils
* Move X500NameUtils into internal
2017-09-14 11:56:14 +01:00
cburlinchon
10c4d46b97 Add delay to macos script startup (#1462) 2017-09-11 15:23:03 +01:00
Maksymilian Pawlak
069e31d006 Don't start Corda webserver if no webAddress has been defined for a node (#1434)
Don't start Corda webserver if no webAddress has been defined for a node
2017-09-08 15:25:20 +01:00
Patrick Kuo
57412d4498 Enforce X500Name format defined in design doc (#1427)
* Standardise X500Name format - WIP

* address PR issues

* failing test fix and replace X500Name with getX500Name

* gradle plugin fix

* Added country code validation
2017-09-07 14:47:42 +01:00
Clinton Alexander
40146cdbc0 Fixed a crash in cordformation when trying to build nodes for a project with a file as a dependency and any other dependencies without a group 2017-09-04 15:20:44 +01:00
Clinton Alexander
8756f337db Added a flag to denote debug mode for capsule in cordformation. 2017-08-24 15:57:11 +01:00
Clinton Alexander
1b61f94bb8 Improved logging message for including cordapp dependencies. 2017-08-16 18:04:41 +01:00
Matthew Nesbit
ca5ea1e25d Fix a bug where when using a groovy string a cordapp will not be included
because of a string and GString equality failure.
2017-08-16 18:02:20 +01:00
Shams Asari
008301c4e8 Introduced FlowLogic.getFlowContext which provides the flow version and app name of the other side. 2017-08-11 18:01:16 +01:00
Clinton
9eceb26ee9 Renamed corda configuration in gradle to cordaCompile to be more explicit. (#1131)
* Renamed corda configuration in gradle to cordaCompile to be more explicit.

* Bumped version number of gradle plugins.
2017-07-27 17:53:51 +01:00
Clinton
68d05eee04 Added corda and cordaRuntime configurations and documentation on integrating with Corda (#1103)
* Added new corda and cordaRuntime configurations for cordapps to be able to explicitly depend on Corda and exclude corda dependencies from the fatjar

* Added corda integration section to docsite to describe how to integrate with Corda.

* Updated more of the documentation to reflect the new method of specifying core corda dependencies.

* Reorganised document logic to move all build system related documentation to the cordapp build systems page.

* Renamed cordapp build systems doc to match actual purpose.

* Improved the warning for building against a net.corda dependency in a cordapp

* Added a line of dialogue to show further reading for those reading about writing cordapps.
2017-07-25 17:54:36 +01:00
Clinton
0ccfae252f POMs generated by publishing are now correct. (#1055)
* POMs generated by publishing are now correct. The publish extension now requires an explicit call to configure the publishing instead of waiting until after evaluation. This prevents evaluation order issues with the artifact renaming code that causes the POM to have the original, incorrect, artifact names.

* Fixed new test compile issues caused by removal of some dependencies in test utils that caused webserver code to be automatically included in any project also compiling test utils.
2017-07-18 12:34:56 +01:00
Clinton
74c8346863 Cordapps now exclude the META-INF of dependencies. (#988)
* Cordapps now exclude the META-INF of dependencies.

* Only exclude files that cause issues with signed JAR detection.
2017-07-07 15:37:28 +01:00
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
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
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