Merge branch 'master' into tls_executor

Author: Ilya Bogdanov

exonum-java-binding/CHANGELOG.md

@@ -26,7 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 - `BinaryTransactionMessage#toString` to include some fields in human-readable
   format instead of the whole message in binary form.
-- `Node#submitTransaction` to throw _unchecked_ `InvalidTransactionException` instead
+- `Node#submitTransaction` to throw _unchecked_ `TransactionSubmissionException` instead
   of checked `InternalServerError`.
 
 ### Fixed

exonum-java-binding/core/rust/exonum-java/TUTORIAL.md

@@ -19,20 +19,6 @@ in the [user guide](https://exonum.com/doc/version/0.11/get-started/java-binding
 
 ### Step 1. Configure Environment
 
-#### `LD_LIBRARY_PATH`
-
-`LD_LIBRARY_PATH` is required to locate native libraries used by Java Binding.
-You need to provide path to JVM library (e.g. `libjvm.so` on Linux).
-
-You can use the following script for this purpose:
-
-```bash
-JAVA_HOME="${JAVA_HOME:-$(java -XshowSettings:properties -version 2>&1 > /dev/null | grep 'java.home' | awk '{print $3}')}"
-LIBJVM_PATH="$(find ${JAVA_HOME} -type f -name libjvm.* | xargs -n1 dirname)"
-
-export LD_LIBRARY_PATH="${LIBJVM_PATH}"
-```
-
 #### Services definition
 Services must be defined in the [services.toml](https://exonum.com/doc/version/0.11/get-started/java-binding/#built-in-services) 
 file in order to be available in the network. The configuration file consists of two sections:

exonum-java-binding/core/rust/exonum-java/exonum-java

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# Try to detect the Java home directory from installed executable in case JAVA_HOME is not set.
+JAVA_HOME="${JAVA_HOME:-$(java -XshowSettings:properties -version \
+  2>&1 > /dev/null |\
+  grep 'java.home' |\
+  awk '{print $3}')}"
+
+# Find the directory containing libjvm.
+LIBJVM_PATH="$(find -L ${JAVA_HOME} -type f -name libjvm.* | xargs -n1 dirname)"
+
+export LD_LIBRARY_PATH="${LIBJVM_PATH}"
+
+# Detect the root directory of the installed app.
+EXONUM_HOME="$(dirname $0)/.."
+
+# Delegate execution to the app executable.
+${EXONUM_HOME}/exonum-java "$@"

exonum-java-binding/core/rust/src/proxy/node.rs

@@ -34,7 +34,7 @@ use storage::View;
 use utils::{unwrap_exc_or, unwrap_exc_or_default, unwrap_jni_verbose};
 use JniResult;
 
-const TX_SUBMISSION_EXCEPTION: &str = "com/exonum/binding/service/InvalidTransactionException";
+const TX_SUBMISSION_EXCEPTION: &str = "com/exonum/binding/service/TransactionSubmissionException";
 
 /// An Exonum node context. Allows to add transactions to Exonum network
 /// and get a snapshot of the database state.
@@ -132,9 +132,7 @@ pub extern "system" fn Java_com_exonum_binding_service_NodeProxy_nativeSubmit(
                     Err(err) => {
                         // node#submit can fail for two reasons: unknown transaction id and
                         // an error in ApiSender#send. The former is the service implementation
-                        // error and is appropriate to communicate with the exception below;
-                        // the second is an internal, unrecoverable error that has nothing
-                        // to do with the service: ECR-3190
+                        // error; the latter is an internal, unrecoverable error.
                         let error_class = TX_SUBMISSION_EXCEPTION;
                         let error_description = err.to_string();
                         env.throw_new(error_class, error_description)?;

exonum-java-binding/core/src/main/java/com/exonum/binding/service/Node.java

@@ -45,7 +45,8 @@ public interface Node {
    *
    * @param rawTransaction transaction parameters to include in transaction message
    * @return hash of the transaction message created by the framework
-   * @throws InvalidTransactionException if the transaction belongs to an unknown service
+   * @throws TransactionSubmissionException if the transaction belongs to an unknown service,
+   *     or cannot be submitted
    * @throws NullPointerException if the transaction is null
    * @see Blockchain#getTxMessages()
    */

exonum-java-binding/core/src/main/java/com/exonum/binding/service/InvalidTransactionException.java renamed to exonum-java-binding/core/src/main/java/com/exonum/binding/service/TransactionSubmissionException.java

@@ -16,12 +16,16 @@
 
 package com.exonum.binding.service;
 
+import com.exonum.binding.transaction.RawTransaction;
+
 /**
- * Indicates that the submitted transaction is not valid (e.g., belongs to an unknown service).
+ * Indicates that a transaction could not be
+ * {@linkplain Node#submitTransaction(RawTransaction) submitted}.
+ * For example, the submitted transaction is not valid — belongs to an unknown service.
  */
-public final class InvalidTransactionException extends IllegalArgumentException {
+public final class TransactionSubmissionException extends RuntimeException {
 
-  public InvalidTransactionException(String message) {
+  public TransactionSubmissionException(String message) {
     super(message);
   }
 }

exonum-java-binding/cryptocurrency-demo/start-cryptocurrency-demo.sh

@@ -17,17 +17,6 @@ header "DETECTING ENVIRONMENT"
 EXONUM_JAVA_APP="exonum-java"
 command -v ${EXONUM_JAVA_APP} >/dev/null 2>&1 || { echo >&2 "Please install the Exonum Java App and make sure that 'exonum-java' binary is available via PATH. Aborting."; exit 1; }
 
-# Check whether JAVA_HOME is set or detect it from the currently available java binary otherwise.
-if [ -z "${JAVA_HOME+x}" ];
-then
-    export JAVA_HOME="$(java -XshowSettings:properties -version 2>&1 > /dev/null | grep 'java.home' | awk '{print $3}')"
-fi
-echo "JAVA_HOME=${JAVA_HOME}"
-
-# Find the directory containing libjvm (the relative path has changed in Java 9).
-export LD_LIBRARY_PATH="$(find ${JAVA_HOME} -type f -name libjvm.\* | xargs -n1 dirname)"
-echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
-
 # Find the latest version of artifact and build if not found.
 ARTIFACT_PATH="$(find ./target -type f -name exonum-java-binding-cryptocurrency-demo-*-artifact.jar)"