hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 06:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

move the spring-data-rest base path to root to avoid conflict with our rest controller

Browse Source 
the spring-data-rest base path is currently used only by the HAL browser. It now responds to /browser/** so to avoid conflict with our /api/{apiCategory}/{model}/** mapping
This commit is contained in:
Andrea Bollini
2017-06-15 15:40:38 +02:00
parent 5e6fd80c9b
commit d04973efac
2 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-spring-rest/src/main/resources/application.properties
View File

@@ -39,7 +39,7 @@ spring.application.name = DSpace Spring Rest
######################## ########################
# Spring DATA Rest settings # Spring DATA Rest settings
# #
spring.data.rest.basePath=/api spring.data.rest.basePath=
######################## ########################
# Jackson serialization settings # Jackson serialization settings

64
dspace-spring-rest/src/main/webapp/index.html
View File

@@ -12,7 +12,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>The HAL Browser (customized for Spring Data REST)</title> <title>The HAL Browser (customized for Spring Data REST)</title>
<link rel="stylesheet" media="screen" href="api/browser/vendor/css/bootstrap.css" /> <link rel="stylesheet" media="screen" href="browser/vendor/css/bootstrap.css" />
<style type="text/css"> <style type="text/css">
body { body {
padding-top: 60px; padding-top: 60px;
@@ -22,8 +22,8 @@
padding: 9px 0; padding: 9px 0;
} }
</style> </style>
<link rel="stylesheet" media="screen" href="api/browser/vendor/css/bootstrap-responsive.css" /> <link rel="stylesheet" media="screen" href="browser/vendor/css/bootstrap-responsive.css" />
<link rel="stylesheet" media="screen" href="api/browser/styles.css" /> <link rel="stylesheet" media="screen" href="browser/styles.css" />
</head> </head>
<body> <body>
@@ -249,44 +249,44 @@ Content-Type: application/json
</div> </div>
</script> </script>
<script src="api/browser/vendor/js/jquery-1.10.2.min.js"></script> <script src="browser/vendor/js/jquery-1.10.2.min.js"></script>
<script src="api/browser/vendor/js/underscore.js"></script> <script src="browser/vendor/js/underscore.js"></script>
<script src="api/browser/vendor/js/backbone.js"></script> <script src="browser/vendor/js/backbone.js"></script>
<script src="api/browser/vendor/js/uritemplates.js"></script> <script src="browser/vendor/js/uritemplates.js"></script>
<script src="api/browser/vendor/js/URI.min.js"></script> <script src="browser/vendor/js/URI.min.js"></script>
<script src="api/browser/vendor/js/bootstrap.js"></script> <script src="browser/vendor/js/bootstrap.js"></script>
<script src="api/browser/js/hal.js"></script> <script src="browser/js/hal.js"></script>
<script src="api/browser/js/hal/browser.js"></script> <script src="browser/js/hal/browser.js"></script>
<script src="api/browser/js/hal/http/client.js"></script> <script src="browser/js/hal/http/client.js"></script>
<script src="api/browser/js/hal/resource.js"></script> <script src="browser/js/hal/resource.js"></script>
<script src="api/browser/js/hal/views/browser.js"></script> <script src="browser/js/hal/views/browser.js"></script>
<script src="api/browser/js/hal/views/explorer.js"></script> <script src="browser/js/hal/views/explorer.js"></script>
<script src="api/browser/js/hal/views/inspector.js"></script> <script src="browser/js/hal/views/inspector.js"></script>
<script src="api/browser/js/hal/views/navigation.js"></script> <script src="browser/js/hal/views/navigation.js"></script>
<script src="api/browser/js/hal/views/location_bar.js"></script> <script src="browser/js/hal/views/location_bar.js"></script>
<script src="api/browser/js/hal/views/request_headers.js"></script> <script src="browser/js/hal/views/request_headers.js"></script>
<script src="api/browser/js/hal/views/resource.js"></script> <script src="browser/js/hal/views/resource.js"></script>
<script src="api/browser/js/hal/views/properties.js"></script> <script src="browser/js/hal/views/properties.js"></script>
<script src="api/browser/js/hal/views/links.js"></script> <script src="browser/js/hal/views/links.js"></script>
<script src="api/browser/js/hal/views/embedded_resources.js"></script> <script src="browser/js/hal/views/embedded_resources.js"></script>
<script src="api/browser/js/hal/views/embedded_resource.js"></script> <script src="browser/js/hal/views/embedded_resource.js"></script>
<script src="api/browser/js/hal/views/non_safe_request_dialog.js"></script> <script src="browser/js/hal/views/non_safe_request_dialog.js"></script>
<script src="api/browser/js/hal/views/query_uri_dialog.js"></script> <script src="browser/js/hal/views/query_uri_dialog.js"></script>
<script src="api/browser/js/hal/views/response.js"></script> <script src="browser/js/hal/views/response.js"></script>
<script src="api/browser/js/hal/views/response_headers.js"></script> <script src="browser/js/hal/views/response_headers.js"></script>
<script src="api/browser/js/hal/views/response_body.js"></script> <script src="browser/js/hal/views/response_body.js"></script>
<script src="api/browser/js/hal/views/documentation.js"></script> <script src="browser/js/hal/views/documentation.js"></script>
<script src="api/browser/vendor/js/jsoneditor.js"></script> <script src="browser/vendor/js/jsoneditor.js"></script>
<script src="api/browser/js/CustomPostForm.js"></script> <script src="browser/js/CustomPostForm.js"></script>
<script> <script>
var browser = new HAL.Browser({ var browser = new HAL.Browser({