diff --git a/pom.xml b/pom.xml index 1694cbbd..e9deb400 100644 --- a/pom.xml +++ b/pom.xml @@ -175,11 +175,6 @@ ${cage.version} compile - - com.github.jsonld-java - jsonld-java - compile - com.sun.mail dsn @@ -192,31 +187,6 @@ ${sun.mail.version} compile - - org.eclipse.rdf4j - rdf4j-model - compile - - - org.eclipse.rdf4j - rdf4j-model-api - compile - - - org.eclipse.rdf4j - rdf4j-rio-api - compile - - - org.eclipse.rdf4j - rdf4j-rio-jsonld - compile - - - org.eclipse.rdf4j - rdf4j-rio-rdfxml - compile - org.glassfish.jersey.core jersey-server @@ -245,12 +215,6 @@ provided - - commons-io - commons-io - - provided - jakarta.annotation jakarta.annotation-api diff --git a/src/main/java/de/vzg/reposis/digibib/util/CodeMetaRDFConverterResolver.java b/src/main/java/de/vzg/reposis/digibib/util/CodeMetaRDFConverterResolver.java deleted file mode 100644 index 76b184b3..00000000 --- a/src/main/java/de/vzg/reposis/digibib/util/CodeMetaRDFConverterResolver.java +++ /dev/null @@ -1,77 +0,0 @@ -package de.vzg.reposis.digibib.util; - -import java.io.ByteArrayOutputStream; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; - -import javax.xml.transform.Source; -import javax.xml.transform.TransformerException; -import javax.xml.transform.URIResolver; - -import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.eclipse.rdf4j.model.Model; -import org.eclipse.rdf4j.model.impl.LinkedHashModel; -import org.eclipse.rdf4j.rio.Rio; -import org.eclipse.rdf4j.rio.helpers.JSONLDSettings; -import org.eclipse.rdf4j.rio.helpers.StatementCollector; -import org.eclipse.rdf4j.rio.jsonld.JSONLDParser; -import org.eclipse.rdf4j.rio.rdfxml.RDFXMLWriter; -import org.jdom2.Document; -import org.jdom2.input.SAXBuilder; -import org.jdom2.transform.JDOMSource; - -import com.github.jsonldjava.core.DocumentLoader; - -public class CodeMetaRDFConverterResolver implements URIResolver { - - private static final Logger LOGGER = LogManager.getLogger(); - - private static final String CODEMETA_JSONLD_PATH = "/jsonld/codemeta.jsonld"; - - private static final String CODEMETA_JSONLD_URL = "https://doi.org/10.5063/schema/codemeta-2.0"; - - /** - * Converts CodeMeta jsonld to rdf - * - * Syntax: codemeta2rdf:{baseURI}:{json} - * - * @param href URI in the syntax above - * @param base not used - * - * @return document contains the converted rdf - * @see javax.xml.transform.URIResolver - */ - @Override - public Source resolve(final String href, final String base) throws TransformerException { - final String[] hrefParts = href.split(":", 3); - if (hrefParts.length > 2) { - final String baseURI = hrefParts[1]; - final String json = hrefParts[2]; - try (final InputStream input = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); - final ByteArrayOutputStream out = new ByteArrayOutputStream()) { - final String codemetaJsonld = IOUtils.resourceToString(CODEMETA_JSONLD_PATH, StandardCharsets.UTF_8); - final DocumentLoader docLoader = new DocumentLoader(); - docLoader.addInjectedDoc(CODEMETA_JSONLD_URL, codemetaJsonld); - final JSONLDParser parser = new JSONLDParser(); - parser.getParserConfig().set(JSONLDSettings.DOCUMENT_LOADER, docLoader); - final Model model = new LinkedHashModel(); - parser.setRDFHandler(new StatementCollector(model)); - if (baseURI.isEmpty()) { - parser.parse(input, null); - } else { - parser.parse(input, baseURI); - } - final RDFXMLWriter writer = new RDFXMLWriter(out); - Rio.write(model, writer); - final Document result = new SAXBuilder().build(new ByteArrayInputStream(out.toByteArray())); - return new JDOMSource(result); - } catch (Exception e) { - LOGGER.error("Unable to convert to rdf", e); - } - } - throw new IllegalArgumentException("Invalid format of uri for retrieval of json2rdf: " + href); - } -} diff --git a/src/main/java/de/vzg/reposis/digibib/util/ValidationHelper.java b/src/main/java/de/vzg/reposis/digibib/util/ValidationHelper.java deleted file mode 100644 index bbdcc27d..00000000 --- a/src/main/java/de/vzg/reposis/digibib/util/ValidationHelper.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.vzg.reposis.digibib.util; - -import java.net.URL; -import java.net.MalformedURLException; -import java.net.URISyntaxException; - -public class ValidationHelper { - - public static boolean validateURL(final String url) { - try { - new URL(url).toURI(); - } catch (MalformedURLException | URISyntaxException e) { - return false; - } - return true; - } -} diff --git a/src/main/resources/META-INF/resources/editor/custom-includes.xed b/src/main/resources/META-INF/resources/editor/custom-includes.xed index 0a1c1337..4813c261 100644 --- a/src/main/resources/META-INF/resources/editor/custom-includes.xed +++ b/src/main/resources/META-INF/resources/editor/custom-includes.xed @@ -2,6 +2,8 @@ + +
@@ -148,16 +150,16 @@ diff --git a/src/main/resources/META-INF/resources/editor/editor-customization.xed b/src/main/resources/META-INF/resources/editor/editor-customization.xed index 7f4b5657..d27f6219 100644 --- a/src/main/resources/META-INF/resources/editor/editor-customization.xed +++ b/src/main/resources/META-INF/resources/editor/editor-customization.xed @@ -15,7 +15,9 @@ - + + + @@ -209,15 +211,15 @@ - + - + + display="global" i18n="digibib.validation.correspondingAuthor" relevant-if="count(./mods:name/mods:role/mods:roleTerm[text()='aut']) > 0"/> @@ -234,7 +236,7 @@ - + @@ -264,7 +266,7 @@ - + @@ -302,59 +304,52 @@ - - - - - - - - +
-
-