diff --git a/build/BudgetMaster.exe b/build/BudgetMaster.exe new file mode 100644 index 0000000000000000000000000000000000000000..c1d58aab51407c126a005680e880a19fd53ca44e Binary files /dev/null and b/build/BudgetMaster.exe differ diff --git a/build/BudgetMaster.xml b/build/BudgetMaster.xml new file mode 100644 index 0000000000000000000000000000000000000000..919fca468697c2a993c04cd8c7c6f34ad36925c5 --- /dev/null +++ b/build/BudgetMaster.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<launch4jConfig> + <dontWrapJar>false</dontWrapJar> + <headerType>gui</headerType> + <jar>C:\Programmierung\eclipse\workspace\BudgetMaster\build\BudgetMasterClient.jar</jar> + <outfile>C:\Programmierung\eclipse\workspace\BudgetMaster\build\BudgetMaster.exe</outfile> + <errTitle></errTitle> + <cmdLine></cmdLine> + <chdir>.</chdir> + <priority>normal</priority> + <downloadUrl>http://java.com/download</downloadUrl> + <supportUrl></supportUrl> + <stayAlive>false</stayAlive> + <restartOnCrash>false</restartOnCrash> + <manifest></manifest> + <icon>C:\Programmierung\eclipse\workspace\BudgetMaster\build\icon.ico</icon> + <classPath> + <mainClass>de.deadlocker8.budgetmaster.main.Main</mainClass> + <cp>.</cp> + </classPath> + <jre> + <path></path> + <bundledJre64Bit>false</bundledJre64Bit> + <bundledJreAsFallback>false</bundledJreAsFallback> + <minVersion>1.8.0</minVersion> + <maxVersion></maxVersion> + <jdkPreference>preferJre</jdkPreference> + <runtimeBits>64/32</runtimeBits> + </jre> +</launch4jConfig> \ No newline at end of file diff --git a/build/BudgetMasterClient.jar b/build/BudgetMasterClient.jar new file mode 100644 index 0000000000000000000000000000000000000000..1995d5a80db64afbfaaa3188f819e37f744fd51b Binary files /dev/null and b/build/BudgetMasterClient.jar differ diff --git a/build/BudgetMasterServer.jar b/build/BudgetMasterServer.jar new file mode 100644 index 0000000000000000000000000000000000000000..51080ca943c094af3655c71eb638ac43c2f63aac Binary files /dev/null and b/build/BudgetMasterServer.jar differ diff --git a/build/icon.ico b/build/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a42167277ad9f0c7de35f72b8e095bcdd003ff93 Binary files /dev/null and b/build/icon.ico differ diff --git a/src/de/deadlocker8/budgetmaster/main/_de.properties b/src/de/deadlocker8/budgetmaster/main/_de.properties index ea28116008183bf5991285ec79594df6e5a44db9..f083d697d2985676e121ab2270c8a15a9d761b3a 100644 --- a/src/de/deadlocker8/budgetmaster/main/_de.properties +++ b/src/de/deadlocker8/budgetmaster/main/_de.properties @@ -1,7 +1,7 @@ app.name=BudgetMaster version.code=1 version.name=1.0.0 -version.date=28.03.17 +version.date=08.04.17 author=Robert Goldmann folder=Deadlocker/BudgetMaster diff --git a/src/de/deadlocker8/budgetmasterserver/main/_de.properties b/src/de/deadlocker8/budgetmasterserver/main/_de.properties index 322f4d8f18220afcb4f5809f4ad7995bb02e37fc..ed61ad0100bb678c945a6c00046ce13b823c4836 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/_de.properties +++ b/src/de/deadlocker8/budgetmasterserver/main/_de.properties @@ -1,5 +1,5 @@ app.name=BudgetMasterServer version.code=1 version.name=1.0.0 -version.date=28.03.17 +version.date=08.04.17 author=Robert Goldmann \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmasterserver/resources/settings.json b/src/de/deadlocker8/budgetmasterserver/resources/settings.json index a6d06ac193b1392dfc26688d3bbca53dc18710b5..d2281ffa1e99ec74bc91d8b444c3a43dcf93f26b 100644 --- a/src/de/deadlocker8/budgetmasterserver/resources/settings.json +++ b/src/de/deadlocker8/budgetmasterserver/resources/settings.json @@ -1,6 +1,6 @@ { "databaseUrl": "jdbc:mysql://localhost:3306/", - "databaseName": "budgetmastersave", + "databaseName": "budgetmaster", "databaseUsername": "root", "databasePassword": "", "serverPort": 9000, diff --git a/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java b/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java index d9b5163d50da921d0b2e91e10a58194f3d97a34a..760e6fb7424d0554da7e51d061f5606d4114d328 100644 --- a/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java +++ b/src/de/deadlocker8/budgetmasterserver/server/SparkServer.java @@ -54,7 +54,12 @@ public class SparkServer try { - File keystoreFile = new File(settings.getKeystorePath()); + String filePath = settings.getKeystorePath(); + if(filePath.equals("")) + { + throw new Exception("empty string is no valid keystorePath"); + } + File keystoreFile = new File(filePath); secure(keystoreFile.getAbsolutePath(), settings.getKeystorePassword(), null, null); } catch(Exception e) @@ -112,7 +117,6 @@ public class SparkServer Spark.exception(Exception.class, (exception, request, response) -> { Logger.error(exception); - exception.printStackTrace(); }); } } \ No newline at end of file