Work towards Settings. Add Webservice settings elements.

serverpackcreator-api/src/jvmMain/kotlin/de/griefed/serverpackcreator/api/ApiProperties.kt

@@ -522,6 +522,10 @@ actual class ApiProperties(
     val fallbackServerPackCleanupEnabled = true
     val fallbackMinecraftPreReleasesAvailabilityEnabled = false
     val fallbackAutoExcludingModsEnabled = true
+    val fallbackArtemisQueueMaxDiskUsage = 90
+    val fallbackCleanupSchedule = "0 0 0 * * *"
+    val fallbackVersionSchedule = "0 0 0 * * *"
+    val fallbackDatabaseCleanupSchedule = "0 0 0 * * *"
     private val serverPackCreatorProperties = "serverpackcreator.properties"
     private val checkedJavas = hashMapOf<String, Boolean>()
 
@@ -1089,7 +1093,7 @@ actual class ApiProperties(
     /**
      * Maximum disk usage in percent until Artemis stops accepting new entries.
      */
-    var queueMaxDiskUsage = 90
+    var artemisQueueMaxDiskUsage = 90
         get() {
             val usage = getIntProperty(pSpringArtemisQueueMaxDiskUsage, 90)
             field = if (usage in 0..100) {
@@ -1110,6 +1114,38 @@ actual class ApiProperties(
             }
         }
 
+    var webserviceCleanupSchedule: String
+        get() {
+            return internalProps.getProperty("de.griefed.serverpackcreator.spring.schedules.database.cleanup")
+        }
+        set(value) {
+            internalProps.setProperty("de.griefed.serverpackcreator.spring.schedules.database.cleanup",value)
+        }
+
+    var webserviceVersionSchedule: String
+        get() {
+            return internalProps.getProperty("de.griefed.serverpackcreator.spring.schedules.versions.refresh")
+        }
+        set(value) {
+            internalProps.setProperty("de.griefed.serverpackcreator.spring.schedules.versions.refresh",value)
+        }
+
+    var webserviceDatabaseCleanupSchedule: String
+        get() {
+            return internalProps.getProperty("de.griefed.serverpackcreator.spring.schedules.files.cleanup")
+        }
+        set(value) {
+            internalProps.setProperty("de.griefed.serverpackcreator.spring.schedules.files.cleanup",value)
+        }
+
+    fun defaultWebserviceDatabase(): File {
+        return File(userHome,"serverpackcreator.db")
+    }
+
+    fun defaultArtemisDataDirectory(): File {
+        return File(workDirectory, "artemis")
+    }
+
     /**
      * Default home-directory for ServerPackCreator. If there's no user-home, then the directory containing the
      * ServerPackCreator JAR will be used as the home-directory for ServerPackCreator.
@@ -1193,6 +1229,10 @@ actual class ApiProperties(
             log.info("Set Tomcat base-directory to: $field")
         }
 
+    fun defaultTomcatBaseDirectory(): File {
+        return homeDirectory.absoluteFile
+    }
+
     fun defaultServerPacksDirectory(): File {
         return File(homeDirectory, "server-packs").absoluteFile
     }
@@ -1237,7 +1277,7 @@ actual class ApiProperties(
     @Suppress("MemberVisibilityCanBePrivate")
     var tomcatLogsDirectory: File = logsDirectory
         get() {
-            val default = File("${homeDirectory}${File.separator}logs").absolutePath
+            val default = File(homeDirectory,"logs").absolutePath
             val dir = internalProps.getProperty(pTomcatLogsDirectory, default)
             field = File(dir).absoluteFile
             return field
@@ -1248,6 +1288,10 @@ actual class ApiProperties(
             log.info("Set Tomcat logs-directory to: $field")
         }
 
+    fun defaultTomcatLogsDirectory(): File {
+        return File(homeDirectory,"logs").absoluteFile
+    }
+
     /**
      * Directory to which default/fallback manifests are copied to during the startup of
      * ServerPackCreator.
@@ -2066,7 +2110,7 @@ actual class ApiProperties(
         log.info("Checking for pre-releases set to:   $isCheckingForPreReleasesEnabled")
         log.info("Zip-file exclusion enabled set to:  $isZipFileExclusionEnabled")
         log.info("HasteBin documents endpoint set to: $hasteBinServerUrl")
-        log.info("Queue max disk usage set to:        $queueMaxDiskUsage")
+        log.info("Queue max disk usage set to:        $artemisQueueMaxDiskUsage")
         log.info("Directories which must always be included set to: $directoriesToInclude")
         log.info("Directories which must always be excluded set to: $directoriesToExclude")
         log.info("Cleanup of already existing server packs set to:  $isServerPackCleanupEnabled")

serverpackcreator-api/src/jvmTest/kotlin/de/griefed/serverpackcreator/api/ApiPropertiesTest.kt

@@ -214,7 +214,7 @@ class ApiPropertiesTest internal constructor() {
         Assertions.assertNotNull(apiProperties.serverPacksDirectory)
         Assertions.assertNotNull(apiProperties.directoriesToExclude)
         Assertions.assertFalse(apiProperties.isCheckingForPreReleasesEnabled)
-        Assertions.assertEquals(90, apiProperties.queueMaxDiskUsage)
+        Assertions.assertEquals(90, apiProperties.artemisQueueMaxDiskUsage)
         Assertions.assertEquals("dev", apiProperties.apiVersion)
     }
 }

serverpackcreator-gui/src/main/kotlin/de/griefed/serverpackcreator/gui/window/settings/GlobalSettings.kt

@@ -42,7 +42,7 @@ class GlobalSettings(guiProps: GuiProps, apiProperties: ApiProperties, component
     val homeReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) { homeSetting.file = apiProperties.defaultHomeDirectory() }
     val homeChoose = BalloonTipButton(null,guiProps.folderIcon,"Select directory",guiProps) {
         val homeChooser = HomeDirChooser(apiProperties,"Home Directory Chooser")
-        if (homeChooser.showSaveDialog(mainFrame.frame) == JFileChooser.APPROVE_OPTION) {
+        if (homeChooser.showSaveDialog(mainFrame.frame) == JFileChooser.SAVE_DIALOG) {
             homeSetting.file = homeChooser.selectedFile.absoluteFile
         }
     }
@@ -54,7 +54,7 @@ class GlobalSettings(guiProps: GuiProps, apiProperties: ApiProperties, component
     val javaReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) { javaSetting.file = File(apiProperties.acquireJavaPath()).absoluteFile }
     val javaChoose = BalloonTipButton(null,guiProps.folderIcon,"Select executable",guiProps) {
         val javaChooser = JavaChooser(apiProperties,"Java Executable Chooser")
-        if (javaChooser.showSaveDialog(mainFrame.frame) == JFileChooser.APPROVE_OPTION) {
+        if (javaChooser.showSaveDialog(mainFrame.frame) == JFileChooser.SAVE_DIALOG) {
             javaSetting.file = javaChooser.selectedFile.absoluteFile
         }
     }
@@ -66,7 +66,7 @@ class GlobalSettings(guiProps: GuiProps, apiProperties: ApiProperties, component
     val serverPacksReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) { serverPacksSetting.file = apiProperties.defaultServerPacksDirectory() }
     val serverPacksChoose = BalloonTipButton(null,guiProps.folderIcon,"Select directory",guiProps) {
         val serverPackDirChooser = ServerPackDirChooser(apiProperties,"Server Pack Directory Chooser")
-        if (serverPackDirChooser.showSaveDialog(mainFrame.frame) == JFileChooser.APPROVE_OPTION) {
+        if (serverPackDirChooser.showSaveDialog(mainFrame.frame) == JFileChooser.SAVE_DIALOG) {
             serverPacksSetting.file = serverPackDirChooser.selectedFile.absoluteFile
         }
     }
@@ -96,7 +96,7 @@ class GlobalSettings(guiProps: GuiProps, apiProperties: ApiProperties, component
     val scriptReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) { scriptSetting.text = apiProperties.defaultScriptTemplates().joinToString(", ") }
     val scriptChoose = BalloonTipButton(null,guiProps.folderIcon,"Select directory",guiProps) {
         val scriptChooser = ScriptTemplatesChooser(apiProperties,"Script Template Chooser")
-        if (scriptChooser.showSaveDialog(mainFrame.frame) == JFileChooser.APPROVE_OPTION) {
+        if (scriptChooser.showSaveDialog(mainFrame.frame) == JFileChooser.SAVE_DIALOG) {
             scriptSetting.text = scriptChooser.selectedFiles.joinToString(", ") { it.absolutePath }
         }
     }

serverpackcreator-gui/src/main/kotlin/de/griefed/serverpackcreator/gui/window/settings/GuiSettings.kt

@@ -24,69 +24,67 @@ import de.griefed.serverpackcreator.gui.components.BalloonTipButton
 import de.griefed.serverpackcreator.gui.components.ElementLabel
 import de.griefed.serverpackcreator.gui.components.StatusIcon
 import de.griefed.serverpackcreator.gui.window.settings.components.Editor
-import java.awt.Font
 import javax.swing.JCheckBox
 import javax.swing.JSlider
-import javax.swing.UIManager
 
 class GuiSettings(guiProps: GuiProps) : Editor("Gui", guiProps) {
 
     val fontSizeIcon = StatusIcon(guiProps,"Size of fonts in ServerPackCreators GUI.")
     val fontSizeLabel = ElementLabel("Font Size")
-    val fontSizeSlider = JSlider(8,76,guiProps.fontSize)
+    val fontSizeSetting = JSlider(8,76,guiProps.fontSize)
     val fontSizeRevert = BalloonTipButton(null,guiProps.revertIcon,"Revert changes", guiProps) {
-        fontSizeSlider.value = guiProps.fontSize
+        fontSizeSetting.value = guiProps.fontSize
     }
     val fontSizeReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) {
-        fontSizeSlider.value = 12
+        fontSizeSetting.value = 12
     }
 
     val startFocusIcon = StatusIcon(guiProps,"Whether ServerPackCreator should be focused after starting.")
     val startFocusLabel = ElementLabel("Focus On Start")
-    val startFocusEnabled = JCheckBox()
+    val startFocusSetting = JCheckBox()
     val startFocusRevert = BalloonTipButton(null,guiProps.revertIcon,"Revert changes",guiProps) {
-        startFocusEnabled.isSelected = guiProps.startFocusEnabled
+        startFocusSetting.isSelected = guiProps.startFocusEnabled
     }
     val startFocusReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) {
-        startFocusEnabled.isSelected = false
+        startFocusSetting.isSelected = false
     }
 
     val generationFocusIcon = StatusIcon(guiProps,"Whether ServerPackCreator should be focused after a server pack has been generated.")
     val generationFocusLabel = ElementLabel("Focus After Generation")
-    val generationFocusEnabled = JCheckBox()
+    val generationFocusSetting = JCheckBox()
     val generationFocusRevert = BalloonTipButton(null,guiProps.revertIcon,"Revert changes",guiProps) {
-        generationFocusEnabled.isSelected = guiProps.generationFocusEnabled
+        generationFocusSetting.isSelected = guiProps.generationFocusEnabled
     }
     val generationFocusReset = BalloonTipButton(null,guiProps.resetIcon,"Reset to default value",guiProps) {
-        generationFocusEnabled.isSelected = false
+        generationFocusSetting.isSelected = false
     }
 
     init {
-        startFocusEnabled.isSelected = guiProps.startFocusEnabled
-        generationFocusEnabled.isSelected = guiProps.generationFocusEnabled
-        fontSizeSlider.paintTicks = true
-        fontSizeSlider.paintLabels = true
-        fontSizeSlider.majorTickSpacing = 4
-        fontSizeSlider.minorTickSpacing = 2
+        startFocusSetting.isSelected = guiProps.startFocusEnabled
+        generationFocusSetting.isSelected = guiProps.generationFocusEnabled
+        fontSizeSetting.paintTicks = true
+        fontSizeSetting.paintLabels = true
+        fontSizeSetting.majorTickSpacing = 4
+        fontSizeSetting.minorTickSpacing = 2
 
         var y = 0
         panel.add(fontSizeIcon, "cell 0 $y")
         panel.add(fontSizeLabel, "cell 1 $y")
-        panel.add(fontSizeSlider, "cell 2 $y, grow")
+        panel.add(fontSizeSetting, "cell 2 $y, grow")
         panel.add(fontSizeRevert, "cell 3 $y")
         panel.add(fontSizeReset, "cell 4 $y")
 
         y++
         panel.add(startFocusIcon, "cell 0 $y")
         panel.add(startFocusLabel, "cell 1 $y")
-        panel.add(startFocusEnabled, "cell 2 $y, grow")
+        panel.add(startFocusSetting, "cell 2 $y, grow")
         panel.add(startFocusRevert, "cell 3 $y")
         panel.add(startFocusReset, "cell 4 $y")
 
         y++
         panel.add(generationFocusIcon, "cell 0 $y")
         panel.add(generationFocusLabel, "cell 1 $y")
-        panel.add(generationFocusEnabled, "cell 2 $y, grow")
+        panel.add(generationFocusSetting, "cell 2 $y, grow")
         panel.add(generationFocusRevert, "cell 3 $y")
         panel.add(generationFocusReset, "cell 4 $y")
     }

serverpackcreator-gui/src/main/kotlin/de/griefed/serverpackcreator/gui/window/settings/SettingsEditorsTab.kt

@@ -36,7 +36,7 @@ class SettingsEditorsTab(guiProps: GuiProps, apiProperties: ApiProperties, mainF
 
     private val componentResizer = ComponentResizer()
     val global = GlobalSettings(guiProps, apiProperties, componentResizer, mainFrame)
-    val webservice = WebserviceSettings(guiProps)
+    val webservice = WebserviceSettings(guiProps, apiProperties,mainFrame)
     val gui = GuiSettings(guiProps)
 
     init {