From d989ae9dcca76c1be497c63e32223f9775b9958b Mon Sep 17 00:00:00 2001 From: Joel Dudley Date: Mon, 4 Jun 2018 23:20:26 +0100 Subject: [PATCH 1/3] Stray backtick. --- docs/source/getting-set-up.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/getting-set-up.rst b/docs/source/getting-set-up.rst index 0f21574b9f..defe46fe13 100644 --- a/docs/source/getting-set-up.rst +++ b/docs/source/getting-set-up.rst @@ -157,7 +157,7 @@ Run from IntelliJ 6. At the top-right of the screen, to the left of the green ``play`` arrow, you should see a dropdown. In that dropdown, select ``Run Example Cordapp - Kotlin`` and click the green ``play`` arrow. 7. Wait until the run windows displays the message ``Webserver started up in XX.X sec`` -8. Test the CorDapp is running correctly by visiting the front end at `http://localhost:10007/web/example/ +8. Test the CorDapp is running correctly by visiting the front end at http://localhost:10007/web/example/ Corda source code ----------------- From ff8471341fb3410af1e3caf56b2d94f4542e9432 Mon Sep 17 00:00:00 2001 From: Joel Dudley Date: Mon, 4 Jun 2018 23:24:36 +0100 Subject: [PATCH 2/3] Removes Log4J from Core. Readds to shell where required. (#3257) * Removes Log4J dependency from `core`. * Adds dependency on Log4J directly to shell. Missing colons. --- core/build.gradle | 3 --- tools/shell/build.gradle | 13 ++++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index ad8eff3b40..468a8dac45 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -80,9 +80,6 @@ dependencies { // Thread safety annotations compile "com.google.code.findbugs:jsr305:$jsr305_version" - // Log4J: logging framework (ONLY explicitly referenced by net.corda.core.utilities.Logging.kt) - compile "org.apache.logging.log4j:log4j-core:${log4j_version}" - // SLF4J: commons-logging bindings for a SLF4J back end compile "org.slf4j:jcl-over-slf4j:$slf4j_version" compile "org.slf4j:slf4j-api:$slf4j_version" diff --git a/tools/shell/build.gradle b/tools/shell/build.gradle index 9d3085189f..a2d0303273 100644 --- a/tools/shell/build.gradle +++ b/tools/shell/build.gradle @@ -37,7 +37,7 @@ dependencies { compile project(':node-api') compile project(':client:rpc') - // Jackson support: serialisation to/from JSON, YAML, etc + // Jackson support: serialisation to/from JSON, YAML, etc. compile project(':client:jackson') @@ -58,8 +58,11 @@ dependencies { // JAnsi: for drawing things to the terminal in nicely coloured ways. compile "org.fusesource.jansi:jansi:$jansi_version" - // Manifests: for reading stuff from the manifest file + // Manifests: for reading stuff from the manifest file. compile "com.jcabi:jcabi-manifests:1.1" + + // For logging. + compile "org.apache.logging.log4j:log4j-core:${log4j_version}" // Unit testing helpers. testCompile "junit:junit:$junit_version" @@ -67,11 +70,11 @@ dependencies { testCompile project(':test-utils') testCompile project(':finance') - // Integration test helpers + // Integration test helpers. integrationTestCompile "junit:junit:$junit_version" integrationTestCompile "org.assertj:assertj-core:${assertj_version}" - // Jsh: Testing SSH server + // Jsh: Testing SSH server. integrationTestCompile "com.jcraft:jsch:$jsch_version" integrationTestCompile project(':node-driver') @@ -94,4 +97,4 @@ task integrationTest(type: Test) { publish { name jar.baseName -} \ No newline at end of file +} From e34bce9f3f7905771e95accaebb13921c4c42de2 Mon Sep 17 00:00:00 2001 From: Michele Sollecito Date: Tue, 5 Jun 2018 09:25:47 +0100 Subject: [PATCH 3/3] [CORDA-1582]: Shell is back to logging only useful information. (#3296) --- config/dev/log4j2.xml | 10 ++++------ testing/test-common/src/main/resources/log4j2-test.xml | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/config/dev/log4j2.xml b/config/dev/log4j2.xml index a23af7db94..0ee7eaa7ce 100644 --- a/config/dev/log4j2.xml +++ b/config/dev/log4j2.xml @@ -5,6 +5,7 @@ ${sys:log-path:-logs} node-${hostName} ${log-path}/archive + ${sys:consoleLogLevel:-error} ${sys:defaultLogLevel:-info} @@ -63,13 +64,10 @@ - - - - - + + - + diff --git a/testing/test-common/src/main/resources/log4j2-test.xml b/testing/test-common/src/main/resources/log4j2-test.xml index 0d4feace63..4edd44b8ca 100644 --- a/testing/test-common/src/main/resources/log4j2-test.xml +++ b/testing/test-common/src/main/resources/log4j2-test.xml @@ -5,6 +5,7 @@ ${sys:log-path:-logs} node-${hostName} ${log-path}/archive + ${sys:consoleLogLevel:-error} ${sys:defaultLogLevel:-info} @@ -63,13 +64,10 @@ - - - - - + + - +