Merge pull request #143 from clarin-eric/dev

Dev

Author: wowasa

.gitignore

@@ -2,4 +2,5 @@
 /src/
 /.project
 .idea/
-*.iml
+*.iml
+/bin/

CHANGES.md

@@ -1,10 +1,14 @@
-# version 5.3.0
+# 5.4.x
+- adding deactivation and deletion of non confirmed links
+- externalising help and faq page as markdown
+
+# version 5.3.x
 - renaming project to curation-dashboard, modules to curation-core and curation-web
 - trimming of URLs for storage and look up
 - new category »Invalid_URL« for URLs which can't be processed with Java URL class
 - ordering link checking results in reports for severity (from »Ok« to »Invalid_URL«)
 
-# version 5.2.0
+# version 5.2.x
 - calculate total linkchecker statistics from category statistics and overall from provider group statistics to prevent database access at different times while linkchecker changes data continuously 
 
 # version 5.1.1

README.md

@@ -2,7 +2,7 @@
 
 Here is the current deployed instance of Curation Dashboard: https://curation.clarin.eu/
 
-The goal of this project is to implement software component for curation and quality assessment which can be integrated in the CLARINs VLO workflow. Project is initialized by Metadata Curation Task Force. Specification for the Curation Dashboard is based on the Metadata Quality Assessement Service proposal. Curation Dashboard validates and normalizes single MD records, repositories and profiles, to assess their quality and to produce reports with different information for different actors in VLO workflow. For implementation this project will use some of the existing CLARIN components. 
+The goal of this project is to implement software component for curation and quality assessment which can be integrated in the CLARINs VLO workflow. Project is initialized by Metadata Curation Task Force. Specification for the Curation Dashboard is based on the Metadata Quality Assessment Service proposal. Curation Dashboard validates and normalizes single MD records, repositories and profiles, to assess their quality and to produce reports with different information for different actors in VLO workflow. For implementation this project will use some of the existing CLARIN components. 
 
 ### curation dashboard core
 Usable as stand-alone application to generate instance/collection reports and as required API in the curation web application

curation-core/pom.xml

@@ -8,8 +8,10 @@
    <artifactId>curation-core</artifactId>
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <log4j.version>2.17.2</log4j.version>
-      <rasa.version>5.0.3</rasa.version>
+      <log4j.version>2.17.2</log4j.version>
+      <rasa.version>5.1.1</rasa.version>
+      <mariadb.version>2.7.5</mariadb.version>
+      <hikari.version>5.0.1</hikari.version>
    </properties>
    <dependencies>
       <dependency>
@@ -106,6 +108,16 @@
          <artifactId>Saxon-HE</artifactId>
          <version>10.3</version>
       </dependency>
+      <dependency>
+         <groupId>org.mariadb.jdbc</groupId>
+         <artifactId>mariadb-java-client</artifactId>
+         <version>${mariadb.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>com.zaxxer</groupId>
+         <artifactId>HikariCP</artifactId>
+         <version>${hikari.version}</version>
+      </dependency>
    </dependencies>
    <build>
       <plugins>
@@ -125,6 +137,7 @@
                      <overWriteReleases>false</overWriteReleases>
                      <overWriteSnapshots>false</overWriteSnapshots>
                      <overWriteIfNewer>true</overWriteIfNewer>
+                     <includeScope>compile</includeScope>
                   </configuration>
                </execution>
             </executions>

curation-core/script/updateDashboard.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 START_TIME=$SECONDS
 
-WORK_DIR=/usr/local/curation-module
+WORK_DIR=/app/curation-dashboard
 BIN_DIR=$WORK_DIR/bin
 LIB_DIR=$WORK_DIR/lib
 DATA_DIR=$WORK_DIR/data
@@ -22,6 +22,7 @@ set -e
 
 # set data paths
 if [ -z "$PROVIDER_SETS" ]; then
+   echo "PROVIDER_SETS not set. Using default value 'clarin europeana'"
    export PROVIDER_SETS="clarin europeana"
 fi
 

curation-core/src/assembly/dist.xml

@@ -1,6 +1,5 @@
 package eu.clarin.cmdi.curation.ccr_service;
 
-import eu.clarin.cmdi.curation.ccr_service.ICCRService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

curation-core/src/main/java/eu/clarin/cmdi/curation/ccr_service/CCRServiceFactory.java

@@ -1,7 +1,5 @@
 package eu.clarin.cmdi.curation.ccr_service;
 
-import eu.clarin.cmdi.curation.ccr_service.CCRConcept;
-
 import java.util.Collection;
 
 public interface ICCRService {