mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-19 09:52:23 +01:00
acf44128b2
Use of the Spring Environment
-----------------------------
This change replaces the use of the argparse4j library and basic
Properties objects with the Spring Framework's Environment abstraction.
The Environment allows for managing any number of 'property sources' in
a hierarchical fashion, such that a call to
`environment.getProperty("someKey")` iterates through an ordered set of
property sources, returning the first value associated with the given
key.
BitsquareEnvironment, introduced in this commit, eliminates the
functionality previously present in ConfigLoader, modeling the
bitsquare.conf and bitsquare.properties files as Spring Resource
objects, and in turn creating ResourcePropertySources out of them. These
custom property sources are combined with standard property sources
based on system environment variables and Java system properties as well
as a property source based on the command-line arguments passed to a
Bitsquare application to form a unified, one-stop configuration
hierarchy.
For example, let's say a Bitsquare user wishes to customize the port
that his Bitsquare application listens on. The simplest approach
(assuming the user is comfortable with the command line), would be the
following:
java -jar bitsquare.jar --port=1234
where '1234' is the custom port of choice. This is convenient enough for
one-off experimentation, but if the user wishes to make this a permanent
arrangement, he may want to add a `port=1234` entry to his
{bitsquare_app_dir}/bitsquare.conf file.
Alternatively, the user may wish to specify the port value as an
environment variable, e.g.:
PORT=1234 java -jar bitsquare.jar
or with a JVM system property, e.g.:
java -jar -DPORT=1234 bitsquare.jar
With BitsquareEnvironment, and its customized set of PropertySources in
place, the value of the port property may be specified in any of the
ways described above, and it is all handled in a unified way.
Restructuring of *Main classes
------------------------------
This commit also introduces significant changes to the structure of
executable Bitsquare applications. For example, prior to this change,
the io.bitsquare.app.gui.Main class was responsible for being both a
JavaFX Application and a standard Java main class.
Now, however, these concerns have been renamed and separated.
BitsquareApp is the JavaFX Application, and BitsquareAppMain is the Java
main class. Likewise, BootstrapNode has been broken out into
BootstrapNode and BootstrapNodeMain.
A common base class for the *Main classes has been extracted, named
BitsquareExecutable, which creates a template for option parsing,
environment creation, and ultimately application execution that applies
both to the BootstrapNode and BitsquareApp cases.
Improved help text
------------------
With the removal of argparse4j and the introduction of JOpt for argument
parsing, the application's help text has been improved. Use --help to
display this text, where you'll see information about default values,
etc. To do this easily from the Gradle build, run any of the following
commands:
# Display help text
./gradlew run -Pargs="--help"
# Qualify the application name as "Bitsquare-Alice"
./gradlew run -Pargs="--appName=Alice"
# Customize the port
./gradlew run -Pargs="--port=7377"
Renaming of FatalException
--------------------------
Finally, the exception formerly known as io.bitsquare.gui.FatalException
has been moved up a package and generalized to
io.bitsquare.BitsquareException, as it is now used more widely.
73 lines
2.1 KiB
Groovy
73 lines
2.1 KiB
Groovy
import org.apache.tools.ant.taskdefs.condition.Os
|
|
|
|
plugins {
|
|
id "com.github.johnrengelman.shadow" version "1.1.2"
|
|
id "com.github.kt3k.coveralls" version "2.0.1x"
|
|
}
|
|
|
|
apply plugin: 'java'
|
|
apply plugin: 'eclipse'
|
|
apply plugin: 'application'
|
|
apply plugin: 'jacoco'
|
|
|
|
wrapper.gradleVersion = '2.1'
|
|
|
|
version = '0.1.0-SNAPSHOT'
|
|
sourceCompatibility = 1.8
|
|
|
|
sourceSets.main.resources.srcDirs += 'src/main/java'
|
|
|
|
mainClassName = "io.bitsquare.app.gui.BitsquareAppMain"
|
|
|
|
run {
|
|
if (project.hasProperty('args')) {
|
|
args project.args.split(',')
|
|
}
|
|
}
|
|
|
|
repositories {
|
|
jcenter()
|
|
maven { url 'http://partnerdemo.artifactoryonline.com/partnerdemo/libs-snapshots-local' }
|
|
}
|
|
|
|
dependencies {
|
|
compile 'org.bitcoinj:bitcoinj-core:0.12'
|
|
compile 'net.tomp2p:tomp2p-all:5.0-Alpha.32cd9f9-SNAPSHOT'
|
|
compile 'org.springframework:spring-core:4.1.1.RELEASE'
|
|
compile 'net.sf.jopt-simple:jopt-simple:4.8'
|
|
compile 'org.slf4j:slf4j-api:1.7.7'
|
|
compile 'ch.qos.logback:logback-core:1.1.2'
|
|
compile 'ch.qos.logback:logback-classic:1.1.2'
|
|
compile 'com.google.inject:guice:3.0'
|
|
compile 'com.google.guava:guava:16.0.1'
|
|
compile 'com.google.code.gson:gson:2.2.4'
|
|
compile 'org.controlsfx:controlsfx:8.0.6_20'
|
|
compile 'de.jensd:fontawesomefx:8.0.0'
|
|
compile 'net.glxn:qrgen:1.3'
|
|
compile 'com.google.code.findbugs:jsr305:2.0.3'
|
|
compile 'net.jcip:jcip-annotations:1.0'
|
|
compile 'org.jetbrains:annotations:13.0'
|
|
compile 'eu.hansolo.enzo:Enzo:0.1.5'
|
|
testCompile 'junit:junit:4.11'
|
|
}
|
|
|
|
task packageNative(type: Exec, dependsOn: shadowJar) {
|
|
if (Os.isFamily(Os.FAMILY_MAC))
|
|
executable "${project.rootDir}/package/mac.sh"
|
|
else if (Os.isFamily(Os.FAMILY_UNIX))
|
|
executable "${project.rootDir}/package/linux.sh"
|
|
else if (Os.isFamily(Os.FAMILY_WINDOWS))
|
|
executable "${project.rootDir}/package/windows.bat"
|
|
else
|
|
throw new GradleException("Unsupported OS: " + System.properties['os.name'])
|
|
|
|
args project.version, shadowJar.archivePath, mainClassName
|
|
}
|
|
|
|
jacocoTestReport {
|
|
reports {
|
|
xml.enabled = true
|
|
html.enabled = true
|
|
}
|
|
}
|