Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ public RootRest convert(HttpServletRequest request) {
} else {
rootRest.setDspaceServer(dspaceUrl);
}
rootRest.setDspaceVersion("DSpace " + getSourceVersion());
String versionPrefix = StringUtils.defaultIfBlank(
configurationService.getProperty("dspace.version.prefix", "DSpace"), "DSpace");
rootRest.setDspaceVersion(versionPrefix + " " + getSourceVersion());
rootRest.setBuildVersion(getBuildVersion());
return rootRest;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public void setUp() throws Exception {
when(configurationService.getProperty("dspace.name")).thenReturn("dspacename");
when(configurationService.getProperty("dspace.server.url")).thenReturn(serverURL);
when(configurationService.getProperty("dspace.server.ssr.url", serverURL)).thenReturn(serverSSRURL);
when(configurationService.getProperty("dspace.version.prefix", "DSpace")).thenReturn("DSpace");

}

Expand Down Expand Up @@ -85,4 +86,15 @@ public void testCorrectInternalUrlSetFromConfigurationService() throws Exception
assertEquals(serverSSRURL, rootRest.getDspaceServer());
assertEquals("DSpace " + Util.getSourceVersion(), rootRest.getDspaceVersion());
}

@Test
public void testConfigurableVersionPrefix() throws Exception {
when(configurationService.getProperty("dspace.version.prefix", "DSpace")).thenReturn("CLARIN-DSpace");
request.setScheme("https");
request.setServerName("dspace-rest");
request.setServerPort(443);
request.setRequestURI("/server/api");
RootRest rootRest = rootConverter.convert(request);
assertEquals("CLARIN-DSpace " + Util.getSourceVersion(), rootRest.getDspaceVersion());
}
}
5 changes: 5 additions & 0 deletions dspace/config/dspace.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ dspace.ui.url = http://localhost:4000
dspace.name = DSpace at My University
dspace.shortname = DSpace

# Prefix for the version string exposed at the REST root (/server/api), rendered by the UI as
# the HTML <meta name="Generator"> value. Defaults to "DSpace" when unset; CLARIN/customer
# deployments may set e.g. "CLARIN-DSpace".
# dspace.version.prefix = DSpace

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


# Assetstore configurations have moved to config/modules/assetstore.cfg
# and config/spring/api/bitstore.xml.
# Additional storage options (e.g. Amazon S3) are available in `assetstore.cfg`
Expand Down
Loading