[Observe-commits] 01/01: Use new ini format for configuration description

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit a2f2ad729b36d3c4ca38602135ecaa63655ce8cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 7 11:58:03 2016 +0200 Use new ini format for configuration description --- .../src/main/config/ObserveSwingApplication.ini | 518 ++++++++++++++++++ .../src/main/config/ObserveSwingApplication.toml | 601 --------------------- .../src/main/config/ObserveWebApplication.ini | 99 ++++ .../src/main/config/ObserveWebApplication.toml | 112 ---- pom.xml | 2 +- 5 files changed, 618 insertions(+), 714 deletions(-) diff --git a/application-swing-configuration/src/main/config/ObserveSwingApplication.ini b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini new file mode 100644 index 0000000..b1d0db5 --- /dev/null +++ b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini @@ -0,0 +1,518 @@ +description = ObserveSwingApplicationConfig.description + +[option configFile] +description = observe.config.configFileName.description +key = config.file +type = string +defaultValue = observeSwing.conf +transient = true +final = true + +[option devMode] +description = observe.config.devMode +key = observe.devMode +type = Boolean +defaultValue = true +transient = true +final = true + +[option modelVersion] +description = observe.model.version +key = observe.model.version +type = version +transient = true +final = true + +[option dataDirectory] +description = observe.config.defaultDataDirectory.description +key = data.directory +type = file +defaultValue = ${user.home}/.observe +transient = true +final = true + +[option dbDirectory] +description = observe.config.defaultLocalDbDirectory.description +key = db.directory +type = file +defaultValue = ${data.directory}/db +transient = true +final = true + +[option initialDbDump] +description = observe.config.defaultInitialDbDump.description +key = initial.db.dump +type = file +defaultValue = ${data.directory}/initial-database.sql.gz + +[option backupDirectory] +description = observe.config.defaultBackupDirectory.description +key = backup.directory +type = file +defaultValue = ${data.directory}/backup +transient = true +final = true + +[option resourcesDirectory] +description = observe.config.defaultResourcesDirectory.description +key = resources.directory +type = file +defaultValue = ${data.directory}/resources-${version} +transient = true +final = true + +[option i18nDirectory] +description = observe.config.defaultI18nDirectory.description +key = i18n.directory +type = file +defaultValue = ${resources.directory}/i18n +transient = true +final = true + +[option reportDirectory] +description = observe.config.defaultReportDirectory.description +key = report.directory +type = file +defaultValue = ${resources.directory}/report +transient = true +final = true + +[option mapDirectory] +description = observe.config.defaultMapDirectory.description +key = map.directory +type = file +defaultValue = ${resources.directory}/map +transient = true +final = true + +[option validationReportDirectory] +description = observe.config.defaultValidationReportDirectory.description +key = validation.report.directory +type = file +defaultValue = ${data.directory}/validation-report +transient = true +final = true + +[option tmpDirectory] +description = observe.config.defaultTmpDirectory.description +key = tmp.directory +type = file +defaultValue = ${data.directory}/tmp +transient = true +final = true + +[option logConfigurationFile] +description = observe.config.logConfigurationFile.description +key = logConfigurationFile +type = file +defaultValue = ${resources.directory}/observe-log4j.properties +transient = true + +[option h2Login] +description = observe.config.h2.login.description +key = h2.username +type = string +defaultValue = sa +transient = true +final = true + +[option h2Password] +description = observe.config.h2.password.description +key = h2.password +type = string +defaultValue = sa +transient = true +final = true + +[option h2CanMigrate] +description = observe.config.h2.can.migrate.description +key = h2.canMigrate +type = Boolean +defaultValue = true + +[option h2ServerPort] +description = observe.config.h2.serverPort.description +key = h2.serverPort +type = Integer +defaultValue = 9093 + +[option obstunaUrl] +description = observe.config.obstuna.url.description +key = obstuna.url +type = string +defaultValue = jdbc:postgresql:///obstuna + +[option obstunaLogin] +description = observe.config.obstuna.login.description +key = obstuna.username +type = string +defaultValue = utilisateur + +[option obstunaPassword] +description = observe.config.obstuna.password.description +key = obstuna.password +type = string +defaultValue = +transient = true + +[option obstunaUseSslCert] +description = observe.config.obstuna.useSsl.description +key = obstuna.useSsl +type = Boolean +defaultValue = false + +[option obstunaCanMigrate] +description = observe.config.pg.can.migrate.description +key = pg.canMigrate +type = Boolean +defaultValue = false + +[option serverUrl] +description = observe.config.server.url.description +key = server.url +type = url + +[option serverLogin] +description = observe.config.server.login.description +key = server.login +type = string +defaultValue = + +[option serverPassword] +description = observe.config.server.password.description +key = server.password +type = string +defaultValue = + +[option serverDatabaseName] +description = observe.config.server.dataBaseName.description +key = server.dataBaseName +type = string + +[option defaultDbMode] +description = observe.config.defaultDbMode +key = defaultDbMode +type = fr.ird.observe.application.swing.configuration.constants.DbMode +defaultValue = USE_LOCAL + +[option defaultCreationMode] +description = observe.config.defaultCreationMode +key = defaultCreationMode +type = fr.ird.observe.application.swing.configuration.constants.CreationMode +defaultValue = IMPORT_EXTERNAL_DUMP + +[option storeRemoteStorage] +description = observe.config.ui.storeRemoteStorage +key = ui.storeRemoteStorage +type = Boolean +defaultValue = true + +[option loadLocalStorage] +description = observe.config.ui.loadLocalStorage +key = ui.loadLocalStorage +type = Boolean +defaultValue = true + +[option showMigrationProgression] +description = observe.config.showMigrationProgression +key = showMigrationProgression +type = Boolean +defaultValue = true + +[option showMigrationSql] +description = observe.config.showMigrationSql +key = showMigrationSql +type = Boolean +defaultValue = true + +[option showSql] +description = observe.config.showSql +key = showSql +type = Boolean +defaultValue = false + +[option changeSynchroSrc] +description = observe.config.ui.changeSynchroSrc +key = ui.changeSynchroSrc +type = Boolean +defaultValue = false + +[option showNumberEditorButton] +description = observe.config.ui.showNumberEditorButton +key = ui.showNumberEditorButton +type = Boolean +defaultValue = true + +[option autoPopupNumberEditor] +description = observe.config.ui.autoPopupNumberEditor +key = ui.autoPopupNumberEditor +type = Boolean +defaultValue = false + +[option showDateTimeEditorSlider] +description = observe.config.ui.showTimeEditorSlider +key = ui.showTimeEditorSlider +type = Boolean +defaultValue = true + +[option fullScreen] +description = observe.config.ui.fullscreen +key = ui.fullscreen +type = Boolean +defaultValue = false + +[option locale] +description = observe.config.ui.locale +key = ui.locale +type = java.util.Locale +defaultValue = fr_FR + +[option dbLocale] +description = observe.config.db.locale +key = db.locale +type = java.util.Locale +defaultValue = fr_FR + +[option nonTargetObservation] +description = observe.config.observation.fauneAssociee +key = observation.fauneAssociee +type = Integer +defaultValue = 1 + +[option targetDiscardsObservation] +description = observe.config.observation.rejetsThons +key = observation.rejetsThons +type = Integer +defaultValue = 1 + +[option samplesObservation] +description = observe.config.observation.mensurations +key = observation.mensurations +type = Integer +defaultValue = 1 + +[option objectsObservation] +description = observe.config.observation.floatingObject +key = observation.floatingObject +type = Integer +defaultValue = 1 + +[option detailledActivitiesObservation] +description = observe.config.observation.activitysDetaillees +key = observation.activitysDetaillees +type = Integer +defaultValue = 1 + +[option mammalsObservation] +description = observe.config.observation.mammiferes +key = observation.mammiferes +type = Integer +defaultValue = 1 + +[option birdsObservation] +description = observe.config.observation.oiseaux +key = observation.oiseaux +type = Integer +defaultValue = 1 + +[option baitObservation] +description = observe.config.observation.gleure +key = observation.gleure +type = Integer +defaultValue = 1 + +[option speciesListSeineTargetCatchId] +description = observe.config.speciesList.seine.targetCatch +key = speciesList.seine.targetCatch +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1" + +[option speciesListSeineSchoolEstimateId] +description = observe.config.speciesList.seine.schoolEstimate +key = speciesList.seine.schoolEstimate +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1" + +[option speciesListSeineObjectSchoolEstimateId] +description = observe.config.speciesList.seine.objectSchoolEstimate +key = speciesList.seine.objectSchoolEstimate +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1" + +[option speciesListSeineNonTargetCatchId] +description = observe.config.speciesList.seine.nonTargetCatch +key = speciesList.seine.nonTargetCatch +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2" + +[option speciesListSeineObjectObservedSpeciesId] +description = observe.config.speciesList.seine.objectObservedSpecies +key = speciesList.seine.objectObservedSpecies +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2" + +[option speciesListLonglineCatchId] +description = observe.config.speciesList.longline.catch +key = speciesList.longline.catch +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3" + +[option speciesListLonglineEncounterId] +description = observe.config.speciesList.longline.encounter +key = speciesList.longline.encounter +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.4" + +[option speciesListLonglineDepredatorId] +description = observe.config.speciesList.longline.encounter +key = speciesList.longline.depredator +type = string +defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.5" + +[option mapBackgroundColor] +description = observe.config.map.background.description +key = map.background.color +type = color +defaultValue = java.awt.Color[r=87,g=200,b=255] + +[option mapLayer1] +description = observe.config.map.layer1.description +key = map.layer1.path +type = file +defaultValue = ${resources.directory}/map/shapeFiles/continents/GSHHS_l_L1.shp + +[option mapLayer2] +description = observe.config.map.layer2.description +key = map.layer2.path +type = file +defaultValue = ${resources.directory}/map/shapeFiles/continents/GSHHS_l_L6.shp + +[option mapLayer3] +description = observe.config.map.layer3.description +key = map.layer3.path +type = file +defaultValue = ${resources.directory}/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp + +[option mapLayer4] +description = observe.config.map.layer4.description +key = map.layer4.path +type = file +defaultValue = ${resources.directory}/map/shapeFiles/borders/WDBII_border_l_L1.shp + +[option mapLayer5] +description = observe.config.map.layer5.description +key = map.layer5.path +type = file +defaultValue = ${resources.directory}/map/shapeFiles/zee/World_EEZ_v8_2014.shp + +[option mapLayer6] +description = observe.config.map.layer6.description +key = map.layer6.path +type = file + +[option mapLayer7] +description = observe.config.map.layer7.description +key = map.layer7.path +type = file + +[option mapLayer8] +description = observe.config.map.layer8.description +key = map.layer8.path +type = file + +[option mapLayer9] +description = observe.config.map.layer9.description +key = map.layer9.path +type = file + +[option mapLayer10] +description = observe.config.map.layer10.description +key = map.layer10.path +type = file + +[option mapStyleFile] +description = observe.config.map.style.description +key = map.style.path +type = file +defaultValue = ${resources.directory}/map/style.xml + +[option treeOpenNodes] +description = observe.config.ui.treeOpenNodes +key = ui.treeOpenNodes +type = string + +[option validationSpeedEnable] +description = observe.config.validation.speedEnable +key = validation.speedEnable +type = Boolean +defaultValue = true + +[option validationSpeedMaxValue] +description = observe.config.validation.speedMaxValue +key = validation.speedMaxValue +type = Float +defaultValue = 30.0 + +[option backupUse] +description = observe.config.backup.use +key = backup.use +type = Boolean +defaultValue = true + +[option backupAtClose] +description = observe.config.backup.atClose +key = backup.atClose +type = Boolean +defaultValue = true + +[option backupDelay] +description = observe.config.backup.delay +key = backup.delay +type = Integer +defaultValue = 30 + +[action help] +description = observe.action.commandline.help +action = "fr.ird.observe.application.swing.ObserveCLAction#help" +aliases = -h,--help + +[action helpUi] +description = observe.action.commandline.help.ui +action = "fr.ird.observe.application.swing.ObserveCLAction#helpUI" +aliases = --help-ui + +[action noMainUi] +description = observe.action.commandline.disable.main.ui +action = "fr.ird.observe.application.swing.ObserveCLAction#disableMainUI" +aliases = -n,--no-main + +[action configureUi] +description = observe.action.commandline.configure.ui +action = "fr.ird.observe.application.swing.ObserveCLAction#configure" +aliases = --configure + +[action adminUi] +description = observe.action.commandline.launch.admin.ui +action = "fr.ird.observe.application.swing.ObserveCLAction#launchAdminUI" +aliases = -a,--admin + +[action obstunaAdminUi] +description = observe.action.commandline.launch.obstuna.admin.ui +action = "fr.ird.observe.application.swing.ObserveCLAction#launchObstunaAdminUI" +aliases = --obstuna-admin + +[action h2ServerMode] +description = observe.action.commandline.launch.h2.server.mode +action = "fr.ird.observe.application.swing.ObserveCLAction#launchH2ServerMode" +aliases = --h2-server + +[action useJmx] +description = observe.action.commandline.use.jmx +action = "fr.ird.observe.application.swing.ObserveCLAction#useJMX" +aliases = --jmx + +[action createId] +description = observe.action.commandline.create.id +action = "fr.ird.observe.application.swing.ObserveCLAction#createId" +aliases = --create-id + diff --git a/application-swing-configuration/src/main/config/ObserveSwingApplication.toml b/application-swing-configuration/src/main/config/ObserveSwingApplication.toml deleted file mode 100644 index 5dc0f67..0000000 --- a/application-swing-configuration/src/main/config/ObserveSwingApplication.toml +++ /dev/null @@ -1,601 +0,0 @@ -description = "ObserveSwingApplicationConfig.description" - -[[options]] -name = "configFile" -key = "config.file" -description = "observe.config.configFileName.description" -type = "string" -defaultValue = "observeSwing.conf" -_transient = true -_final = true - -[[options]] -name = "devMode" -key = "observe.devMode" -description = "observe.config.devMode" -type = "Boolean" -defaultValue = "true" -_transient = true -_final = true - -[[options]] -name = "modelVersion" -key = "observe.model.version" -description = "observe.model.version" -type = "version" -_transient = true -_final = true - -[[options]] -name = "dataDirectory" -key = "data.directory" -description = "observe.config.defaultDataDirectory.description" -type = "file" -defaultValue = "${user.home}/.observe" -_transient = true -_final = true - -[[options]] -name = "dbDirectory" -key = "db.directory" -description = "observe.config.defaultLocalDbDirectory.description" -type = "file" -defaultValue = "${data.directory}/db" -_transient = true -_final = true - -[[options]] -name = "initialDbDump" -key = "initial.db.dump" -description = "observe.config.defaultInitialDbDump.description" -type = "file" -defaultValue = "${data.directory}/initial-database.sql.gz" - -[[options]] -name = "backupDirectory" -key = "backup.directory" -description = "observe.config.defaultBackupDirectory.description" -type = "file" -defaultValue = "${data.directory}/backup" -_transient = true -_final = true - -[[options]] -name = "resourcesDirectory" -key = "resources.directory" -description = "observe.config.defaultResourcesDirectory.description" -type = "file" -defaultValue = "${data.directory}/resources-${version}" -_transient = true -_final = true - -[[options]] -name = "i18nDirectory" -key = "i18n.directory" -description = "observe.config.defaultI18nDirectory.description" -type = "file" -defaultValue = "${resources.directory}/i18n" -_transient = true -_final = true - -[[options]] -name = "reportDirectory" -key = "report.directory" -description = "observe.config.defaultReportDirectory.description" -type = "file" -defaultValue = "${resources.directory}/report" -_transient = true -_final = true - -[[options]] -name = "mapDirectory" -key = "map.directory" -description = "observe.config.defaultMapDirectory.description" -type = "file" -defaultValue = "${resources.directory}/map" -_transient = true -_final = true - -[[options]] -name = "validationReportDirectory" -key = "validation.report.directory" -description = "observe.config.defaultValidationReportDirectory.description" -type = "file" -defaultValue = "${data.directory}/validation-report" -_transient = true -_final = true - -[[options]] -name = "tmpDirectory" -key = "tmp.directory" -description = "observe.config.defaultTmpDirectory.description" -type = "file" -defaultValue = "${data.directory}/tmp" -_transient = true -_final = true - -[[options]] -name = "logConfigurationFile" -key = "logConfigurationFile" -description = "observe.config.logConfigurationFile.description" -type = "file" -defaultValue = "${resources.directory}/observe-log4j.properties" -_transient = true - -[[options]] -name = "h2Login" -key = "h2.username" -description = "observe.config.h2.login.description" -type = "string" -defaultValue = "sa" -_transient = true -_final = true - -[[options]] -name = "h2Password" -key = "h2.password" -description = "observe.config.h2.password.description" -type = "string" -defaultValue = "sa" -_transient = true -_final = true - -[[options]] -name = "h2CanMigrate" -key = "h2.canMigrate" -description = "observe.config.h2.can.migrate.description" -type = "Boolean" -defaultValue = "true" - -[[options]] -name = "h2ServerPort" -key = "h2.serverPort" -description = "observe.config.h2.serverPort.description" -type = "Integer" -defaultValue = "9093" - -[[options]] -name = "obstunaUrl" -key = "obstuna.url" -description = "observe.config.obstuna.url.description" -type = "string" -defaultValue = "jdbc:postgresql:///obstuna" - -[[options]] -name = "obstunaLogin" -key = "obstuna.username" -description = "observe.config.obstuna.login.description" -type = "string" -defaultValue = "utilisateur" - -[[options]] -name = "obstunaPassword" -key = "obstuna.password" -description = "observe.config.obstuna.password.description" -type = "string" -defaultValue = "" -_transient = true - -[[options]] -name = "obstunaUseSslCert" -key = "obstuna.useSsl" -description = "observe.config.obstuna.useSsl.description" -type = "Boolean" -defaultValue = "false" - -[[options]] -name = "obstunaCanMigrate" -key = "pg.canMigrate" -description = "observe.config.pg.can.migrate.description" -type = "Boolean" -defaultValue = "false" - -[[options]] -name = "serverUrl" -key = "server.url" -description = "observe.config.server.url.description" -type = "url" - -[[options]] -name = "serverLogin" -key = "server.login" -description = "observe.config.server.login.description" -type = "string" -defaultValue = "" - -[[options]] -name = "serverPassword" -key = "server.password" -description = "observe.config.server.password.description" -type = "string" -defaultValue = "" - -[[options]] -name = "serverDatabaseName" -key = "server.dataBaseName" -description = "observe.config.server.dataBaseName.description" -type = "string" - -[[options]] -name = "defaultDbMode" -key = "defaultDbMode" -description = "observe.config.defaultDbMode" -type = "fr.ird.observe.application.swing.configuration.constants.DbMode" -defaultValue = "USE_LOCAL" - -[[options]] -name = "defaultCreationMode" -key = "defaultCreationMode" -description = "observe.config.defaultCreationMode" -type = "fr.ird.observe.application.swing.configuration.constants.CreationMode" -defaultValue = "IMPORT_EXTERNAL_DUMP" - -[[options]] -name = "storeRemoteStorage" -key = "ui.storeRemoteStorage" -description = "observe.config.ui.storeRemoteStorage" -type = "Boolean" -defaultValue = "true" - -[[options]] -name = "loadLocalStorage" -key = "ui.loadLocalStorage" -description = "observe.config.ui.loadLocalStorage" -type = "Boolean" -defaultValue = "true" - -[[options]] -name = "showMigrationProgression" -key = "showMigrationProgression" -description = "observe.config.showMigrationProgression" -type = "Boolean" -defaultValue = "true" - -[[options]] -name = "showMigrationSql" -key = "showMigrationSql" -description = "observe.config.showMigrationSql" -type = "Boolean" -defaultValue = "true" - -[[options]] -name = "showSql" -key = "showSql" -description = "observe.config.showSql" -type = "Boolean" -defaultValue = "false" - -[[options]] -name = "changeSynchroSrc" -key = "ui.changeSynchroSrc" -description = "observe.config.ui.changeSynchroSrc" -type = "Boolean" -defaultValue = "false" - -[[options]] -name = "showNumberEditorButton" -key = "ui.showNumberEditorButton" -description = "observe.config.ui.showNumberEditorButton" -type = "Boolean" -defaultValue = "true" - -[[options]] -name = "autoPopupNumberEditor" -key = "ui.autoPopupNumberEditor" -description = "observe.config.ui.autoPopupNumberEditor" -type = "Boolean" -defaultValue = "false" - -[[options]] -name = "showDateTimeEditorSlider" -key = "ui.showTimeEditorSlider" -description = "observe.config.ui.showTimeEditorSlider" -type = "Boolean" -defaultValue = "true" - -[[options]] -name = "fullScreen" -key = "ui.fullscreen" -description = "observe.config.ui.fullscreen" -type = "Boolean" -defaultValue = "false" - -[[options]] -name = "locale" -key = "ui.locale" -description = "observe.config.ui.locale" -type = "java.util.Locale" -defaultValue = "fr_FR" - -[[options]] -name = "dbLocale" -key = "db.locale" -description = "observe.config.db.locale" -type = "java.util.Locale" -defaultValue = "fr_FR" - -[[options]] -name = "nonTargetObservation" -key = "observation.fauneAssociee" -description = "observe.config.observation.fauneAssociee" -type = "Integer" -defaultValue = "1" - -[[options]] -name = "targetDiscardsObservation" -key = "observation.rejetsThons" -description = "observe.config.observation.rejetsThons" -type = "Integer" -defaultValue = "1" - -[[options]] -name = "samplesObservation" -key = "observation.mensurations" -description = "observe.config.observation.mensurations" -type = "Integer" -defaultValue = "1" - -[[options]] -name = "objectsObservation" -key = "observation.floatingObject" -description = "observe.config.observation.floatingObject" -type = "Integer" -defaultValue = "1" - -[[options]] -name = "detailledActivitiesObservation" -key = "observation.activitysDetaillees" -description = "observe.config.observation.activitysDetaillees" -type = "Integer" -defaultValue = "1" - -[[options]] -name = "mammalsObservation" -key = "observation.mammiferes" -description = "observe.config.observation.mammiferes" -type = "Integer" -defaultValue = "1" - -[[options]] -name = "birdsObservation" -key = "observation.oiseaux" -description = "observe.config.observation.oiseaux" -type = "Integer" -defaultValue = "1" - -[[options]] -name = "baitObservation" -key = "observation.gleure" -description = "observe.config.observation.gleure" -type = "Integer" -defaultValue = "1" - -[[options]] -name = "speciesListSeineTargetCatchId" -key = "speciesList.seine.targetCatch" -description = "observe.config.speciesList.seine.targetCatch" -type = "string" -defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1" - -[[options]] -name = "speciesListSeineSchoolEstimateId" -key = "speciesList.seine.schoolEstimate" -description = "observe.config.speciesList.seine.schoolEstimate" -type = "string" -defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1" - -[[options]] -name = "speciesListSeineObjectSchoolEstimateId" -key = "speciesList.seine.objectSchoolEstimate" -description = "observe.config.speciesList.seine.objectSchoolEstimate" -type = "string" -defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1" - -[[options]] -name = "speciesListSeineNonTargetCatchId" -key = "speciesList.seine.nonTargetCatch" -description = "observe.config.speciesList.seine.nonTargetCatch" -type = "string" -defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2" - -[[options]] -name = "speciesListSeineObjectObservedSpeciesId" -key = "speciesList.seine.objectObservedSpecies" -description = "observe.config.speciesList.seine.objectObservedSpecies" -type = "string" -defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2" - -[[options]] -name = "speciesListLonglineCatchId" -key = "speciesList.longline.catch" -description = "observe.config.speciesList.longline.catch" -type = "string" -defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3" - -[[options]] -name = "speciesListLonglineEncounterId" -key = "speciesList.longline.encounter" -description = "observe.config.speciesList.longline.encounter" -type = "string" -defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.4" - -[[options]] -name = "speciesListLonglineDepredatorId" -key = "speciesList.longline.depredator" -description = "observe.config.speciesList.longline.encounter" -type = "string" -defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.5" - -[[options]] -name = "mapBackgroundColor" -key = "map.background.color" -description = "observe.config.map.background.description" -type = "color" -defaultValue = "java.awt.Color[r=87,g=200,b=255]" - -[[options]] -name = "mapLayer1" -key = "map.layer1.path" -description = "observe.config.map.layer1.description" -type = "file" -defaultValue = "${resources.directory}/map/shapeFiles/continents/GSHHS_l_L1.shp" - -[[options]] -name = "mapLayer2" -key = "map.layer2.path" -description = "observe.config.map.layer2.description" -type = "file" -defaultValue = "${resources.directory}/map/shapeFiles/continents/GSHHS_l_L6.shp" - -[[options]] -name = "mapLayer3" -key = "map.layer3.path" -description = "observe.config.map.layer3.description" -type = "file" -defaultValue = "${resources.directory}/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp" - -[[options]] -name = "mapLayer4" -key = "map.layer4.path" -description = "observe.config.map.layer4.description" -type = "file" -defaultValue = "${resources.directory}/map/shapeFiles/borders/WDBII_border_l_L1.shp" - -[[options]] -name = "mapLayer5" -key = "map.layer5.path" -description = "observe.config.map.layer5.description" -type = "file" -defaultValue = "${resources.directory}/map/shapeFiles/zee/World_EEZ_v8_2014.shp" - -[[options]] -name = "mapLayer6" -key = "map.layer6.path" -description = "observe.config.map.layer6.description" -type = "file" - -[[options]] -name = "mapLayer7" -key = "map.layer7.path" -description = "observe.config.map.layer7.description" -type = "file" - -[[options]] -name = "mapLayer8" -key = "map.layer8.path" -description = "observe.config.map.layer8.description" -type = "file" - -[[options]] -name = "mapLayer9" -key = "map.layer9.path" -description = "observe.config.map.layer9.description" -type = "file" - -[[options]] -name = "mapLayer10" -key = "map.layer10.path" -description = "observe.config.map.layer10.description" -type = "file" - -[[options]] -name = "mapStyleFile" -key = "map.style.path" -description = "observe.config.map.style.description" -type = "file" -defaultValue = "${resources.directory}/map/style.xml" - -[[options]] -name = "treeOpenNodes" -key = "ui.treeOpenNodes" -description = "observe.config.ui.treeOpenNodes" -type = "string" - -[[options]] -name = "validationSpeedEnable" -key = "validation.speedEnable" -description = "observe.config.validation.speedEnable" -type = "Boolean" -defaultValue = "true" - -[[options]] -name = "validationSpeedMaxValue" -key = "validation.speedMaxValue" -description = "observe.config.validation.speedMaxValue" -type = "Float" -defaultValue = "30.0" - -[[options]] -name = "backupUse" -key = "backup.use" -description = "observe.config.backup.use" -type = "Boolean" -defaultValue = "true" - -[[options]] -name = "backupAtClose" -key = "backup.atClose" -description = "observe.config.backup.atClose" -type = "Boolean" -defaultValue = "true" - -[[options]] -name = "backupDelay" -key = "backup.delay" -description = "observe.config.backup.delay" -type = "Integer" -defaultValue = "30" - -[[actions]] -name = "help" -description = "observe.action.commandline.help" -action = "fr.ird.observe.application.swing.ObserveCLAction#help" -aliases = ["-h", "--help"] - -[[actions]] -name = "helpUi" -description = "observe.action.commandline.help.ui" -action = "fr.ird.observe.application.swing.ObserveCLAction#helpUI" -aliases = ["--help-ui"] - -[[actions]] -name = "noMainUi" -description = "observe.action.commandline.disable.main.ui" -action = "fr.ird.observe.application.swing.ObserveCLAction#disableMainUI" -aliases = ["-n", "--no-main"] - -[[actions]] -name = "configureUi" -description = "observe.action.commandline.configure.ui" -action = "fr.ird.observe.application.swing.ObserveCLAction#configure" -aliases = ["--configure"] - -[[actions]] -name = "adminUi" -description = "observe.action.commandline.launch.admin.ui" -action = "fr.ird.observe.application.swing.ObserveCLAction#launchAdminUI" -aliases = ["-a", "--admin"] - -[[actions]] -name = "obstunaAdminUi" -description = "observe.action.commandline.launch.obstuna.admin.ui" -action = "fr.ird.observe.application.swing.ObserveCLAction#launchObstunaAdminUI" -aliases = ["--obstuna-admin"] - -[[actions]] -name = "h2ServerMode" -description = "observe.action.commandline.launch.h2.server.mode" -action = "fr.ird.observe.application.swing.ObserveCLAction#launchH2ServerMode" -aliases = ["--h2-server"] - -[[actions]] -name = "useJmx" -description = "observe.action.commandline.use.jmx" -action = "fr.ird.observe.application.swing.ObserveCLAction#useJMX" -aliases = ["--jmx"] - -[[actions]] -name = "createId" -description = "observe.action.commandline.create.id" -action = "fr.ird.observe.application.swing.ObserveCLAction#createId" -aliases = ["--create-id"] diff --git a/application-web-configuration/src/main/config/ObserveWebApplication.ini b/application-web-configuration/src/main/config/ObserveWebApplication.ini new file mode 100644 index 0000000..03bfdd6 --- /dev/null +++ b/application-web-configuration/src/main/config/ObserveWebApplication.ini @@ -0,0 +1,99 @@ +description = ObserveWebApplicationConfig.description + +[option buildVersion] +description = observeweb.build.version.description +key = observeweb.build.version +type = version +defaultValue = +final = true + +[option buildDate] +description = observeweb.build.date.description +key = observeweb.build.date +type = string +defaultValue = +final = true + +[option buildNumber] +description = observeweb.build.number.description +key = observeweb.build.number +type = string +defaultValue = +final = true + +[option adminApiKey] +description = observeweb.adminApiKey.description +key = observeweb.adminApiKey +type = string +defaultValue = changeme +final = true + +[option apiUrl] +description = observeweb.apiUrl.description +key = observeweb.apiUrl +type = url +defaultValue = http://localhost:8080/observeweb/api/v1 +final = true + +[option modelVersion] +description = observe.model.version +key = observeweb.model.version +type = version +final = true + +[option devMode] +description = observeweb.devMode.description +key = observeweb.devMode +type = boolean +defaultValue = true +final = true + +[option baseDirectory] +description = observeweb.baseDirectory.description +key = observeweb.baseDirectory +type = file +defaultValue = /var/local/observeweb +final = true + +[option temporaryDirectory] +description = observeweb.temporaryDirectory.description +key = observeweb.temporaryDirectory +type = file +defaultValue = ${observeweb.baseDirectory}/temp +final = true + +[option log4jConfigurationFile] +description = observeweb.log4jConfigurationFile.description +key = observeweb.log4jConfigurationFile +type = file +defaultValue = ${observeweb.baseDirectory}/observeweb-log4j.conf +final = true + +[option databasesConfigurationFile] +description = observeweb.databasesConfigurationFile.description +key = observeweb.databasesConfigurationFile +type = file +defaultValue = ${observeweb.baseDirectory}/databases.yml +final = true + +[option usersConfigurationFile] +description = observeweb.usersConfigurationFile.description +key = observeweb.usersConfigurationFile +type = file +defaultValue = ${observeweb.baseDirectory}/users.yml +final = true + +[option sessionExpirationDelay] +description = observeweb.sessionExpirationDelay.description +key = observeweb.sessionExpirationDelay +type = int +defaultValue = 60 +final = true + +[option sessionMaximumSize] +description = observeweb.sessionMaximumSize.description +key = observeweb.sessionMaximumSize +type = int +defaultValue = 10000 +final = true + diff --git a/application-web-configuration/src/main/config/ObserveWebApplication.toml b/application-web-configuration/src/main/config/ObserveWebApplication.toml deleted file mode 100644 index 68d3784..0000000 --- a/application-web-configuration/src/main/config/ObserveWebApplication.toml +++ /dev/null @@ -1,112 +0,0 @@ -description = "ObserveWebApplicationConfig.description" - -[[options]] -name = "buildVersion" -key = "observeweb.build.version" -description = "observeweb.build.version.description" -type = "version" -defaultValue = "" -_final = true - -[[options]] -name = "buildDate" -key = "observeweb.build.date" -description = "observeweb.build.date.description" -type = "string" -defaultValue = "" -_final = true - -[[options]] -name = "buildNumber" -key = "observeweb.build.number" -description = "observeweb.build.number.description" -type = "string" -defaultValue = "" -_final = true - -[[options]] -name = "adminApiKey" -key = "observeweb.adminApiKey" -description = "observeweb.adminApiKey.description" -type = "string" -defaultValue = "changeme" -_final = true - -[[options]] -name = "apiUrl" -key = "observeweb.apiUrl" -description = "observeweb.apiUrl.description" -type = "url" -defaultValue = "http://localhost:8080/observeweb/api/v1" -_final = true - -[[options]] -name = "modelVersion" -key = "observeweb.model.version" -description = "observe.model.version" -type = "version" -_final = true - -[[options]] -name = "devMode" -key = "observeweb.devMode" -description = "observeweb.devMode.description" -type = "boolean" -defaultValue = "true" -_final = true - -[[options]] -name = "baseDirectory" -key = "observeweb.baseDirectory" -description = "observeweb.baseDirectory.description" -type = "file" -defaultValue = "/var/local/observeweb" -_final = true - -[[options]] -name = "temporaryDirectory" -key = "observeweb.temporaryDirectory" -description = "observeweb.temporaryDirectory.description" -type = "file" -defaultValue = "${observeweb.baseDirectory}/temp" -_final = true - -[[options]] -name = "log4jConfigurationFile" -key = "observeweb.log4jConfigurationFile" -description = "observeweb.log4jConfigurationFile.description" -type = "file" -defaultValue = "${observeweb.baseDirectory}/observeweb-log4j.conf" -_final = true - -[[options]] -name = "databasesConfigurationFile" -key = "observeweb.databasesConfigurationFile" -description = "observeweb.databasesConfigurationFile.description" -type = "file" -defaultValue = "${observeweb.baseDirectory}/databases.yml" -_final = true - -[[options]] -name = "usersConfigurationFile" -key = "observeweb.usersConfigurationFile" -description = "observeweb.usersConfigurationFile.description" -type = "file" -defaultValue = "${observeweb.baseDirectory}/users.yml" -_final = true - -[[options]] -name = "sessionExpirationDelay" -key = "observeweb.sessionExpirationDelay" -description = "observeweb.sessionExpirationDelay.description" -type = "int" -defaultValue = "60" -_final = true - -[[options]] -name = "sessionMaximumSize" -key = "observeweb.sessionMaximumSize" -description = "observeweb.sessionMaximumSize.description" -type = "int" -defaultValue = "10000" -_final = true diff --git a/pom.xml b/pom.xml index 1377c73..318d175 100644 --- a/pom.xml +++ b/pom.xml @@ -166,7 +166,7 @@ <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> - <nuitonConfigVersion>3.0</nuitonConfigVersion> + <nuitonConfigVersion>3.1-SNAPSHOT</nuitonConfigVersion> <xworkVersion>2.3.30</xworkVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> <sl4jVersion>1.7.21</sl4jVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.