hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2732 from tdonohue/config_override_spring_properties

Browse Source 
Allow DSpace's ConfigurationService to override Spring Boot properties
This commit is contained in:
Tim Donohue
2020-04-02 14:32:18 -05:00
committed by GitHub
parent a80fe4ec13 b40ba0c0e5
commit c2421d136c
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceConfigurationInitializer.java
View File

@@ -41,8 +41,10 @@ public class DSpaceConfigurationInitializer implements ApplicationContextInitial
ConfigurationPropertySource apacheCommonsConfigPropertySource =
new ConfigurationPropertySource(configuration.getClass().getName(), configuration);
// Append it to the Environment's list of PropertySources
applicationContext.getEnvironment().getPropertySources().addLast(apacheCommonsConfigPropertySource);
// Prepend it to the Environment's list of PropertySources
// NOTE: This is added *first* in the list so that settings in DSpace's ConfigurationService *override*
// any default values in Spring Boot's application.properties (or similar)
applicationContext.getEnvironment().getPropertySources().addFirst(apacheCommonsConfigPropertySource);
}
}

15
dspace-server-webapp/src/main/resources/application.properties
View File

@@ -17,6 +17,10 @@
# configurations/settings. Therefore settings in this file CANNOT depend on any DSpace configurations.
# The *only* DSpace configuration allowed in this file is "dspace.dir", which is documented below.
#
# HOW TO OVERRIDE SPRING SETTINGS: Since the DSpace Configuration Service loads early in the Spring Boot
# startup process (see DSpaceConfigurationInitializer), most Spring Boot properties can be OVERRIDDEN in
# your local.cfg.
#
# Docs (including info on how to override these default settings)
# http://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html
# For common settings see:
@@ -28,7 +32,8 @@
#
# DSpace home/installation directory
# REQUIRED to be specified in this application.properties file, as it is used to locate and initialize
# the DSpace Kernel and all Services (including configuration). See org.dspace.app.rest.Application.getDSpaceHome()
# the DSpace Kernel and all Services (including configuration).
# * See org.dspace.app.rest.utils.DSpaceKernelInitializer.getDSpaceHome()
# NOTE: this configuration is filled out by Apache Ant during the DSpace install/update process. It does NOT
# interact with or read its configuration from dspace.cfg.
dspace.dir=${dspace.dir}
@@ -107,8 +112,8 @@ spring.main.allow-bean-definition-overriding = true
# Log4J configuration
logging.config = ${dspace.dir}/config/log4j2.xml
# Maximum size of uploaded files in bytes (512Mb)
spring.servlet.multipart.max-file-size = 536870912
# Maximum size of a single uploaded file (default = 1MB)
spring.servlet.multipart.max-file-size = 512MB
# Maximum size of a multipart request (512Mb)
spring.servlet.multipart.max-request-size= 536870912
# Maximum size of a multipart request (i.e. max total size of all files in one request) (default = 10MB)
spring.servlet.multipart.max-request-size = 512MB

22
dspace/config/local.cfg.EXAMPLE
View File

@@ -4,9 +4,11 @@
# of the same name in any of the DSpace *.cfg files. This includes overriding
# settings in any of these files:
# * [dspace]/config/dspace.cfg
# * Or any configuration file that is included in 'dspace.cfg'
# * Any configuration file that is included in 'dspace.cfg'
# (See "include = [filepath]" settings near the end of dspace.cfg.
# By default, it includes all [dspace]/config/modules/*.cfg files)
# * Spring Boot's application.properties
# ([dspace-src]/dspace-server-webapp/src/main/resources/application.properties)
#
# By default, this EXAMPLE file includes a number of commonly overridden configurations.
# * ADD configurations by simply copying them into this file from any existing *.cfg file.
@@ -193,3 +195,21 @@ db.schema = public
# Authentication by Password (encrypted in DSpace's database). See authentication-password.cfg for default configuration.
# Enabled by default in authentication.cfg
#plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.PasswordAuthentication
#################################################
# SPRING BOOT SETTINGS (Used by Server Webapp) #
#################################################
# NOTE: Common Spring Boot application settings may be found at
# http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
#
# EXAMPLE OVERRIDE:
# By uncommenting the below Spring Boot settings, you can increase or decrease the maximum upload size.
# These defaults are specified in [dspace-src]/dspace-server-webapp/src/main/resources/application.properties
# but may be overridden in this local.cfg
#
# Maximum size of a single uploaded file
#spring.servlet.multipart.max-file-size = 512MB
# Maximum size of a multipart request (i.e. max total size of all files in one request)
#spring.servlet.multipart.max-request-size = 512MB