From 305420bd37b7b892ce3a3e289ec42add34345bee Mon Sep 17 00:00:00 2001 From: dpad85 Date: Wed, 23 Aug 2017 19:28:18 +0200 Subject: [PATCH] Renamed javafx module to `eclair-node-gui` and updated binaries name (#137) * Renamed eclair-node-javafx module to eclair-node-gui * (build) javafx installer uses project version * (build) Streamlined capsule names * (build) mvn generates installer only with `installer` profile. The windows installer does not need to be created in common cases. Decreases `eclair-node-gui` module building time by ~ 1 min * (readme) updated the `run eclair` commands with the new capsule names --- BUILD.md | 7 +- README.md | 4 +- .../pom.xml | 83 ++++++++++-------- .../package/windows/Eclair-setup-icon.bmp | Bin .../main/deploy/package/windows/Eclair.ico | Bin .../main/resources/gui/commons/globals.css | 0 .../resources/gui/commons/images/close.png | Bin .../gui/commons/images/connection_icon.png | Bin .../gui/commons/images/copy_icon.png | Bin .../gui/commons/images/eclair-fit.png | Bin .../gui/commons/images/eclair-shape.png | Bin .../gui/commons/images/eclair-square.png | Bin .../gui/commons/images/in-out-00.png | Bin .../gui/commons/images/in-out-01.png | Bin .../gui/commons/images/in-out-10.png | Bin .../gui/commons/images/in-out-11.png | Bin .../gui/commons/images/info_icon.png | Bin .../gui/commons/images/success_icon.png | Bin .../gui/commons/images/warning_icon.png | Bin .../main/resources/gui/main/channelPane.fxml | 0 .../src/main/resources/gui/main/main.css | 0 .../src/main/resources/gui/main/main.fxml | 0 .../resources/gui/main/notificationPane.fxml | 0 .../resources/gui/main/notifications.fxml | 0 .../src/main/resources/gui/modals/about.fxml | 0 .../resources/gui/modals/openChannel.fxml | 0 .../resources/gui/modals/receivePayment.fxml | 0 .../resources/gui/modals/sendPayment.fxml | 0 .../src/main/resources/gui/splash/splash.css | 0 .../src/main/resources/gui/splash/splash.fxml | 0 .../scala/fr/acinq/eclair/JavafxBoot.scala | 0 .../scala/fr/acinq/eclair/gui/FxApp.scala | 0 .../fr/acinq/eclair/gui/FxPreloader.scala | 0 .../fr/acinq/eclair/gui/GUIUpdater.scala | 0 .../scala/fr/acinq/eclair/gui/Handlers.scala | 0 .../gui/controllers/AboutController.scala | 0 .../controllers/ChannelPaneController.scala | 0 .../gui/controllers/MainController.scala | 0 .../NotificationPaneController.scala | 0 .../controllers/NotificationsController.scala | 0 .../controllers/OpenChannelController.scala | 0 .../ReceivePaymentController.scala | 0 .../controllers/SendPaymentController.scala | 0 .../gui/controllers/SplashController.scala | 0 .../acinq/eclair/gui/stages/AboutStage.scala | 0 .../eclair/gui/stages/OpenChannelStage.scala | 0 .../gui/stages/ReceivePaymentStage.scala | 0 .../eclair/gui/stages/SendPaymentStage.scala | 0 .../eclair/gui/utils/ContextMenuUtils.scala | 0 .../eclair/gui/utils/GUIValidators.scala | 0 .../src/test/resources/logback-test.xml | 0 eclair-node/pom.xml | 7 +- pom.xml | 6 +- 53 files changed, 63 insertions(+), 44 deletions(-) rename {eclair-node-javafx => eclair-node-gui}/pom.xml (54%) rename eclair-node-javafx/src/main/deploy/package/windows/Eclair (Alpha 3)-setup-icon.bmp => eclair-node-gui/src/main/deploy/package/windows/Eclair-setup-icon.bmp (100%) rename eclair-node-javafx/src/main/deploy/package/windows/Eclair (Alpha 3).ico => eclair-node-gui/src/main/deploy/package/windows/Eclair.ico (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/globals.css (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/close.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/connection_icon.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/copy_icon.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/eclair-fit.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/eclair-shape.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/eclair-square.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/in-out-00.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/in-out-01.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/in-out-10.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/in-out-11.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/info_icon.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/success_icon.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/commons/images/warning_icon.png (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/main/channelPane.fxml (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/main/main.css (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/main/main.fxml (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/main/notificationPane.fxml (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/main/notifications.fxml (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/modals/about.fxml (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/modals/openChannel.fxml (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/modals/receivePayment.fxml (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/modals/sendPayment.fxml (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/splash/splash.css (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/resources/gui/splash/splash.fxml (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/JavafxBoot.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/FxApp.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/FxPreloader.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/GUIUpdater.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/Handlers.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/controllers/AboutController.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/controllers/ChannelPaneController.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/controllers/MainController.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/controllers/NotificationPaneController.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/controllers/NotificationsController.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/controllers/OpenChannelController.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/controllers/ReceivePaymentController.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/controllers/SendPaymentController.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/controllers/SplashController.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/stages/AboutStage.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/stages/OpenChannelStage.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/stages/ReceivePaymentStage.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/stages/SendPaymentStage.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/utils/ContextMenuUtils.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/main/scala/fr/acinq/eclair/gui/utils/GUIValidators.scala (100%) rename {eclair-node-javafx => eclair-node-gui}/src/test/resources/logback-test.xml (100%) diff --git a/BUILD.md b/BUILD.md index 115f02bdb..c90d94661 100644 --- a/BUILD.md +++ b/BUILD.md @@ -10,7 +10,12 @@ To build the project, simply run: ```shell $ mvn package ``` -or +To skip the tests, run: ```shell $ mvn package -DskipTests ``` +To generate the windows installer along with the build, run the following command: +```shell +$ mvn package -DskipTests -Pinstaller +``` +The generated installer will be located in `eclair-node-gui/target/jfx/installer` diff --git a/README.md b/README.md index 55e5c4386..aa5d4b1b6 100644 --- a/README.md +++ b/README.md @@ -61,11 +61,11 @@ You need to first install java, more precisely a [JRE 1.8](http://www.oracle.com Then download the latest fat jar and depending on whether or not you want a GUI run the following command: * with GUI: ```shell -java -jar eclair-node-javafx_xxxxxx-fat.jar +java -jar eclair-node-gui--.jar ``` * without GUI: ```shell -java -jar eclair-node_xxxxxx-fat.jar +java -jar eclair-node--.jar ``` ### Configuring Eclair diff --git a/eclair-node-javafx/pom.xml b/eclair-node-gui/pom.xml similarity index 54% rename from eclair-node-javafx/pom.xml rename to eclair-node-gui/pom.xml index 1c40bdcac..0f69bce06 100644 --- a/eclair-node-javafx/pom.xml +++ b/eclair-node-gui/pom.xml @@ -8,10 +8,10 @@ 0.2-SNAPSHOT - eclair-node-javafx_2.11 + eclair-node-gui_2.11 jar - ${project.artifactId} + eclair-node-gui @@ -44,7 +44,7 @@ - sg.enixsoft + com.github.chrisdchristo capsule-maven-plugin @@ -54,45 +54,58 @@ fr.acinq.eclair.JavafxBoot fat - -${git.commit.id.abbrev}-capsule-fat + ${project.name}-${project.version} + -${git.commit.id.abbrev} - - com.zenjava - javafx-maven-plugin - 8.8.3 - - - - create-jfxjar - package - - build-jar - - - - package - - build-native - - - - - ACINQ - true - Eclair (Alpha 3) - 0.2.0 - fr.acinq.eclair.JavafxBoot - false - EXE - true - - + + + installer + + + + com.zenjava + javafx-maven-plugin + 8.8.3 + + + + create-jfxjar + package + + build-jar + + + + package + + build-native + + + + + ACINQ + true + Eclair + ${project.version} + true + ${project.build.directory}/jfx/installer + fr.acinq.eclair.JavafxBoot + false + EXE + true + + + + + + + fr.acinq.eclair diff --git a/eclair-node-javafx/src/main/deploy/package/windows/Eclair (Alpha 3)-setup-icon.bmp b/eclair-node-gui/src/main/deploy/package/windows/Eclair-setup-icon.bmp similarity index 100% rename from eclair-node-javafx/src/main/deploy/package/windows/Eclair (Alpha 3)-setup-icon.bmp rename to eclair-node-gui/src/main/deploy/package/windows/Eclair-setup-icon.bmp diff --git a/eclair-node-javafx/src/main/deploy/package/windows/Eclair (Alpha 3).ico b/eclair-node-gui/src/main/deploy/package/windows/Eclair.ico similarity index 100% rename from eclair-node-javafx/src/main/deploy/package/windows/Eclair (Alpha 3).ico rename to eclair-node-gui/src/main/deploy/package/windows/Eclair.ico diff --git a/eclair-node-javafx/src/main/resources/gui/commons/globals.css b/eclair-node-gui/src/main/resources/gui/commons/globals.css similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/globals.css rename to eclair-node-gui/src/main/resources/gui/commons/globals.css diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/close.png b/eclair-node-gui/src/main/resources/gui/commons/images/close.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/close.png rename to eclair-node-gui/src/main/resources/gui/commons/images/close.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/connection_icon.png b/eclair-node-gui/src/main/resources/gui/commons/images/connection_icon.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/connection_icon.png rename to eclair-node-gui/src/main/resources/gui/commons/images/connection_icon.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/copy_icon.png b/eclair-node-gui/src/main/resources/gui/commons/images/copy_icon.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/copy_icon.png rename to eclair-node-gui/src/main/resources/gui/commons/images/copy_icon.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/eclair-fit.png b/eclair-node-gui/src/main/resources/gui/commons/images/eclair-fit.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/eclair-fit.png rename to eclair-node-gui/src/main/resources/gui/commons/images/eclair-fit.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/eclair-shape.png b/eclair-node-gui/src/main/resources/gui/commons/images/eclair-shape.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/eclair-shape.png rename to eclair-node-gui/src/main/resources/gui/commons/images/eclair-shape.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/eclair-square.png b/eclair-node-gui/src/main/resources/gui/commons/images/eclair-square.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/eclair-square.png rename to eclair-node-gui/src/main/resources/gui/commons/images/eclair-square.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/in-out-00.png b/eclair-node-gui/src/main/resources/gui/commons/images/in-out-00.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/in-out-00.png rename to eclair-node-gui/src/main/resources/gui/commons/images/in-out-00.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/in-out-01.png b/eclair-node-gui/src/main/resources/gui/commons/images/in-out-01.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/in-out-01.png rename to eclair-node-gui/src/main/resources/gui/commons/images/in-out-01.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/in-out-10.png b/eclair-node-gui/src/main/resources/gui/commons/images/in-out-10.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/in-out-10.png rename to eclair-node-gui/src/main/resources/gui/commons/images/in-out-10.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/in-out-11.png b/eclair-node-gui/src/main/resources/gui/commons/images/in-out-11.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/in-out-11.png rename to eclair-node-gui/src/main/resources/gui/commons/images/in-out-11.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/info_icon.png b/eclair-node-gui/src/main/resources/gui/commons/images/info_icon.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/info_icon.png rename to eclair-node-gui/src/main/resources/gui/commons/images/info_icon.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/success_icon.png b/eclair-node-gui/src/main/resources/gui/commons/images/success_icon.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/success_icon.png rename to eclair-node-gui/src/main/resources/gui/commons/images/success_icon.png diff --git a/eclair-node-javafx/src/main/resources/gui/commons/images/warning_icon.png b/eclair-node-gui/src/main/resources/gui/commons/images/warning_icon.png similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/commons/images/warning_icon.png rename to eclair-node-gui/src/main/resources/gui/commons/images/warning_icon.png diff --git a/eclair-node-javafx/src/main/resources/gui/main/channelPane.fxml b/eclair-node-gui/src/main/resources/gui/main/channelPane.fxml similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/main/channelPane.fxml rename to eclair-node-gui/src/main/resources/gui/main/channelPane.fxml diff --git a/eclair-node-javafx/src/main/resources/gui/main/main.css b/eclair-node-gui/src/main/resources/gui/main/main.css similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/main/main.css rename to eclair-node-gui/src/main/resources/gui/main/main.css diff --git a/eclair-node-javafx/src/main/resources/gui/main/main.fxml b/eclair-node-gui/src/main/resources/gui/main/main.fxml similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/main/main.fxml rename to eclair-node-gui/src/main/resources/gui/main/main.fxml diff --git a/eclair-node-javafx/src/main/resources/gui/main/notificationPane.fxml b/eclair-node-gui/src/main/resources/gui/main/notificationPane.fxml similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/main/notificationPane.fxml rename to eclair-node-gui/src/main/resources/gui/main/notificationPane.fxml diff --git a/eclair-node-javafx/src/main/resources/gui/main/notifications.fxml b/eclair-node-gui/src/main/resources/gui/main/notifications.fxml similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/main/notifications.fxml rename to eclair-node-gui/src/main/resources/gui/main/notifications.fxml diff --git a/eclair-node-javafx/src/main/resources/gui/modals/about.fxml b/eclair-node-gui/src/main/resources/gui/modals/about.fxml similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/modals/about.fxml rename to eclair-node-gui/src/main/resources/gui/modals/about.fxml diff --git a/eclair-node-javafx/src/main/resources/gui/modals/openChannel.fxml b/eclair-node-gui/src/main/resources/gui/modals/openChannel.fxml similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/modals/openChannel.fxml rename to eclair-node-gui/src/main/resources/gui/modals/openChannel.fxml diff --git a/eclair-node-javafx/src/main/resources/gui/modals/receivePayment.fxml b/eclair-node-gui/src/main/resources/gui/modals/receivePayment.fxml similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/modals/receivePayment.fxml rename to eclair-node-gui/src/main/resources/gui/modals/receivePayment.fxml diff --git a/eclair-node-javafx/src/main/resources/gui/modals/sendPayment.fxml b/eclair-node-gui/src/main/resources/gui/modals/sendPayment.fxml similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/modals/sendPayment.fxml rename to eclair-node-gui/src/main/resources/gui/modals/sendPayment.fxml diff --git a/eclair-node-javafx/src/main/resources/gui/splash/splash.css b/eclair-node-gui/src/main/resources/gui/splash/splash.css similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/splash/splash.css rename to eclair-node-gui/src/main/resources/gui/splash/splash.css diff --git a/eclair-node-javafx/src/main/resources/gui/splash/splash.fxml b/eclair-node-gui/src/main/resources/gui/splash/splash.fxml similarity index 100% rename from eclair-node-javafx/src/main/resources/gui/splash/splash.fxml rename to eclair-node-gui/src/main/resources/gui/splash/splash.fxml diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/JavafxBoot.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/JavafxBoot.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/JavafxBoot.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/JavafxBoot.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/FxApp.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/FxApp.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/FxApp.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/FxApp.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/FxPreloader.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/FxPreloader.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/FxPreloader.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/FxPreloader.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/GUIUpdater.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/GUIUpdater.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/GUIUpdater.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/GUIUpdater.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/Handlers.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/Handlers.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/Handlers.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/Handlers.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/AboutController.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/AboutController.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/AboutController.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/AboutController.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/ChannelPaneController.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/ChannelPaneController.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/ChannelPaneController.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/ChannelPaneController.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/MainController.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/MainController.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/MainController.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/MainController.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/NotificationPaneController.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/NotificationPaneController.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/NotificationPaneController.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/NotificationPaneController.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/NotificationsController.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/NotificationsController.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/NotificationsController.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/NotificationsController.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/OpenChannelController.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/OpenChannelController.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/OpenChannelController.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/OpenChannelController.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/ReceivePaymentController.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/ReceivePaymentController.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/ReceivePaymentController.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/ReceivePaymentController.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/SendPaymentController.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/SendPaymentController.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/SendPaymentController.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/SendPaymentController.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/SplashController.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/SplashController.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/controllers/SplashController.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/controllers/SplashController.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/stages/AboutStage.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/stages/AboutStage.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/stages/AboutStage.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/stages/AboutStage.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/stages/OpenChannelStage.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/stages/OpenChannelStage.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/stages/OpenChannelStage.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/stages/OpenChannelStage.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/stages/ReceivePaymentStage.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/stages/ReceivePaymentStage.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/stages/ReceivePaymentStage.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/stages/ReceivePaymentStage.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/stages/SendPaymentStage.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/stages/SendPaymentStage.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/stages/SendPaymentStage.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/stages/SendPaymentStage.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/utils/ContextMenuUtils.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/utils/ContextMenuUtils.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/utils/ContextMenuUtils.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/utils/ContextMenuUtils.scala diff --git a/eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/utils/GUIValidators.scala b/eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/utils/GUIValidators.scala similarity index 100% rename from eclair-node-javafx/src/main/scala/fr/acinq/eclair/gui/utils/GUIValidators.scala rename to eclair-node-gui/src/main/scala/fr/acinq/eclair/gui/utils/GUIValidators.scala diff --git a/eclair-node-javafx/src/test/resources/logback-test.xml b/eclair-node-gui/src/test/resources/logback-test.xml similarity index 100% rename from eclair-node-javafx/src/test/resources/logback-test.xml rename to eclair-node-gui/src/test/resources/logback-test.xml diff --git a/eclair-node/pom.xml b/eclair-node/pom.xml index 277c2581a..83b6cc39b 100644 --- a/eclair-node/pom.xml +++ b/eclair-node/pom.xml @@ -11,7 +11,7 @@ eclair-node_2.11 jar - ${project.artifactId} + eclair-node @@ -44,7 +44,7 @@ - sg.enixsoft + com.github.chrisdchristo capsule-maven-plugin @@ -54,7 +54,8 @@ fr.acinq.eclair.Boot fat - -${git.commit.id.abbrev}-capsule-fat + ${project.name}-${project.version} + -${git.commit.id.abbrev} diff --git a/pom.xml b/pom.xml index 246bce092..c8900a63b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ eclair-core eclair-node - eclair-node-javafx + eclair-node-gui A scala implementation of the Lightning Network @@ -64,9 +64,9 @@ 2.2.2 - sg.enixsoft + com.github.chrisdchristo capsule-maven-plugin - 1.3.0 + 1.5.1