Skip to content

Commit

Permalink
completing dev tree for merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Luatan committed Mar 1, 2022
1 parent 5887322 commit 3647cef
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 44 deletions.
33 changes: 18 additions & 15 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 21 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</dependencies>

<properties>
<app.mode>beta</app.mode>
<app.mode>live</app.mode>
<!-- Installer Filename without suffix -->
<app.filename>${project.name}</app.filename>

Expand All @@ -60,10 +60,10 @@
<app.version>1.0</app.version>

<!-- Base URL where you will host the application artifacts -->
<app.url>https://resolver.luatan.com/update/${app.mode}</app.url>
<app.url>https://update.dnsresolver.ch/v1/${app.mode}</app.url>

<!-- Optional scp target for application artifacts hosted at the above url -->
<app.deploy.target>[email protected]:/var/www/resolver.luatan.com/public_html/update/${app.mode}</app.deploy.target>
<app.deploy.target>[email protected]:/var/www/update.dnsresolver.ch/public_html/v1/${app.mode}</app.deploy.target>

<!-- The app and launcher will be assembled in this folder -->
<app.dir>${project.build.directory}/DNSResolver</app.dir>
Expand Down Expand Up @@ -153,24 +153,24 @@
</configuration>
</execution>
<!-- Optional step to include custom UI, see https://github.com/edvin/fxlauncher-custom-ui -->
<!--<execution>-->
<!--<id>embed-custom-ui-in-launcher</id>-->
<!--<phase>package</phase>-->
<!--<goals>-->
<!--<goal>exec</goal>-->
<!--</goals>-->
<!--<configuration>-->
<!--<executable>jar</executable>-->
<!--<workingDirectory>${app.dir}</workingDirectory>-->
<!--<arguments>-->
<!--<argument>uf</argument>-->
<!--<argument>fxlauncher.jar</argument>-->
<!--<argument>-C</argument>-->
<!--<argument>${project.basedir}/../fxlauncher-custom-ui/target/classes</argument>-->
<!--<argument>.</argument>-->
<!--</arguments>-->
<!--</configuration>-->
<!--</execution>-->
<execution>
<id>embed-custom-ui-in-launcher</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>jar</executable>
<workingDirectory>${app.dir}</workingDirectory>
<arguments>
<argument>uf</argument>
<argument>fxlauncher.jar</argument>
<argument>-C</argument>
<argument>${project.basedir}/../DNSResolver_launcher_ui/target/classes</argument>
<argument>.</argument>
</arguments>
</configuration>
</execution>
<!-- Create native installer. Feel free to add more arguments as needed.
https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javapackager.html
-->
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/ch/luatan/DNSResolver/DNSResolver.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ public class DNSResolver extends Application {
private double yOffset;
private double xOffset;

public void work() {
try {
launch();
} catch (Exception e) {
e.printStackTrace();
}
}

@Override
public void start(Stage primaryStage) throws Exception {
// Settings init
Expand Down

0 comments on commit 3647cef

Please sign in to comment.