From 6b5bea2891c4db2883e9cb9ee3faa028154f3517 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Thu, 24 Jul 2014 21:35:11 -0700 Subject: [PATCH 1/4] Replaced ByteInputStream with ByteArrayInputStream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ByteInputStream is an internal class and won’t compile with maven. --- src/main/java/io/bitsquare/util/Utilities.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/bitsquare/util/Utilities.java b/src/main/java/io/bitsquare/util/Utilities.java index 6bd9822b92..230b75ba84 100644 --- a/src/main/java/io/bitsquare/util/Utilities.java +++ b/src/main/java/io/bitsquare/util/Utilities.java @@ -3,7 +3,6 @@ package io.bitsquare.util; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.sun.xml.internal.messaging.saaj.util.ByteInputStream; import java.awt.Desktop; import java.io.*; import java.net.URI; @@ -35,8 +34,8 @@ public class Utilities Object result = null; try { - ByteInputStream byteInputStream = new ByteInputStream(); - byteInputStream.setBuf(com.google.bitcoin.core.Utils.parseAsHexOrBase58(serializedHexString)); + ByteArrayInputStream byteInputStream = + new ByteArrayInputStream(com.google.bitcoin.core.Utils.parseAsHexOrBase58(serializedHexString)); try (ObjectInputStream objectInputStream = new ObjectInputStream(byteInputStream)) { From 06a0a4fb414619705cde8b47230348e63a714368 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Sun, 27 Jul 2014 16:43:18 -0700 Subject: [PATCH 2/4] added dependency to javafx maven plugin This is to get around javafx-maven-plugin issue with latest maven version. see: http://stackoverflow.com/questions/19407959/javafx-maven-plugin-and-api- incompatibility --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 34e2fb7294..37a9e2106b 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,13 @@ io.bitsquare.BitSquare + + + org.twdata.maven + mojo-executor + 2.1.0 + + From 69ebaaea9dcfefd894a3d4bbc55c3f1c4d001607 Mon Sep 17 00:00:00 2001 From: hannesstockner Date: Mon, 28 Jul 2014 14:55:57 +0100 Subject: [PATCH 3/4] Reformat transactions of a test trade on main net --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f996bfdea0..2a88a5793d 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,9 @@ You can change the network mode in the guice module: BitSquareModule.java ### Transactions of a test trade on main net: -Offerer registration tx: https://blockchain.info/de/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76 -Taker registration tx: https://blockchain.info/tx/8352ab9fe78593f48ef70d414d494ebd614d99fab147d0342910525e9284ba8f -Create offer fee tx: https://blockchain.info/tx/24f4d229edace44d9123628363a16cd7041f5d34ba6bef812807b9be03a64692 -Take offer fee tx: https://blockchain.info/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76 -Deposit tx: https://blockchain.info/de/tx/98c6ae55963022871216a6a124c1e1ed7f6308560e76b72617b6b54cf50ef412 -Payout tx: https://blockchain.info/tx/498e2c299ca991b27f61b63fb6ee457819ee9e33ee5a1d250fde47eb15199adc +[Offerer registration tx](https://blockchain.info/de/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76) +[Taker registration tx](https://blockchain.info/tx/8352ab9fe78593f48ef70d414d494ebd614d99fab147d0342910525e9284ba8f) +[Create offer fee tx](https://blockchain.info/tx/24f4d229edace44d9123628363a16cd7041f5d34ba6bef812807b9be03a64692) +[Take offer fee tx](https://blockchain.info/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76) +[Deposit tx](https://blockchain.info/de/tx/98c6ae55963022871216a6a124c1e1ed7f6308560e76b72617b6b54cf50ef412) +[Payout tx](https://blockchain.info/tx/498e2c299ca991b27f61b63fb6ee457819ee9e33ee5a1d250fde47eb15199adc) From feef813872146d4308e5f66e3d998c638a781298 Mon Sep 17 00:00:00 2001 From: hannesstockner Date: Mon, 28 Jul 2014 14:56:34 +0100 Subject: [PATCH 4/4] Reformat transactions of a test trade on main net --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2a88a5793d..45acf0193c 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,9 @@ You can change the network mode in the guice module: BitSquareModule.java ### Transactions of a test trade on main net: -[Offerer registration tx](https://blockchain.info/de/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76) -[Taker registration tx](https://blockchain.info/tx/8352ab9fe78593f48ef70d414d494ebd614d99fab147d0342910525e9284ba8f) -[Create offer fee tx](https://blockchain.info/tx/24f4d229edace44d9123628363a16cd7041f5d34ba6bef812807b9be03a64692) -[Take offer fee tx](https://blockchain.info/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76) -[Deposit tx](https://blockchain.info/de/tx/98c6ae55963022871216a6a124c1e1ed7f6308560e76b72617b6b54cf50ef412) -[Payout tx](https://blockchain.info/tx/498e2c299ca991b27f61b63fb6ee457819ee9e33ee5a1d250fde47eb15199adc) +* [Offerer registration tx](https://blockchain.info/de/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76) +* [Taker registration tx](https://blockchain.info/tx/8352ab9fe78593f48ef70d414d494ebd614d99fab147d0342910525e9284ba8f) +* [Create offer fee tx](https://blockchain.info/tx/24f4d229edace44d9123628363a16cd7041f5d34ba6bef812807b9be03a64692) +* [Take offer fee tx](https://blockchain.info/tx/06ea3c2a5fb79f622d3e3def7c6a20274274fcbf9ec69b95bdfe9b347bbbdf76) +* [Deposit tx](https://blockchain.info/de/tx/98c6ae55963022871216a6a124c1e1ed7f6308560e76b72617b6b54cf50ef412) +* [Payout tx](https://blockchain.info/tx/498e2c299ca991b27f61b63fb6ee457819ee9e33ee5a1d250fde47eb15199adc)