Enabled OAIProvider spring injection again

pom.xml

@@ -599,6 +599,7 @@
                     </dependency>
                 </dependencies>
             </plugin-->
+            <!-- https://github.com/swagger-api/swagger-core/blob/master/modules/swagger-maven-plugin/README.md -->
             <plugin>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-maven-plugin-jakarta</artifactId>

src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/AboutPage.html

@@ -29,29 +29,28 @@ <h1>About the Virtual Collection Registry</h1>
                 <a title="IDS" href="https://www.ids-mannheim.de/"><img src="images/ids-logo.png" alt="IDS logo"/></a>
             </p>
             <p>
-                Persistent identifiers for the VCR are issued by 
+                DataCite DOIs are issued by <a href="https://www.datacite.org">DataCite</a>.
+                <br />
+                Persistent handle identifiers for the VCR are issued by 
                 <a href="http://www.gwdg.de/">GWDG</a> using the
-                <a href="http://www.pidconsortium.eu/">EPIC API version 2</a>.
+                <a href="http://www.pidconsortium.eu/">EPIC API version 2</a>.           
             </p>
 
-            <h2>Licenses</h2>
+            <h2>Source Code</h2>
             <p>
-                The VCR is made available under the 
-                <a href="http://www.gnu.org/licenses/gpl-3.0.html">GPL 3.0</a>
-                license.<br />
-                Source code and documentation is published on 
-                <a href="https://github.com/clarin-eric/VirtualCollectionRegistry">GitHub</a>.
+                The VCR ource code and documentation are published on <a href="https://github.com/clarin-eric/VirtualCollectionRegistry">GitHub</a> and are made available under the 
+                <a href="http://www.gnu.org/licenses/gpl-3.0.html">GPL 3.0</a> license.<br /> The full license can be found in the source code repository and in the packaged sources and binaries.
             </p>
+            <h2>Technology Used</h2>
             <p>
                 It uses the following software components:
                 <ul>
-                    <li><a href="http://wicket.apache.org">Apache Wicket</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License 2.0</a>)</li>
-                    <li><a href="https://jersey.java.net/">Jersey</a> (<a href="https://jersey.java.net/license.html#cddl">CCDL 1.1</a>)</li>
-                    <li><a href="http://projects.spring.io/spring-framework/">Spring Framework</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License 2.0</a>)</li>
-                    <li><a href="http://getbootstrap.com/">Bootstrap</a> (<a href="https://github.com/twbs/bootstrap/blob/master/LICENSE">MIT license</a>)</li>
-                    <li><a href="http://jquery.org/license/">jQuery</a> (<a href="https://jquery.org/license/">MIT license</a>)</li>
-                    <li><a href="https://code.google.com/p/wiquery/">WiQuery</a> (<a href="http://opensource.org/licenses/mit-license.php">MIT license</a>)</li>
-                    <li><a href="http://glyphicons.com/">GLYPHICONS free</a> (<a href="http://glyphicons.com/license/">CC-BY 3.0</a>)</li>
+                    <li><a href="http://wicket.apache.org">Apache Wicket</a>.</li>                    
+                    <li><a href="http://projects.spring.io/spring-framework/">Spring Framework</a>.</li>
+                    <li><a href="https://hibernate.org/">Hibernate</a>.</li>
+                    <li><a href="https://jersey.java.net/">Jersey</a>.</li>
+                    <li><a href="http://getbootstrap.com/">Bootstrap</a>.</li>
+                    <li><a href="http://glyphicons.com/">GLYPHICONS and FontAwesome free</a></li>
                 </ul>
             </p>
 

src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/HelpPage.html

@@ -252,7 +252,6 @@ <h2>Managing Your Collections</h2>
                                 <li>API documentation is based on the OpenAPI specification and can be found <a wicket:id="restLink2">here</a>.</li>
                                 <ul><li>OpenAI specification file is availble <a href="./swagger.json">here</a>.</li></ul>
                                 <li>An  older version of the documentation, which includes the query language specification, is available <a href="Protocol.txt">here</a>.</li>
-                                <li>You can also consult the <a wicket:id="wadlLink">WADL</a> file.</li>
                             </ul>
                         </p>
 

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")));

src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VirtualCollectionRegistryOAIConfiguration.java

@@ -4,18 +4,20 @@
 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
  * {@link VirtualCollectionRegistry}
  *
  * @author twagoo
  */
-//@Configuration
+@Configuration
 public class VirtualCollectionRegistryOAIConfiguration {
 
-    //@Autowired
+    @Autowired
     private VirtualCollectionRegistry vcr;
 
     @Bean

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() {