ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 04:57:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Removed unused functions, added Javadoc to properies. Added advertisedServices as a default field.

Browse Source
This commit is contained in:
Clinton Alexander 2016-10-11 16:41:12 +01:00
parent b5420ace42
commit 427049e400
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/source/creating-a-cordapp.rst
View File

@ -212,28 +212,28 @@ is a three node example;
dirName "notary"
nearestCity "London"
notary true // Sets this node to be a notary
advertisedServices = []
advertisedServices []
artemisPort 12345
webPort 12346
cordapps = []
cordapps []
}
node {
name "NodeA"
dirName "nodea"
nearestCity "London"
advertisedServices = []
advertisedServices []
artemisPort 31337
webPort 31339
cordapps = []
cordapps []
}
node {
name "NodeB"
dirName "nodeb"
nearestCity "New York"
advertisedServices = []
advertisedServices []
artemisPort 31338
webPort 31340
cordapps = []
cordapps []
}
}

38
gradle-plugins/cordformation/src/main/groovy/com/r3corda/plugins/Node.groovy
View File

@ -1,6 +1,5 @@
package com.r3corda.plugins
import groovy.text.SimpleTemplateEngine
import org.gradle.api.internal.file.AbstractFileCollection
import org.gradle.api.Project
import java.nio.file.Files
@ -10,8 +9,6 @@ import com.typesafe.config.ConfigFactory
import com.typesafe.config.ConfigValueFactory
import com.typesafe.config.ConfigRenderOptions
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter
/**
* Represents a node that will be installed.
*/
@ -23,10 +20,18 @@ class Node {
* Name of the node.
*/
public String name
private String dirName
private List<String> advertisedServices = []
/**
* A list of advertised services ID strings.
*/
protected List<String> advertisedServices = []
/**
* Set thThe list of cordapps to install to the plugins directory.
*
* @note Your app will be installed by default and does not need to be included here.
*/
protected List<String> cordapps = []
private String dirName
private Config config = ConfigFactory.empty()
//private Map<String, Object> config = new HashMap<String, Object>()
private File nodeDir
@ -70,15 +75,6 @@ class Node {
config = config.withValue("useHTTPS", ConfigValueFactory.fromAnyRef(isHttps))
}
/**
* Set the advertised services for this node.
*
* @param advertisedServices A list of advertised services ID strings.
*/
void advertisedServices(List<String> advertisedServices) {
config = config.withValue("extraAdvertisedServiceIds", ConfigValueFactory.fromAnyRef(advertisedServices.join(",")))
}
/**
* Set the artemis port for this node.
*
@ -111,16 +107,6 @@ class Node {
ConfigValueFactory.fromAnyRef(networkMapAddress))
}
/**
* Set the list of cordapps to use on this node.
*
* @note Your app will be installed by default and does not need to be included here.
* @param cordapps The list of cordapps to install to the plugins directory.
*/
void cordapps(List<String> cordapps) {
this.cordapps = cordapps
}
Node(Project project) {
this.project = project
}
@ -201,6 +187,10 @@ class Node {
* Installs the configuration file to this node's directory and detokenises it.
*/
private void installConfig() {
// Adding required default values
config = config.withValue('extraAdvertisedServiceIds',
ConfigValueFactory.fromAnyRef(advertisedServices.join(',')))
def configFileText = config.root().render(new ConfigRenderOptions(false, false, true, false)).split("\n").toList()
Files.write(new File(nodeDir, 'node.conf').toPath(), configFileText, StandardCharsets.UTF_8)
}