From e43f048b3c8e7cc07b256c4f69a6c339339d7171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Ko=C5=A1arko?= <kosarko@ufal.mff.cuni.cz>
Date: Mon, 4 Jan 2016 15:13:12 +0100
Subject: [PATCH] remove duplicated config property

---
 .../dspace/content/crosswalk/OREDisseminationCrosswalk.java    | 2 +-
 .../aspect/administrative/ControlPanelConfigurationTab.java    | 2 +-
 .../main/webapp/themes/UFAL/lib/xsl/core/global-variables.xsl  | 2 +-
 dspace/config/modules/lr.cfg                                   | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/OREDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/OREDisseminationCrosswalk.java
index af9769aa6290..20f7e9c9f41d 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/OREDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/OREDisseminationCrosswalk.java
@@ -91,7 +91,7 @@ private Element disseminateItem(Item item) throws CrosswalkException, IOExceptio
         String remSource = ConfigurationManager.getProperty("oai", "ore.authoritative.source");
     	if (remSource == null || remSource.equalsIgnoreCase("oai"))
         {
-            oaiUrl = ConfigurationManager.getProperty("lr", "lr.dspace.oai.url");
+            oaiUrl = ConfigurationManager.getProperty("oai", "dspace.oai.url");
         }
     	else if (remSource.equalsIgnoreCase("xmlui") || remSource.equalsIgnoreCase("manakin"))
         {
diff --git a/dspace-xmlui/src/main/java/cz/cuni/mff/ufal/dspace/app/xmlui/aspect/administrative/ControlPanelConfigurationTab.java b/dspace-xmlui/src/main/java/cz/cuni/mff/ufal/dspace/app/xmlui/aspect/administrative/ControlPanelConfigurationTab.java
index 682c7d022b9f..a30e0ba76b0b 100644
--- a/dspace-xmlui/src/main/java/cz/cuni/mff/ufal/dspace/app/xmlui/aspect/administrative/ControlPanelConfigurationTab.java
+++ b/dspace-xmlui/src/main/java/cz/cuni/mff/ufal/dspace/app/xmlui/aspect/administrative/ControlPanelConfigurationTab.java
@@ -45,7 +45,7 @@ public void addBody(Map objectModel, Division div) throws WingException {
 		dspace.addItem(Site.getSiteHandle());
 
 		dspace.addLabel("OAI url");
-		String oai_url = notempty(ConfigurationManager.getProperty("lr", "lr.dspace.oai.url"));
+		String oai_url = notempty(ConfigurationManager.getProperty("oai", "dspace.oai.url"));
 		dspace.addItemXref(oai_url, oai_url);
 
 		dspace.addLabel("Solr log url");
diff --git a/dspace-xmlui/src/main/webapp/themes/UFAL/lib/xsl/core/global-variables.xsl b/dspace-xmlui/src/main/webapp/themes/UFAL/lib/xsl/core/global-variables.xsl
index b6e3e076708b..bd45324fac2e 100644
--- a/dspace-xmlui/src/main/webapp/themes/UFAL/lib/xsl/core/global-variables.xsl
+++ b/dspace-xmlui/src/main/webapp/themes/UFAL/lib/xsl/core/global-variables.xsl
@@ -52,7 +52,7 @@
 	
 	<xsl:variable name="query-string" select="/dri:document/dri:meta/dri:pageMeta/dri:metadata[@element='request'][@qualifier='queryString']" />
 
-	<xsl:variable name="oai-url" select="confman:getProperty('lr', 'lr.dspace.oai.url')" />
+	<xsl:variable name="oai-url" select="confman:getProperty('oai', 'dspace.oai.url')" />
 
 	<!-- dynamically select the static html file based on requested page name -->
     <xsl:variable name="static-page-name">
diff --git a/dspace/config/modules/lr.cfg b/dspace/config/modules/lr.cfg
index a81612c738ec..7bd7fcf2b10f 100644
--- a/dspace/config/modules/lr.cfg
+++ b/dspace/config/modules/lr.cfg
@@ -142,9 +142,6 @@ lr.shibboleth.discofeed.url = ${lr.shibboleth.discofeed.url}
 
 lr.aai.url = ${lr.aai.url}
 
-# The base URL of the OAI webapp (do not include /request).
-lr.dspace.oai.url = ${dspace.baseUrl}/oai
-
 # page with info about harvesting the repository
 lr.harvester.info.url = ${harvesterInfo.url}