Configuration fixes. Add missing oai.cfg properties. Default dspace.baseUrl to single webapp path.

dspace/config/dspace.cfg

@@ -26,7 +26,7 @@ dspace.dir = /dspace
 dspace.hostname = localhost
 
 # DSpace base host URL.  Include port number etc.
-dspace.baseUrl = http://localhost:8080
+dspace.baseUrl = http://localhost:8080/spring-rest
 
 # Full link your end users will use to access DSpace. In most cases, this will be the baseurl followed by
 # the context path to the UI you are using.
@@ -37,7 +37,7 @@ dspace.url = ${dspace.baseUrl}
 
 # This is the URL that will be used for the REST endpoints to be served on.
 # This will typically be followed by /api to determine the root endpoints.
-dspace.restUrl = ${dspace.baseUrl}/spring-rest
+dspace.restUrl = ${dspace.baseUrl}
 
 # Optional: DSpace URL for mobile access
 # This

dspace/config/modules/oai.cfg

@@ -4,12 +4,24 @@
 # These configs are used by the OAI-PMH interface               #
 #---------------------------------------------------------------#
 
+# Whether or not to enable the OAI module
+# When "true", the OAI module is accessible on ${oai.path}
+# When "false" or commented out, OAI is disabled/inaccessible.
+# (Requires reboot of servlet container, e.g. Tomcat, to reload)
+#oai.enabled = true
+
+# Path where OAI module is available
+# Defaults to "oai", which means the OAI module would be available
+# at ${dspace.restURL}/oai/
+# (Requires reboot of servlet container, e.g. Tomcat, to reload)
+oai.path = oai
+
 # Storage: solr | database (solr is recommended)
 oai.storage=solr
 
 # The base URL of the OAI webapp (do not include the context e.g. /request, /openaire, etc).
 # Note: Comment out if you want to fallback to the request's URL.
-oai.url = ${dspace.baseUrl}/oai
+oai.url = ${dspace.baseUrl}/${oai.path}
 
 # Base solr index
 oai.solr.url=${solr.server}/oai