From c976046fcad652468acd92685f2e72a4c8c3b00f Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sat, 3 Feb 2024 19:42:15 -0800 Subject: [PATCH] Convert to yaml. --- .../src/main/resources/application.properties | 137 ------------------ .../src/main/resources/application.yml | 73 ++++++++++ 2 files changed, 73 insertions(+), 137 deletions(-) delete mode 100755 wise-webapp/src/main/resources/application.properties create mode 100755 wise-webapp/src/main/resources/application.yml diff --git a/wise-webapp/src/main/resources/application.properties b/wise-webapp/src/main/resources/application.properties deleted file mode 100755 index 5bdf50c0..00000000 --- a/wise-webapp/src/main/resources/application.properties +++ /dev/null @@ -1,137 +0,0 @@ -################################################################################## -SpringBoot DataSource -################################################################################## - -# JPA -spring.main.allow-circular-references=true -spring.jpa.open-in-view=true -spring.jpa.hibernate.ddl-auto=none -spring.jpa.properties.hibernate.current_session_context_class=thread -spring.jpa.properties.hibernate.format_sql=true -spring.sql.init.mode=always -spring.sql.init.platform=hsqldb - -spring.jpa.properties.hibernate.default_batch_fetch_size=200 -#spring.jpa.properties.hibernate.auto_quote_keyword=true - - -# Connection pool (https://docs.spring.io/spring-boot/docs/current/reference/html/application-properties.html#application-properties.data.spring.datasource.hikari) -#spring.datasource.hikari.connection-test-query= -#spring.datasource.hikari.connection-timeout= - -# Embed Datasource Configuration -database.base.url=/Users/veigap/ -spring.datasource.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping -spring.datasource.username=sa -spring.datasource.password= - -spring.datasource.driver-class-name = org.hsqldb.jdbc.JDBCDriver -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.HSQLDialect - -################################################################################## -# Mail configuration. Must be configured to enable user registration confirmation. -################################################################################## - -#------------------------ -# Plain SMTP Server Configuration -#------------------------ -mail.smtp.port=25 -mail.smtp.host=localhost -mail.username=root -mail.password= -mail.smtp.auth=false -mail.smtp.starttls.enable=false -mail.smtp.quitwait=false - -#------------------------ -# GMAIL SMTP Configuration -#------------------------ -#mail.smtp.port=587 -#mail.smtp.host=smtp.gmail.com -#mail.username= -#mail.password= -#mail.smtp.auth=true -#mail.smtp.starttls.enable=true -#mail.smtp.quitwait=false - -#------------------------ -# Emails configuration -#------------------------ - -# Required: "from" email account that will appear in the emails sent from the sender. -mail.serverSendEmail=root@localhost - -# Optional: Support account that the users could use to contact you. This address will appear in emails and in some places in the site. -mail.supportEmail=root@localhost - -################################################################################## -# Users Registration Configuration -################################################################################## - -# Enable captcha confirmation -google.recaptcha2.enabled = true - -# ReCaptcha is the default captcha. Public and private keys are required. -# More Info: http://www.google.com/recaptcha . -google.recaptcha2.siteKey = 6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI -google.recaptcha2.secretKey = 6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe - -################################################################################## -# Site configuration -################################################################################## - -# Site administration user. This user will have special permissions for operations such as removing users, set password -# etc. -admin.user = admin@wisemapping.org - -# Base URL where WiseMapping is deployed. By default, It will be automatically inferred. -#site.baseurl = http://localhost:8080 - -# Site Homepage URL. This will be used as URL for homepage location. -site.homepage = c/login - -# Font end static content can be deployed externally to the web app. Uncomment here and specify the url base location. -site.static.js.url = /static - -################################################################################## -# Google Analytics Settings -################################################################################## -google.analytics.enabled=false -google.analytics.account=UA-XXXX - -################################################################################## -# Google Ads enable -################################################################################## -google.ads.enabled=false - -####################################################################################### -# Google OAuth Authentication -####################################################################################### -# OAuth Client id -#security.oauth2.google.clientId= -# OAuth Client secret -#security.oauth2.google.clientSecret= -# Redirect to this url, this url must be configured in the google app {baseurl}/c/registration-google -#security.oauth2.google.callbackUrl= - -# Google service for finish registration process, ie. exchange temporal code for user token -security.oauth2.google.confirmUrl=https://oauth2.googleapis.com/token -# Google service for get user data (name, email, etc) -security.oauth2.google.userinfoUrl=https://www.googleapis.com/oauth2/v3/userinfo -# Url for starting auth process with google - -@Todo -security.oauth2.google.url=https//review - - -####################################################################################### -# User Account filtering policies -####################################################################################### - -# Coma separated list of domains and emails ban -#accounts.exclusion.domain= - - -# LOG -logging.level.root=INFO -logging.level.org.apache.tomcat=INFO diff --git a/wise-webapp/src/main/resources/application.yml b/wise-webapp/src/main/resources/application.yml new file mode 100755 index 00000000..bb85a5f0 --- /dev/null +++ b/wise-webapp/src/main/resources/application.yml @@ -0,0 +1,73 @@ +# SpringBoot Configuration ... + +spring: + datasource: + driver-class-name: org.hsqldb.jdbc.JDBCDriver + password: '' + url: jdbc:hsqldb:file:${database.base.url}/db/wisemapping + username: sa + jpa: + hibernate: + ddl-auto: none + open-in-view: true + properties: + hibernate: + current_session_context_class: thread + default_batch_fetch_size: 200 + dialect: org.hibernate.dialect.HSQLDialect + format_sql: true + main: + allow-circular-references: true + sql: + init: + mode: always + platform: hsqldb + +# Application Configuration. + +admin: + user: admin@wisemapping.org +database: + base: + url: /Users/veigap/ +google: + ads: + enabled: false + analytics: + account: UA-XXXX + enabled: false + recaptcha2: + enabled: true + secretKey: 6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe + siteKey: 6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI +logging: + level: + org: + apache: + tomcat: INFO + root: INFO +mail: + password: '' + serverSendEmail: root@localhost + smtp: + auth: false + host: localhost + port: 25 + quitwait: false + starttls: + enable: false + supportEmail: root@localhost + username: root +security: + oauth2: + google: + confirmUrl: https://oauth2.googleapis.com/token + url: https//review + userinfoUrl: https://www.googleapis.com/oauth2/v3/userinfo +site: + homepage: c/login + static: + js: + url: /static + +