Remove gui path from scripts and .gitignore

.gitignore

@@ -27,4 +27,3 @@ build
 desktop.ini
 */target/*
 *.class
-/gui/deploy/*

doc/build.md

@@ -105,10 +105,10 @@ Now we have all prepared to build the correct bisq jar.
     $ cd exchange
     $ mvn clean package verify -DskipTests -Dmaven.javadoc.skip=true
 
-When the build completes, you will find an executable jar: `gui/target/shaded.jar` and a ./lib directory.
+When the build completes, you will find an executable jar: `target/shaded.jar` and a ./lib directory.
 To run it use:
 
-    $ java -jar gui/target/shaded.jar
+    $ java -jar target/shaded.jar
 
 Build binaries
 -----------------
@@ -131,11 +131,11 @@ and how to use [regtest](https://github.com/bisq-network/exchange/wiki/4.2.1.-Ho
 
 Here are example program arguments for using regtest with localhost environment (not using Tor):
 
-    $ java -jar gui/target/shaded.jar --baseCurrencyNetwork=BTC_REGTEST --useLocalhost=true --myAddress=localhost:2222 --nodePort=2222 --appName=bisq-Local-Regtest-Arbitrator
+    $ java -jar target/shaded.jar --baseCurrencyNetwork=BTC_REGTEST --useLocalhost=true --myAddress=localhost:2222 --nodePort=2222 --appName=bisq-Local-Regtest-Arbitrator
 
-    $ java -jar gui/target/shaded.jar --baseCurrencyNetwork=BTC_REGTEST --useLocalhost=true --myAddress=localhost:3333 --nodePort=3333 --appName=bisq-Local-Regtest-Alice
+    $ java -jar target/shaded.jar --baseCurrencyNetwork=BTC_REGTEST --useLocalhost=true --myAddress=localhost:3333 --nodePort=3333 --appName=bisq-Local-Regtest-Alice
 
-    $ java -jar gui/target/shaded.jar --baseCurrencyNetwork=BTC_REGTEST --useLocalhost=true --myAddress=localhost:4444 --nodePort=4444 --appName=bisq-Local-Regtest-Bob
+    $ java -jar target/shaded.jar --baseCurrencyNetwork=BTC_REGTEST --useLocalhost=true --myAddress=localhost:4444 --nodePort=4444 --appName=bisq-Local-Regtest-Bob
 
 
 Running local seed node with Tor and RegTest

doc/install_on_unix_fin.sh

@@ -18,6 +18,6 @@ mkdir .local
 mkdir .local/share
 
 echo "Start bisq"
-java -jar ~/bisq/gui/target/shaded.jar
+java -jar ~/bisq/target/shaded.jar
 
 

package/linux/32bitBuild.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 cd ../../
-mkdir -p gui/deploy
+mkdir -p deploy
 
 set -e
 
@@ -24,7 +24,7 @@ $JAVA_HOME/bin/javapackager \
     -name Bisq \
     -title Bisq \
     -vendor Bisq \
-    -outdir gui/deploy \
+    -outdir deploy \
     -srcfiles "$dir/Bisq-$version.jar" \
     -srcfiles "$dir/bcpg-jdk15on.jar" \
     -srcfiles "$dir/bcprov-jdk15on.jar" \
@@ -42,12 +42,12 @@ $JAVA_HOME/bin/javapackager \
 
 
 
-# sudo alien -r -c -k gui/deploy/bundles/bisq-$version.deb
+# sudo alien -r -c -k deploy/bundles/bisq-$version.deb
 
-cp "gui/deploy/bundles/bisq-$version.deb" "/home/bitsquare/Desktop/Bisq-32bit-$version.deb"
-mv "gui/deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.deb"
+cp "deploy/bundles/bisq-$version.deb" "/home/bitsquare/Desktop/Bisq-32bit-$version.deb"
+mv "deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.deb"
 
 # mv "bisq-$version-1.i386.rpm" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.rpm"
-rm -r gui/deploy/
+rm -r deploy/
 
 cd package/linux

package/linux/64bitBuild.sh

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/bash
 
 cd ../../
-mkdir -p gui/deploy
+mkdir -p deploy
 
 set -e
 
@@ -24,7 +24,7 @@ $JAVA_HOME/bin/javapackager \
     -name Bisq \
     -title Bisq \
     -vendor Bisq \
-    -outdir gui/deploy \
+    -outdir deploy \
     -srcfiles "$dir/Bisq-$version.jar" \
     -srcfiles "$dir/bcpg-jdk15on.jar" \
     -srcfiles "$dir/bcprov-jdk15on.jar" \
@@ -42,11 +42,11 @@ $JAVA_HOME/bin/javapackager \
 
 
 # uncomment because the build VM does not support alien
-#sudo alien -r -c -k gui/deploy/bundles/bisq-$version.deb
+#sudo alien -r -c -k deploy/bundles/bisq-$version.deb
 
-cp "gui/deploy/bundles/bisq-$version.deb" "/home/mk/Desktop/Bisq-64bit-$version.deb"
-mv "gui/deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.deb"
+cp "deploy/bundles/bisq-$version.deb" "/home/mk/Desktop/Bisq-64bit-$version.deb"
+mv "deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.deb"
 #mv "bisq-$version-1.x86_64.rpm" "/media/sf_vm_shared_ubuntu/Bisq-64bit-$version.rpm"
-rm -r gui/deploy/
+rm -r deploy/
 
 cd package/linux

package/osx/create_app.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 cd ../../
-mkdir -p gui/deploy
+mkdir -p deploy
 
 set -e
 
@@ -14,27 +14,27 @@ linux64=/Users/dev/vm_shared_ubuntu
 win32=/Users/dev/vm_shared_windows_32bit
 win64=/Users/dev/vm_shared_windows
 
-cp gui/target/shaded.jar "gui/deploy/Bisq-$version.jar"
+cp target/shaded.jar "deploy/Bisq-$version.jar"
 
 # copy app jar to VM shared folders
-cp gui/target/shaded.jar "$linux32/Bisq-$version.jar"
-cp gui/target/shaded.jar "$linux64/Bisq-$version.jar"
+cp target/shaded.jar "$linux32/Bisq-$version.jar"
+cp target/shaded.jar "$linux64/Bisq-$version.jar"
 # At windows we don't add the version nr as it would keep multiple versions of jar files in app dir
-cp gui/target/shaded.jar "$win32/Bisq.jar"
-cp gui/target/shaded.jar "$win64/Bisq.jar"
+cp target/shaded.jar "$win32/Bisq.jar"
+cp target/shaded.jar "$win64/Bisq.jar"
 
 # copy bouncycastle jars to VM shared folders
 lib1=bcpg-jdk15on.jar
-cp gui/target/lib/$lib1 "$linux32/$lib1"
-cp gui/target/lib/$lib1 "$linux64/$lib1"
-cp gui/target/lib/$lib1 "$win32/$lib1"
-cp gui/target/lib/$lib1 "$win64/$lib1"
+cp target/lib/$lib1 "$linux32/$lib1"
+cp target/lib/$lib1 "$linux64/$lib1"
+cp target/lib/$lib1 "$win32/$lib1"
+cp target/lib/$lib1 "$win64/$lib1"
 
 lib2=bcprov-jdk15on.jar
-cp gui/target/lib/$lib2 "$linux32/$lib2"
-cp gui/target/lib/$lib2 "$linux64/$lib2"
-cp gui/target/lib/$lib2 "$win32/$lib2"
-cp gui/target/lib/$lib2 "$win64/$lib2"
+cp target/lib/$lib2 "$linux32/$lib2"
+cp target/lib/$lib2 "$linux64/$lib2"
+cp target/lib/$lib2 "$win32/$lib2"
+cp target/lib/$lib2 "$win64/$lib2"
 
 
 echo "Using JAVA_HOME: $JAVA_HOME"
@@ -49,10 +49,10 @@ $JAVA_HOME/bin/javapackager \
     -name Bisq \
     -title Bisq \
     -vendor Bisq \
-    -outdir gui/deploy \
-    -srcfiles "gui/deploy/Bisq-$version.jar" \
-    -srcfiles "gui/target/lib/bcpg-jdk15on.jar" \
-    -srcfiles "gui/target/lib/bcprov-jdk15on.jar" \
+    -outdir deploy \
+    -srcfiles "deploy/Bisq-$version.jar" \
+    -srcfiles "target/lib/bcpg-jdk15on.jar" \
+    -srcfiles "target/lib/bcprov-jdk15on.jar" \
     -appclass io.bisq.gui.app.BisqAppMain \
     -outfile Bisq
 
@@ -65,12 +65,12 @@ $JAVA_HOME/bin/javapackager \
 #    -BjvmOptions=-Djava.security.policy=file:bisq.policy
 #     -srcfiles "core/src/main/resources/bisq.policy" \
 
-rm "gui/deploy/Bisq.html"
-rm "gui/deploy/Bisq.jnlp"
+rm "deploy/Bisq.html"
+rm "deploy/Bisq.jnlp"
 
-mv "gui/deploy/bundles/Bisq-$version.dmg" "gui/deploy/Bisq-$version.dmg"
-rm -r "gui/deploy/bundles"
+mv "deploy/bundles/Bisq-$version.dmg" "deploy/Bisq-$version.dmg"
+rm -r "deploy/bundles"
 
-open gui/deploy
+open deploy
 
 cd package/osx

package/osx/finalize.sh

@@ -22,7 +22,7 @@ cp "$target_dir/../29CDFD3B.asc" "$target_dir/"
 cp "$target_dir/../signingkey.asc" "$target_dir/"
 
 mac="Bisq-$version.dmg"
-cp "$src_dir/gui/deploy/$mac" "$target_dir/"
+cp "$src_dir/deploy/$mac" "$target_dir/"
 
 deb32="Bisq-32bit-$version.deb"
 cp "/Users/dev/vm_shared_ubuntu14_32bit/$deb32" "$target_dir/"

package/stresstest/init.sh

@@ -15,7 +15,7 @@ mkdir -p $logpath
 nohup java -jar SeedNode.jar hlitt7z4bec4kdh4.onion:8000 0 500 >/dev/null 2>$logpath/ST_0_seednode.log &
 sleep 40
 
-cd ../../gui/target
+cd ../../target
 nohup java -jar shaded.jar --app.name=BS_arb --maxConnections=12 >/dev/null 2>$logpath/ST_0_arb.log &
 
 # kill `ps -ef | grep java | grep -v grep | awk '{print $2}'`

package/stresstest/start.sh

@@ -5,7 +5,7 @@ datapath=/home/bs/.local/share
 
 mkdir -p $logpath
 
-cd ../../gui/target
+cd ../../target
 
 delay=40
 # edit start end index