Merge branch 'issue20' into develop

clarin-eric · Aug 23, 2016 · 5446091 · 5446091
2 parents efd12c9 + 7f96669
commit 5446091
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...gistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java b/...gistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java
@@ -110,6 +110,7 @@
  *
  */
 @Path("/")
+@Api(value = "/", description = "Rest API for the CMDI Component Registry", produces = MediaType.APPLICATION_XML)
 @Service
 @Singleton
 public class ComponentRegistryRestService {
@@ -147,6 +148,7 @@ public class ComponentRegistryRestService {
      * @return RegistryService resource with the requested service
      */
     @Path("/registry/{cmdVersion: 1\\.[12x]}")
+    @ApiOperation(value = "Registry for a CMDI version")
     public Class<RegistryService> versionService() {
         return RegistryService.class;
     }
@@ -157,6 +159,7 @@ public Class<RegistryService> versionService() {
      * @return RegistryService resource for default version
      */
     @Path("/registry")
+    @ApiOperation(value = "Registry for the default CMDI version")
     public Class<RegistryService> defaultVersionService() {
         return RegistryService.class;
     }
@@ -178,7 +181,7 @@ public AllowedAttributetypesXML getAllowedAttributeTypes()
      * Subresource for a registry service
      */
     @Transactional(rollbackFor = {Exception.class, ValidationException.class})
-    @Api(value = "/registry", description = "Rest API for the CMDI Component Registry", produces = MediaType.APPLICATION_XML)
+    @Api(value = "/registry", description = "Profiles and component registry", produces = MediaType.APPLICATION_XML)
     public static class RegistryService extends AbstractComponentRegistryRestService {
 
         @PathParam("cmdVersion")

diff --git a/ComponentRegistry/src/main/webapp/api-docs/index.html b/ComponentRegistry/src/main/webapp/api-docs/index.html
@@ -28,7 +28,7 @@
       if (url && url.length > 1) {
         url = url[1];
       } else {
-        url = "../../rest/api-docs";
+        url = "../rest/api-docs";
       }
       window.swaggerUi = new SwaggerUi({
         url: url,