Skip to content
Snippets Groups Projects
Commit 5a64b488 authored by Rick Herrick's avatar Rick Herrick
Browse files

XNAT-4377 XNAT-4382 Cleaned up some dependency issues that affected build of...

XNAT-4377 XNAT-4382 Cleaned up some dependency issues that affected build of XNAT data builder plugin. Added XnatPluginApi REST API. Added SortedProperties utility class to make it a bit easier to read properties outputs.
parent 8e959797
No related branches found
No related tags found
Loading
...@@ -254,6 +254,7 @@ configurations { ...@@ -254,6 +254,7 @@ configurations {
all*.exclude group: 'servletapi' all*.exclude group: 'servletapi'
all*.exclude group: 'velocity' all*.exclude group: 'velocity'
all*.exclude group: 'xmlrpc' all*.exclude group: 'xmlrpc'
all*.exclude group: 'quartz'
all*.exclude group: 'ant', module: 'ant' all*.exclude group: 'ant', module: 'ant'
all*.exclude group: 'commons-email', module: 'commons-email' all*.exclude group: 'commons-email', module: 'commons-email'
all*.exclude group: 'edu.ucar', module: 'netcdf' all*.exclude group: 'edu.ucar', module: 'netcdf'
......
...@@ -21,17 +21,17 @@ import java.io.IOException; ...@@ -21,17 +21,17 @@ import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
@Api(description = "XNAT Plugin Admin API") @Api(description = "XNAT Plugin API")
@XapiRestController @XapiRestController
@RequestMapping(value = "/plugins") @RequestMapping(value = "/plugins")
public class XnatPluginAdminApi extends AbstractXapiRestController { public class XnatPluginApi extends AbstractXapiRestController {
@Autowired @Autowired
public XnatPluginAdminApi(final UserManagementServiceI userManagementService, final RoleHolder roleHolder, final XnatAppInfo appInfo) { public XnatPluginApi(final UserManagementServiceI userManagementService, final RoleHolder roleHolder, final XnatAppInfo appInfo) {
super(userManagementService, roleHolder); super(userManagementService, roleHolder);
_appInfo = appInfo; _appInfo = appInfo;
} }
@ApiOperation(value = "Returns a list of all of the installed XNAT plugins.", notes = "The maps returned from this call include all of the properties specified in the plugin's property file.", response = String.class, responseContainer = "Map") @ApiOperation(value = "Returns a list of all of the installed and active XNAT plugins with their properties.", notes = "The maps returned from this call include all of the properties specified in the plugin's property file.", response = String.class, responseContainer = "Map")
@ApiResponses({@ApiResponse(code = 200, message = "XNAT plugin properties successfully retrieved."), @ApiResponses({@ApiResponse(code = 200, message = "XNAT plugin properties successfully retrieved."),
@ApiResponse(code = 401, message = "Must be authenticated to access the XNAT REST API."), @ApiResponse(code = 401, message = "Must be authenticated to access the XNAT REST API."),
@ApiResponse(code = 500, message = "Unexpected error")}) @ApiResponse(code = 500, message = "Unexpected error")})
...@@ -40,7 +40,7 @@ public class XnatPluginAdminApi extends AbstractXapiRestController { ...@@ -40,7 +40,7 @@ public class XnatPluginAdminApi extends AbstractXapiRestController {
return new ResponseEntity<>(_appInfo.getPluginProperties(), HttpStatus.OK); return new ResponseEntity<>(_appInfo.getPluginProperties(), HttpStatus.OK);
} }
@ApiOperation(value = "Returns the requested XNAT plugin properties.", notes = "The maps returned from this call include all of the properties specified in the plugin's property file.", response = Properties.class) @ApiOperation(value = "Returns the indicated XNAT plugin with its properties.", notes = "The map returned from this call include all of the properties specified in the plugin's property file.", response = Properties.class)
@ApiResponses({@ApiResponse(code = 200, message = "XNAT plugin properties successfully retrieved."), @ApiResponses({@ApiResponse(code = 200, message = "XNAT plugin properties successfully retrieved."),
@ApiResponse(code = 401, message = "Must be authenticated to access the XNAT REST API."), @ApiResponse(code = 401, message = "Must be authenticated to access the XNAT REST API."),
@ApiResponse(code = 404, message = "The requested resource wasn't found."), @ApiResponse(code = 404, message = "The requested resource wasn't found."),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment