Merge remote-tracking branch 'remotes/open/master' into merges/june-05-09-57

config/dev/log4j2.xml

@@ -15,6 +15,7 @@
         <Property name="log-path">${sys:log-path:-logs}</Property>
         <Property name="log-name">node-${hostName}</Property>
         <Property name="archive">${log-path}/archive</Property>
+        <Property name="consoleLogLevel">${sys:consoleLogLevel:-error}</Property>
         <Property name="defaultLogLevel">${sys:defaultLogLevel:-info}</Property>
     </Properties>
 
@@ -73,13 +74,10 @@
     </Appenders>
 
     <Loggers>
-        <Root level="info">
+        <Root level="${defaultLogLevel}">
-            <AppenderRef ref="Console-Appender"/>
+            <AppenderRef ref="Console-Appender" level="${consoleLogLevel}"/>
-        </Root>
-        <Logger name="net.corda" level="${defaultLogLevel}" additivity="false">
-            <AppenderRef ref="Console-Appender"/>
             <AppenderRef ref="RollingFile-Appender" />
-        </Logger>
+        </Root>
         <Logger name="BasicInfo" additivity="false">
             <AppenderRef ref="Console-Appender-Println"/>
             <AppenderRef ref="RollingFile-Appender" />

core/build.gradle

@@ -93,9 +93,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"

docs/source/getting-set-up.rst

@@ -161,7 +161,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
 -----------------

testing/test-common/src/main/resources/log4j2-test.xml

@@ -15,6 +15,7 @@
         <Property name="log-path">${sys:log-path:-logs}</Property>
         <Property name="log-name">node-${hostName}</Property>
         <Property name="archive">${log-path}/archive</Property>
+        <Property name="consoleLogLevel">${sys:consoleLogLevel:-error}</Property>
         <Property name="defaultLogLevel">${sys:defaultLogLevel:-info}</Property>
     </Properties>
 
@@ -73,13 +74,10 @@
     </Appenders>
 
     <Loggers>
-        <Root level="info">
+        <Root level="${defaultLogLevel}">
-            <AppenderRef ref="Console-Appender"/>
+            <AppenderRef ref="Console-Appender" level="${consoleLogLevel}"/>
-        </Root>
-        <Logger name="net.corda" level="${defaultLogLevel}" additivity="false">
-            <AppenderRef ref="Console-Appender"/>
             <AppenderRef ref="RollingFile-Appender" />
-        </Logger>
+        </Root>
         <Logger name="BasicInfo" additivity="false">
             <AppenderRef ref="Console-Appender-Println"/>
             <AppenderRef ref="RollingFile-Appender" />

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
-}
+}