From c61adac4812835ed01d7ba47137a13e9c48f337c Mon Sep 17 00:00:00 2001 From: Willem Elbers Date: Thu, 26 Sep 2024 13:13:01 +0200 Subject: [PATCH] Enabled OAIProvider spring injection again --- pom.xml | 1 + .../gui/pages/AboutPage.html | 29 +++++++++---------- .../gui/pages/HelpPage.html | 1 - .../gui/pages/HelpPage.java | 6 ++-- ...ualCollectionRegistryOAIConfiguration.java | 6 ++-- ...VirtualColletionRegistryOAIRepository.java | 9 +++--- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 5e07c640..3757348b 100644 --- a/pom.xml +++ b/pom.xml @@ -599,6 +599,7 @@ + io.swagger.core.v3 swagger-maven-plugin-jakarta diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AboutPage.html b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AboutPage.html index f5609560..f8aa68cb 100644 --- a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AboutPage.html +++ b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AboutPage.html @@ -29,29 +29,28 @@

About the Virtual Collection Registry

IDS logo

- Persistent identifiers for the VCR are issued by + DataCite DOIs are issued by DataCite. +
+ Persistent handle identifiers for the VCR are issued by GWDG using the - EPIC API version 2. + EPIC API version 2.

-

Licenses

+

Source Code

- The VCR is made available under the - GPL 3.0 - license.
- Source code and documentation is published on - GitHub. + The VCR ource code and documentation are published on GitHub and are made available under the + GPL 3.0 license.
The full license can be found in the source code repository and in the packaged sources and binaries.

+

Technology Used

It uses the following software components:

diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/HelpPage.html b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/HelpPage.html index 93e7bab7..2126d5ad 100644 --- a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/HelpPage.html +++ b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/HelpPage.html @@ -252,7 +252,6 @@

Managing Your Collections

  • API documentation is based on the OpenAPI specification and can be found here.
  • An older version of the documentation, which includes the query language specification, is available here.
  • -
  • You can also consult the WADL file.
  • diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/HelpPage.java b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/HelpPage.java index 426cea79..c8e360be 100644 --- a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/HelpPage.java +++ b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/HelpPage.java @@ -55,7 +55,7 @@ public HelpPage() { final String serviceBaseUri = String.format("%s/service/", baseUri); add(new ExternalLink("restLink", serviceBaseUri) .add(new Label("restUrl", serviceBaseUri))); - add(new ExternalLink("restLink2", serviceBaseUri)); + add(new ExternalLink("restLink2", "https://infra.clarin.eu/apis?urls.primaryName=Virtual%20Collection%20Registry%20API%20(beta)")); final String oaiIdentifyUri = String.format("%s/oai?verb=Identify", baseUri); add(new ExternalLink("oaiLink", oaiIdentifyUri) @@ -65,8 +65,8 @@ public HelpPage() { if(!serviceBaseUri.endsWith("/")) { wadlUri += "/"; } - wadlUri += "application.wadl"; - add(new ExternalLink("wadlLink", wadlUri)); + //wadlUri += "application.wadl"; + //add(new ExternalLink("wadlLink", wadlUri)); add(new Image("img-virtualcollection", new ContextRelativeResource("/images/virtualcollection.png"))); add(new Image("img-vcr-menu-browse", new ContextRelativeResource("/images/help-vcr-menu-browse.png"))); diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualCollectionRegistryOAIConfiguration.java b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualCollectionRegistryOAIConfiguration.java index 6c8db51b..b46c0329 100644 --- a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualCollectionRegistryOAIConfiguration.java +++ b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualCollectionRegistryOAIConfiguration.java @@ -4,7 +4,9 @@ import eu.clarin.cmdi.oai.provider.Repository; import eu.clarin.cmdi.oai.provider.impl.OAIProvider; import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistry; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; /** * Spring configuration that defines beans for the OAI Provider to be used by @@ -12,10 +14,10 @@ * * @author twagoo */ -//@Configuration +@Configuration public class VirtualCollectionRegistryOAIConfiguration { - //@Autowired + @Autowired private VirtualCollectionRegistry vcr; @Bean diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualColletionRegistryOAIRepository.java b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualColletionRegistryOAIRepository.java index 81337379..b34e0ce1 100644 --- a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualColletionRegistryOAIRepository.java +++ b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualColletionRegistryOAIRepository.java @@ -39,19 +39,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; -//@Component +@Component public class VirtualColletionRegistryOAIRepository implements Repository { private static final Logger logger = LoggerFactory.getLogger(VirtualColletionRegistryOAIRepository.class); private VirtualCollectionRegistry registry; - // @Autowired + @Autowired private VirtualCollectionCMDIWriter cmdiWriter; - // @Autowired + @Autowired private DataStore dataStore; - - private class CMDIMetadataFormat implements MetadataFormat { @Override public String getPrefix() {