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