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 #228 from mwoodiupui/DS-1563

Browse Source 
[DS-1563] ConfigurationService recognize -Ddspace.configuration= as ConfigurationManager does.

No comments for three months, and it's a trivial change.
This commit is contained in:
Mark H. Wood
2013-08-12 07:11:58 -07:00
parent 6f087b1ba7 2a86c63188
commit cdf300c2c5
1 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
View File

@@ -64,6 +64,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
/* (non-Javadoc)
* @see org.dspace.services.ConfigurationService#getAllProperties()
*/
@Override
public Map<String, String> getAllProperties() {
Map<String, String> props = new LinkedHashMap<String, String>();
// for (Entry<String, DSpaceConfig> config : configuration.entrySet()) {
@@ -79,6 +80,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
/* (non-Javadoc)
* @see org.dspace.services.ConfigurationService#getProperties()
*/
@Override
public Properties getProperties() {
Properties props = new Properties();
for (DSpaceConfig config : configuration.values()) {
@@ -90,6 +92,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
/* (non-Javadoc)
* @see org.dspace.services.ConfigurationService#getProperty(java.lang.String)
*/
@Override
public String getProperty(String name) {
DSpaceConfig config = configuration.get(name);
String value = null;
@@ -102,6 +105,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
/* (non-Javadoc)
* @see org.dspace.services.ConfigurationService#getPropertyAsType(java.lang.String, java.lang.Class)
*/
@Override
public <T> T getPropertyAsType(String name, Class<T> type) {
String value = getProperty(name);
return convert(value, type);
@@ -110,6 +114,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
/* (non-Javadoc)
* @see org.dspace.services.ConfigurationService#getPropertyAsType(java.lang.String, java.lang.Object)
*/
@Override
public <T> T getPropertyAsType(String name, T defaultValue) {
return getPropertyAsType(name, defaultValue, false);
}
@@ -118,6 +123,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
* @see org.dspace.services.ConfigurationService#getPropertyAsType(java.lang.String, java.lang.Object, boolean)
*/
@SuppressWarnings("unchecked")
@Override
public <T> T getPropertyAsType(String name, T defaultValue, boolean setDefaultIfNotFound) {
String value = getProperty(name);
T property = null;
@@ -141,6 +147,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
/* (non-Javadoc)
* @see org.dspace.services.ConfigurationService#setProperty(java.lang.String, java.lang.Object)
*/
@Override
public boolean setProperty(String name, Object value) {
if (name == null) {
throw new IllegalArgumentException("name cannot be null for setting configuration");
@@ -300,8 +307,35 @@ public final class DSpaceConfigurationService implements ConfigurationService {
// loading from files code
/**
* Loads up the default initial configuration from the dspace config
* files in the file home and on the classpath.
* Loads up the default initial configuration from the DSpace configuration
* files in the file home and on the classpath. Order:
* <ol>
* <li>Create {@code serverId} from local host name if available.</li>
* <li>Create {@code dspace.testing = false}.
* <li>Determine the value of {@code dspace.dir} and add to configuration.</li>
* <li>Load {@code classpath:config/dspace_defaults.cfg}.</li>
* <li>Copy system properties with names beginning "dspace." <em>except</em>
* {@code dspace.dir}, removing the "dspace." prefix from the name.</li>
* <li>Load all {@code classpath:dspace/config-*.cfg} using whatever
* matched "*" as module prefix.</li>
* <li>Load all {@code ${dspace.dir}/config/modules/*.cfg} using whatever
* matched "*" as module prefix.</li>
* <li>Load {@code classpath:dspace.cfg}.</li>
* <li>Load from the path in the system property {@code dspace.configuration}
* if defined, or {@code ${dspace.dir}/config/dspace.cfg}.</li>
* <li>Perform variable substitutions throughout the assembled configuration.</li>
* </ol>
*
* <p>The initial value of {@code dspace.dir} will be:</p>
* <ol>
* <li>the value of the system property {@code dspace.dir} if defined;</li>
* <li>else the value of {@code providedHome} if not null;</li>
* <li>else the servlet container's home + "/dspace/" if defined (see {@link getCatalina()});</li>
* <li>else the user's home directory if defined;</li>
* <li>else "/".
* </ol>
*
* @param providedHome DSpace home directory, or null.
*/
public void loadInitialConfig(String providedHome) {
Map<String, String> configMap = new LinkedHashMap<String, String>();
@@ -318,10 +352,10 @@ public final class DSpaceConfigurationService implements ConfigurationService {
// now we load the settings from properties files
String homePath = System.getProperty(DSPACE_HOME);
// now we load from the provided parameter if its not null
// now we load from the provided parameter if its not null
if (providedHome != null && homePath == null) {
homePath = providedHome;
}
homePath = providedHome;
}
if (homePath == null) {
String catalina = getCatalina();
@@ -410,8 +444,13 @@ public final class DSpaceConfigurationService implements ConfigurationService {
pushPropsToMap(configMap, readPropertyResource(DSPACE + DOT_CONFIG));
// read all the known files from the home path that are properties files
pushPropsToMap(configMap, readPropertyFile(homePath + File.separatorChar + DSPACE_CONFIG_PATH));
// pushPropsToMap(configMap, readPropertyFile(homePath + File.separatorChar + DSPACE_CONFIG_PATH));
String configPath = System.getProperty("dspace.configuration");
if (null == configPath)
{
configPath = homePath + File.separatorChar + DSPACE_CONFIG_PATH;
}
pushPropsToMap(configMap, readPropertyFile(configPath));
// TODO: still use this local file loading?
// pushPropsToMap(configMap, readPropertyFile(homePath + File.separatorChar + "local" + DOT_PROPERTIES));