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

Minor bug fixes. Ensure controlpanel settings are loaded property (PR #970), and fix 'dspace dsprop' command which is useful in testing.

Browse Source
This commit is contained in:
Tim Donohue
2016-01-22 17:26:57 +00:00
parent cf18656b11
commit b45194de37
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dspace-api/src/main/java/org/dspace/core/ConfigurationManager.java
View File

@@ -429,11 +429,11 @@ public class ConfigurationManager
{ {
if ((argv.length == 2) && argv[0].equals("-property")) if ((argv.length == 2) && argv[0].equals("-property"))
{ {
String val = getProperty(argv[1]); Object val = DSpaceServicesFactory.getInstance().getConfigurationService().getPropertyValue(argv[1]);
if (val != null) if (val != null)
{ {
System.out.println(val); System.out.println(val.toString());
} }
else else
{ {
@@ -445,11 +445,11 @@ public class ConfigurationManager
else if ((argv.length == 4) && argv[0].equals("-module") && else if ((argv.length == 4) && argv[0].equals("-module") &&
argv[2].equals("-property")) argv[2].equals("-property"))
{ {
String val = getProperty(argv[1], argv[3]); Object val = DSpaceServicesFactory.getInstance().getConfigurationService().getPropertyValue(argv[1] + "." + argv[3]);
if (val != null) if (val != null)
{ {
System.out.println(val); System.out.println(val.toString());
} }
else else
{ {

2
dspace/config/dspace.cfg
View File

@@ -2082,8 +2082,10 @@ include = ${module_dir}/authentication-x509.cfg
include = ${module_dir}/bulkedit.cfg include = ${module_dir}/bulkedit.cfg
include = ${module_dir}/citation-page.cfg include = ${module_dir}/citation-page.cfg
include = ${module_dir}/clamav.cfg include = ${module_dir}/clamav.cfg
include = ${module_dir}/controlpanel.cfg
include = ${module_dir}/curate.cfg include = ${module_dir}/curate.cfg
include = ${module_dir}/discovery.cfg include = ${module_dir}/discovery.cfg
include = ${module_dir}/disseminate-citation.cfg
include = ${module_dir}/elastic-search-statistics.cfg include = ${module_dir}/elastic-search-statistics.cfg
include = ${module_dir}/fetchccdata.cfg include = ${module_dir}/fetchccdata.cfg
include = ${module_dir}/google-analytics.cfg include = ${module_dir}/google-analytics.cfg

29
dspace/config/modules/controlpanel.cfg
View File

@@ -2,17 +2,20 @@
#------------ADMIN CONTROL PANEL CONFIGURATIONS-----------------# #------------ADMIN CONTROL PANEL CONFIGURATIONS-----------------#
#---------------------------------------------------------------# #---------------------------------------------------------------#
### Control Panel Tabs ### Enabled Control Panel Tabs (one per line)
controlpanel.tabs = Java Information, \ ### To remove a tab, simply comment out its line
Configuration, \ ### To add a tab, define a new Plugin (see below) and add a new "controlpanel.tabs" line to enable
SystemWide Alerts, \ controlpanel.tabs = Java Information
Harvesting, \ controlpanel.tabs = Configuration
Current Activity, \ controlpanel.tabs = SystemWide Alerts
controlpanel.tabs = Harvesting
controlpanel.tabs = Current Activity
### Define Control Panel Tab Plugins / Names (one per line)
plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = \ ### These define the names of each Control Panel Tab plugin (names are used to enable/disable the tabs above)
org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelJavaTab = Java Information, \ ### New Control Panel Tab plugins may be added by simply adding a new "plugin.named" line below.
org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelConfigurationTab = Configuration, \ plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelJavaTab = Java Information
org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelAlertsTab = SystemWide Alerts, \ plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelConfigurationTab = Configuration
org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelHarvestingTab = Harvesting, \ plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelAlertsTab = SystemWide Alerts
org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelCurrentActivityTab = Current Activity, \ plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelHarvestingTab = Harvesting
plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelCurrentActivityTab = Current Activity