diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/AggregationElementOperator.java b/src/main/java/de/nrw/hbz/edm/impl/AggregationElementOperator.java similarity index 93% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/AggregationElementOperator.java rename to src/main/java/de/nrw/hbz/edm/impl/AggregationElementOperator.java index ff60e8f..fedd8a3 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/AggregationElementOperator.java +++ b/src/main/java/de/nrw/hbz/edm/impl/AggregationElementOperator.java @@ -1,4 +1,4 @@ -package de.nrw.hbz.genericSipLoader.edm.impl; +package de.nrw.hbz.edm.impl; import java.util.ArrayList; import java.util.Hashtable; @@ -9,12 +9,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import de.nrw.hbz.genericSipLoader.edm.model.Aggregation; -import de.nrw.hbz.genericSipLoader.edm.model.Rdf; -import de.nrw.hbz.genericSipLoader.edm.model.WebResource; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeResourceAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeRdf; -import de.nrw.hbz.genericSipLoader.util.TimeStampProvider; +import de.nrw.hbz.edm.model.Aggregation; +import de.nrw.hbz.edm.model.Rdf; +import de.nrw.hbz.edm.model.WebResource; +import de.nrw.hbz.edm.model.deserialize.DeserializeResourceAttribute; +import de.nrw.hbz.edm.model.serialize.SerializeRdf; +import de.nrw.hbz.edm.util.TimeStampProvider; /** * A Class to replace Element values and attributes within the EDM Aggregation Core Element. diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/ConsoleImpl.java b/src/main/java/de/nrw/hbz/edm/impl/ConsoleImpl.java similarity index 84% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/ConsoleImpl.java rename to src/main/java/de/nrw/hbz/edm/impl/ConsoleImpl.java index 6573e63..347dda3 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/ConsoleImpl.java +++ b/src/main/java/de/nrw/hbz/edm/impl/ConsoleImpl.java @@ -1,22 +1,22 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.impl; +package de.nrw.hbz.edm.impl; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import de.nrw.hbz.genericSipLoader.edm.model.Aggregation; -import de.nrw.hbz.genericSipLoader.edm.model.OaiPmh; -import de.nrw.hbz.genericSipLoader.edm.model.OaiRecord; -import de.nrw.hbz.genericSipLoader.edm.model.ProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.Rdf; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeAggregation; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiPmh; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeResourceAttribute; +import de.nrw.hbz.edm.model.Aggregation; +import de.nrw.hbz.edm.model.OaiPmh; +import de.nrw.hbz.edm.model.OaiRecord; +import de.nrw.hbz.edm.model.ProvidedCHO; +import de.nrw.hbz.edm.model.Rdf; +import de.nrw.hbz.edm.model.serialize.SerializeAggregation; +import de.nrw.hbz.edm.model.serialize.SerializeOaiPmh; +import de.nrw.hbz.edm.model.serialize.SerializeProvidedCHO; +import de.nrw.hbz.edm.model.serialize.SerializeResourceAttribute; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/DeserializeEdmXml.java b/src/main/java/de/nrw/hbz/edm/impl/DeserializeEdmXml.java similarity index 91% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/DeserializeEdmXml.java rename to src/main/java/de/nrw/hbz/edm/impl/DeserializeEdmXml.java index 5aa68c5..cee0163 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/DeserializeEdmXml.java +++ b/src/main/java/de/nrw/hbz/edm/impl/DeserializeEdmXml.java @@ -1,7 +1,7 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.impl; +package de.nrw.hbz.edm.impl; import java.io.BufferedInputStream; import java.io.File; @@ -14,8 +14,8 @@ import com.fasterxml.jackson.databind.DatabindException; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import de.nrw.hbz.genericSipLoader.edm.model.Rdf; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeRdf; +import de.nrw.hbz.edm.model.Rdf; +import de.nrw.hbz.edm.model.deserialize.DeserializeRdf; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/DeserializeOaiPmhXml.java b/src/main/java/de/nrw/hbz/edm/impl/DeserializeOaiPmhXml.java similarity index 91% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/DeserializeOaiPmhXml.java rename to src/main/java/de/nrw/hbz/edm/impl/DeserializeOaiPmhXml.java index 818f551..186daeb 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/DeserializeOaiPmhXml.java +++ b/src/main/java/de/nrw/hbz/edm/impl/DeserializeOaiPmhXml.java @@ -1,7 +1,7 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.impl; +package de.nrw.hbz.edm.impl; import java.io.BufferedInputStream; import java.io.File; @@ -14,8 +14,8 @@ import com.fasterxml.jackson.databind.DatabindException; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import de.nrw.hbz.genericSipLoader.edm.model.OaiPmh; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeOaiPmh; +import de.nrw.hbz.edm.model.OaiPmh; +import de.nrw.hbz.edm.model.deserialize.DeserializeOaiPmh; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/EdmImpl.java b/src/main/java/de/nrw/hbz/edm/impl/EdmImpl.java similarity index 91% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/EdmImpl.java rename to src/main/java/de/nrw/hbz/edm/impl/EdmImpl.java index d621a4c..f9e6621 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/EdmImpl.java +++ b/src/main/java/de/nrw/hbz/edm/impl/EdmImpl.java @@ -1,9 +1,9 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.impl; +package de.nrw.hbz.edm.impl; -import de.nrw.hbz.genericSipLoader.edm.model.Rdf; +import de.nrw.hbz.edm.model.Rdf; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/OaiPmhImpl.java b/src/main/java/de/nrw/hbz/edm/impl/OaiPmhImpl.java similarity index 86% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/OaiPmhImpl.java rename to src/main/java/de/nrw/hbz/edm/impl/OaiPmhImpl.java index 6ad4c8e..6c14487 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/OaiPmhImpl.java +++ b/src/main/java/de/nrw/hbz/edm/impl/OaiPmhImpl.java @@ -1,10 +1,10 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.impl; +package de.nrw.hbz.edm.impl; -import de.nrw.hbz.genericSipLoader.edm.model.OaiPmh; +import de.nrw.hbz.edm.model.OaiPmh; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/QdcProvider.java b/src/main/java/de/nrw/hbz/edm/impl/QdcProvider.java similarity index 89% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/QdcProvider.java rename to src/main/java/de/nrw/hbz/edm/impl/QdcProvider.java index a830478..1b1eb92 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/QdcProvider.java +++ b/src/main/java/de/nrw/hbz/edm/impl/QdcProvider.java @@ -1,14 +1,14 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.impl; +package de.nrw.hbz.edm.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import de.nrw.hbz.genericSipLoader.edm.model.ProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.Qdc; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeQdc; +import de.nrw.hbz.edm.model.ProvidedCHO; +import de.nrw.hbz.edm.model.Qdc; +import de.nrw.hbz.edm.model.serialize.SerializeQdc; /** * class that provides a Qualified Dublin Core (QDC) representation mapped from EDM diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/SerializeEdmXml.java b/src/main/java/de/nrw/hbz/edm/impl/SerializeEdmXml.java similarity index 86% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/SerializeEdmXml.java rename to src/main/java/de/nrw/hbz/edm/impl/SerializeEdmXml.java index b8d8bd4..a68766b 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/SerializeEdmXml.java +++ b/src/main/java/de/nrw/hbz/edm/impl/SerializeEdmXml.java @@ -1,7 +1,7 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.impl; +package de.nrw.hbz.edm.impl; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -9,9 +9,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeRdf; -import de.nrw.hbz.genericSipLoader.impl.DipsLoaderImpl; -import de.nrw.hbz.genericSipLoader.edm.model.Rdf; +import de.nrw.hbz.edm.model.serialize.SerializeRdf; +import de.nrw.hbz.edm.model.Rdf; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/SerializeOaiPmhXml.java b/src/main/java/de/nrw/hbz/edm/impl/SerializeOaiPmhXml.java similarity index 85% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/SerializeOaiPmhXml.java rename to src/main/java/de/nrw/hbz/edm/impl/SerializeOaiPmhXml.java index 221f482..bd51456 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/impl/SerializeOaiPmhXml.java +++ b/src/main/java/de/nrw/hbz/edm/impl/SerializeOaiPmhXml.java @@ -1,13 +1,13 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.impl; +package de.nrw.hbz.edm.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiPmh; -import de.nrw.hbz.genericSipLoader.edm.model.OaiPmh; +import de.nrw.hbz.edm.model.serialize.SerializeOaiPmh; +import de.nrw.hbz.edm.model.OaiPmh; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/AboutAttribute.java b/src/main/java/de/nrw/hbz/edm/model/AboutAttribute.java similarity index 69% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/AboutAttribute.java rename to src/main/java/de/nrw/hbz/edm/model/AboutAttribute.java index 587366a..3fcd802 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/AboutAttribute.java +++ b/src/main/java/de/nrw/hbz/edm/model/AboutAttribute.java @@ -1,13 +1,13 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeAboutAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeAboutAttribute; +import de.nrw.hbz.edm.model.deserialize.DeserializeAboutAttribute; +import de.nrw.hbz.edm.model.serialize.SerializeAboutAttribute; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Aggregation.java b/src/main/java/de/nrw/hbz/edm/model/Aggregation.java similarity index 93% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Aggregation.java rename to src/main/java/de/nrw/hbz/edm/model/Aggregation.java index 596c1a6..b7bf38c 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Aggregation.java +++ b/src/main/java/de/nrw/hbz/edm/model/Aggregation.java @@ -1,11 +1,11 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeAggregation; +import de.nrw.hbz.edm.model.deserialize.DeserializeAggregation; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiHeader.java b/src/main/java/de/nrw/hbz/edm/model/OaiHeader.java similarity index 96% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiHeader.java rename to src/main/java/de/nrw/hbz/edm/model/OaiHeader.java index f061e63..a6a2692 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiHeader.java +++ b/src/main/java/de/nrw/hbz/edm/model/OaiHeader.java @@ -1,4 +1,4 @@ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import java.sql.Timestamp; import java.text.SimpleDateFormat; diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiMetadata.java b/src/main/java/de/nrw/hbz/edm/model/OaiMetadata.java similarity index 57% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiMetadata.java rename to src/main/java/de/nrw/hbz/edm/model/OaiMetadata.java index 5e4a12d..dba9842 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiMetadata.java +++ b/src/main/java/de/nrw/hbz/edm/model/OaiMetadata.java @@ -1,13 +1,10 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiMetadata; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeOaiMetadata; +import de.nrw.hbz.edm.model.deserialize.DeserializeOaiMetadata; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiMethod.java b/src/main/java/de/nrw/hbz/edm/model/OaiMethod.java similarity index 72% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiMethod.java rename to src/main/java/de/nrw/hbz/edm/model/OaiMethod.java index 994917d..7b0354b 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiMethod.java +++ b/src/main/java/de/nrw/hbz/edm/model/OaiMethod.java @@ -1,15 +1,14 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import java.util.ArrayList; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiMethod; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeOaiMethod; +import de.nrw.hbz.edm.model.deserialize.DeserializeOaiMethod; /** * */ diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiPmh.java b/src/main/java/de/nrw/hbz/edm/model/OaiPmh.java similarity index 74% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiPmh.java rename to src/main/java/de/nrw/hbz/edm/model/OaiPmh.java index 019f1df..f5ffd26 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiPmh.java +++ b/src/main/java/de/nrw/hbz/edm/model/OaiPmh.java @@ -1,16 +1,13 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiPmh; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeOaiPmh; +import de.nrw.hbz.edm.model.deserialize.DeserializeOaiPmh; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiRecord.java b/src/main/java/de/nrw/hbz/edm/model/OaiRecord.java similarity index 60% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiRecord.java rename to src/main/java/de/nrw/hbz/edm/model/OaiRecord.java index bbd92b7..88b9e50 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/OaiRecord.java +++ b/src/main/java/de/nrw/hbz/edm/model/OaiRecord.java @@ -1,13 +1,11 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeOaiRecord; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeOaiRecord; +import de.nrw.hbz.edm.model.deserialize.DeserializeOaiRecord; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/ProvidedCHO.java b/src/main/java/de/nrw/hbz/edm/model/ProvidedCHO.java similarity index 87% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/ProvidedCHO.java rename to src/main/java/de/nrw/hbz/edm/model/ProvidedCHO.java index 618c6d1..67c7aa5 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/ProvidedCHO.java +++ b/src/main/java/de/nrw/hbz/edm/model/ProvidedCHO.java @@ -1,21 +1,13 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import java.util.ArrayList; -import java.util.List; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeResourceAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeRdf; +import de.nrw.hbz.edm.model.deserialize.DeserializeProvidedCHO; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Qdc.java b/src/main/java/de/nrw/hbz/edm/model/Qdc.java similarity index 97% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Qdc.java rename to src/main/java/de/nrw/hbz/edm/model/Qdc.java index 70cef57..9857fdb 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Qdc.java +++ b/src/main/java/de/nrw/hbz/edm/model/Qdc.java @@ -1,11 +1,11 @@ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import java.util.ArrayList; import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeQdc; +import de.nrw.hbz.edm.model.deserialize.DeserializeQdc; @JsonDeserialize(as = DeserializeQdc.class) // @JsonSerialize(as = SerializeRdf.class) diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Rdf.java b/src/main/java/de/nrw/hbz/edm/model/Rdf.java similarity index 76% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Rdf.java rename to src/main/java/de/nrw/hbz/edm/model/Rdf.java index 4f8e8f4..51e9bfc 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Rdf.java +++ b/src/main/java/de/nrw/hbz/edm/model/Rdf.java @@ -1,16 +1,11 @@ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import java.util.ArrayList; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeRdf; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeRdf; +import de.nrw.hbz.edm.model.deserialize.DeserializeRdf; @JsonDeserialize(as = DeserializeRdf.class) // @JsonSerialize(as = SerializeRdf.class) diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/ResourceAttribute.java b/src/main/java/de/nrw/hbz/edm/model/ResourceAttribute.java similarity index 66% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/ResourceAttribute.java rename to src/main/java/de/nrw/hbz/edm/model/ResourceAttribute.java index b406e49..5de45de 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/ResourceAttribute.java +++ b/src/main/java/de/nrw/hbz/edm/model/ResourceAttribute.java @@ -1,14 +1,12 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeResourceAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeResourceAttribute; +import de.nrw.hbz.edm.model.deserialize.DeserializeResourceAttribute; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/WebResource.java b/src/main/java/de/nrw/hbz/edm/model/WebResource.java similarity index 78% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/WebResource.java rename to src/main/java/de/nrw/hbz/edm/model/WebResource.java index 6721cb5..dc8a755 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/WebResource.java +++ b/src/main/java/de/nrw/hbz/edm/model/WebResource.java @@ -1,22 +1,13 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model; +package de.nrw.hbz.edm.model; import java.util.ArrayList; -import java.util.List; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeResourceAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeRdf; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeWebResource; +import de.nrw.hbz.edm.model.deserialize.DeserializeWebResource; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeAboutAttribute.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeAboutAttribute.java similarity index 85% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeAboutAttribute.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeAboutAttribute.java index 612074b..a89c48a 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeAboutAttribute.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeAboutAttribute.java @@ -1,11 +1,11 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.AboutAttribute; +import de.nrw.hbz.edm.model.AboutAttribute; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeAggregation.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeAggregation.java similarity index 95% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeAggregation.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeAggregation.java index 774c3a4..85727b2 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeAggregation.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeAggregation.java @@ -1,15 +1,15 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import java.util.UUID; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.Aggregation; -import de.nrw.hbz.genericSipLoader.edm.model.ResourceAttribute; +import de.nrw.hbz.edm.model.Aggregation; +import de.nrw.hbz.edm.model.ResourceAttribute; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiMetadata.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiMetadata.java similarity index 77% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiMetadata.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiMetadata.java index 3ec56b4..822560e 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiMetadata.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiMetadata.java @@ -1,13 +1,13 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.OaiMetadata; -import de.nrw.hbz.genericSipLoader.edm.model.Rdf; +import de.nrw.hbz.edm.model.OaiMetadata; +import de.nrw.hbz.edm.model.Rdf; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiMethod.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiMethod.java similarity index 87% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiMethod.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiMethod.java index 6acfd0e..ca91f58 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiMethod.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiMethod.java @@ -1,17 +1,16 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import java.util.ArrayList; -import java.util.Iterator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.OaiMethod; -import de.nrw.hbz.genericSipLoader.edm.model.OaiRecord; +import de.nrw.hbz.edm.model.OaiMethod; +import de.nrw.hbz.edm.model.OaiRecord; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiPmh.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiPmh.java similarity index 92% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiPmh.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiPmh.java index a20cfba..c70fc15 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiPmh.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiPmh.java @@ -1,14 +1,14 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import de.nrw.hbz.genericSipLoader.edm.model.OaiPmh; -import de.nrw.hbz.genericSipLoader.edm.model.OaiMethod; +import de.nrw.hbz.edm.model.OaiPmh; +import de.nrw.hbz.edm.model.OaiMethod; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiRecord.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiRecord.java similarity index 74% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiRecord.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiRecord.java index 3e3caef..2fc0138 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeOaiRecord.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeOaiRecord.java @@ -1,13 +1,13 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.OaiHeader; -import de.nrw.hbz.genericSipLoader.edm.model.OaiRecord; -import de.nrw.hbz.genericSipLoader.edm.model.OaiMetadata; +import de.nrw.hbz.edm.model.OaiHeader; +import de.nrw.hbz.edm.model.OaiRecord; +import de.nrw.hbz.edm.model.OaiMetadata; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeProvidedCHO.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeProvidedCHO.java similarity index 97% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeProvidedCHO.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeProvidedCHO.java index f935e62..3b22cb2 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeProvidedCHO.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeProvidedCHO.java @@ -1,18 +1,17 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import java.util.ArrayList; -import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.ProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.ResourceAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.AboutAttribute; +import de.nrw.hbz.edm.model.ProvidedCHO; +import de.nrw.hbz.edm.model.ResourceAttribute; +import de.nrw.hbz.edm.model.AboutAttribute; diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeQdc.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeQdc.java similarity index 97% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeQdc.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeQdc.java index 4651cb7..0541082 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeQdc.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeQdc.java @@ -1,4 +1,4 @@ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import java.util.ArrayList; import java.util.List; @@ -8,9 +8,9 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import de.nrw.hbz.genericSipLoader.edm.model.Qdc; -import de.nrw.hbz.genericSipLoader.edm.model.ResourceAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeResourceAttribute; +import de.nrw.hbz.edm.model.Qdc; +import de.nrw.hbz.edm.model.ResourceAttribute; +import de.nrw.hbz.edm.model.deserialize.DeserializeResourceAttribute; @JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName="rdf:RDF") diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeRdf.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeRdf.java similarity index 92% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeRdf.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeRdf.java index fa9280d..724abe0 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeRdf.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeRdf.java @@ -1,4 +1,4 @@ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import java.util.ArrayList; @@ -7,11 +7,11 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import de.nrw.hbz.genericSipLoader.edm.model.serialize.SerializeWebResource; -import de.nrw.hbz.genericSipLoader.edm.model.Aggregation; -import de.nrw.hbz.genericSipLoader.edm.model.ProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.Rdf; -import de.nrw.hbz.genericSipLoader.edm.model.WebResource; +import de.nrw.hbz.edm.model.serialize.SerializeWebResource; +import de.nrw.hbz.edm.model.Aggregation; +import de.nrw.hbz.edm.model.ProvidedCHO; +import de.nrw.hbz.edm.model.Rdf; +import de.nrw.hbz.edm.model.WebResource; @JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName="rdf:RDF") diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeResourceAttribute.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeResourceAttribute.java similarity index 86% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeResourceAttribute.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeResourceAttribute.java index ee4af9d..96388f4 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeResourceAttribute.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeResourceAttribute.java @@ -1,11 +1,11 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.ResourceAttribute; +import de.nrw.hbz.edm.model.ResourceAttribute; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeWebResource.java b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeWebResource.java similarity index 97% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeWebResource.java rename to src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeWebResource.java index 1d96fc4..5cc2d4f 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/deserialize/DeserializeWebResource.java +++ b/src/main/java/de/nrw/hbz/edm/model/deserialize/DeserializeWebResource.java @@ -1,7 +1,7 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.deserialize; +package de.nrw.hbz.edm.model.deserialize; import java.util.ArrayList; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.ResourceAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.WebResource; +import de.nrw.hbz.edm.model.ResourceAttribute; +import de.nrw.hbz.edm.model.WebResource; diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeAboutAttribute.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeAboutAttribute.java similarity index 85% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeAboutAttribute.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeAboutAttribute.java index 2fc11d9..3e66ea0 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeAboutAttribute.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeAboutAttribute.java @@ -1,11 +1,11 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.AboutAttribute; +import de.nrw.hbz.edm.model.AboutAttribute; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeAggregation.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeAggregation.java similarity index 95% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeAggregation.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeAggregation.java index dd04a77..a749080 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeAggregation.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeAggregation.java @@ -1,15 +1,15 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import java.util.UUID; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.Aggregation; -import de.nrw.hbz.genericSipLoader.edm.model.ResourceAttribute; +import de.nrw.hbz.edm.model.Aggregation; +import de.nrw.hbz.edm.model.ResourceAttribute; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiMetadata.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiMetadata.java similarity index 78% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiMetadata.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiMetadata.java index b90406c..32f33cb 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiMetadata.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiMetadata.java @@ -1,13 +1,13 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.OaiMetadata; -import de.nrw.hbz.genericSipLoader.edm.model.Rdf; +import de.nrw.hbz.edm.model.OaiMetadata; +import de.nrw.hbz.edm.model.Rdf; diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiMethod.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiMethod.java similarity index 86% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiMethod.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiMethod.java index 6435b68..49119a1 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiMethod.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiMethod.java @@ -1,15 +1,15 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import java.util.ArrayList; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.OaiMethod; -import de.nrw.hbz.genericSipLoader.edm.model.OaiRecord; +import de.nrw.hbz.edm.model.OaiMethod; +import de.nrw.hbz.edm.model.OaiRecord; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiPmh.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiPmh.java similarity index 89% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiPmh.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiPmh.java index 1a06b10..43ec989 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiPmh.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiPmh.java @@ -1,14 +1,14 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import de.nrw.hbz.genericSipLoader.edm.model.OaiPmh; -import de.nrw.hbz.genericSipLoader.edm.model.OaiMethod; +import de.nrw.hbz.edm.model.OaiPmh; +import de.nrw.hbz.edm.model.OaiMethod; /** * @@ -48,7 +48,7 @@ public String getXsiXmlns() { */ @Override @JacksonXmlProperty(localName="ListRecords") - public de.nrw.hbz.genericSipLoader.edm.model.OaiMethod getOaiMethod() { + public OaiMethod getOaiMethod() { return oaiMethod; } diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiRecord.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiRecord.java similarity index 74% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiRecord.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiRecord.java index f9ff6e7..4d74797 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeOaiRecord.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeOaiRecord.java @@ -1,13 +1,13 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.OaiHeader; -import de.nrw.hbz.genericSipLoader.edm.model.OaiRecord; -import de.nrw.hbz.genericSipLoader.edm.model.OaiMetadata; +import de.nrw.hbz.edm.model.OaiHeader; +import de.nrw.hbz.edm.model.OaiRecord; +import de.nrw.hbz.edm.model.OaiMetadata; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeProvidedCHO.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeProvidedCHO.java similarity index 97% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeProvidedCHO.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeProvidedCHO.java index d98e711..a41002a 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeProvidedCHO.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeProvidedCHO.java @@ -1,7 +1,7 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import java.util.ArrayList; import java.util.List; @@ -11,10 +11,10 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.ProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.ResourceAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.deserialize.DeserializeAboutAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.AboutAttribute; +import de.nrw.hbz.edm.model.ProvidedCHO; +import de.nrw.hbz.edm.model.ResourceAttribute; +import de.nrw.hbz.edm.model.deserialize.DeserializeAboutAttribute; +import de.nrw.hbz.edm.model.AboutAttribute; /** diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeQdc.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeQdc.java similarity index 98% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeQdc.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeQdc.java index 14fcee6..0e77169 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeQdc.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeQdc.java @@ -1,4 +1,4 @@ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import java.util.ArrayList; import java.util.List; @@ -8,8 +8,8 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import de.nrw.hbz.genericSipLoader.edm.model.Qdc; -import de.nrw.hbz.genericSipLoader.edm.model.ResourceAttribute; +import de.nrw.hbz.edm.model.Qdc; +import de.nrw.hbz.edm.model.ResourceAttribute; @JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "oai_dc:dc") diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeRdf.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeRdf.java similarity index 93% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeRdf.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeRdf.java index 78b24da..dfda6c7 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeRdf.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeRdf.java @@ -1,4 +1,4 @@ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import java.util.ArrayList; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import de.nrw.hbz.genericSipLoader.edm.model.Aggregation; -import de.nrw.hbz.genericSipLoader.edm.model.ProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.Rdf; -import de.nrw.hbz.genericSipLoader.edm.model.WebResource; +import de.nrw.hbz.edm.model.Aggregation; +import de.nrw.hbz.edm.model.ProvidedCHO; +import de.nrw.hbz.edm.model.Rdf; +import de.nrw.hbz.edm.model.WebResource; @JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "rdf:RDF") diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeResourceAttribute.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeResourceAttribute.java similarity index 86% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeResourceAttribute.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeResourceAttribute.java index 16e29ad..2d7464e 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeResourceAttribute.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeResourceAttribute.java @@ -1,11 +1,11 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.ResourceAttribute; +import de.nrw.hbz.edm.model.ResourceAttribute; /** * diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeWebResource.java b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeWebResource.java similarity index 97% rename from src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeWebResource.java rename to src/main/java/de/nrw/hbz/edm/model/serialize/SerializeWebResource.java index 0d416fe..1d20099 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/serialize/SerializeWebResource.java +++ b/src/main/java/de/nrw/hbz/edm/model/serialize/SerializeWebResource.java @@ -1,7 +1,7 @@ /** * */ -package de.nrw.hbz.genericSipLoader.edm.model.serialize; +package de.nrw.hbz.edm.model.serialize; import java.util.ArrayList; @@ -9,8 +9,8 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import de.nrw.hbz.genericSipLoader.edm.model.ResourceAttribute; -import de.nrw.hbz.genericSipLoader.edm.model.WebResource; +import de.nrw.hbz.edm.model.ResourceAttribute; +import de.nrw.hbz.edm.model.WebResource; diff --git a/src/main/java/de/nrw/hbz/edm/util/TimeStampProvider.java b/src/main/java/de/nrw/hbz/edm/util/TimeStampProvider.java new file mode 100644 index 0000000..40087e7 --- /dev/null +++ b/src/main/java/de/nrw/hbz/edm/util/TimeStampProvider.java @@ -0,0 +1,41 @@ +package de.nrw.hbz.edm.util; + +import java.text.SimpleDateFormat; +import java.util.Calendar; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + + +/** + * Class TimeStampProvider + * + *

Title: Time Stamp for directories or Files

+ *

Description: Class returns the actual time stamp which can be used for + * creation of unique directory and file names

+ * + * @author aquast, email + * creation date: 29.07.2013 + * + */ +public class TimeStampProvider { + + // Initiate Logger for TimeStampProvider + final static Logger logger = LogManager.getLogger(TimeStampProvider.class); + + /** + *

Title:

+ *

Description: simple Method that returns a time stamp used to + * create unique identifiers

+ * + * @return + */ + public static String getTimeStamp(){ + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd' 'kk:mm:ss' 'z"); + Calendar cal = Calendar.getInstance(); + // logger.debug(dateFormat.format(cal.getTime())); + return dateFormat.format(cal.getTime()); + } + + +} diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Model.java b/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Model.java deleted file mode 100644 index f3f800f..0000000 --- a/src/main/java/de/nrw/hbz/genericSipLoader/edm/model/Model.java +++ /dev/null @@ -1,5 +0,0 @@ -package de.nrw.hbz.genericSipLoader.edm.model; - -public abstract class Model { - -} diff --git a/src/main/java/de/nrw/hbz/genericSipLoader/impl/DipsLoaderImpl.java b/src/main/java/de/nrw/hbz/genericSipLoader/impl/DipsLoaderImpl.java index 081897a..b94af8a 100644 --- a/src/main/java/de/nrw/hbz/genericSipLoader/impl/DipsLoaderImpl.java +++ b/src/main/java/de/nrw/hbz/genericSipLoader/impl/DipsLoaderImpl.java @@ -19,11 +19,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import de.nrw.hbz.genericSipLoader.edm.impl.AggregationElementOperator; -import de.nrw.hbz.genericSipLoader.edm.impl.EdmImpl; -import de.nrw.hbz.genericSipLoader.edm.impl.QdcProvider; -import de.nrw.hbz.genericSipLoader.edm.model.ProvidedCHO; -import de.nrw.hbz.genericSipLoader.edm.model.Rdf; +import de.nrw.hbz.edm.impl.AggregationElementOperator; +import de.nrw.hbz.edm.impl.EdmImpl; +import de.nrw.hbz.edm.impl.QdcProvider; +import de.nrw.hbz.edm.model.ProvidedCHO; +import de.nrw.hbz.edm.model.Rdf; import de.nrw.hbz.genericSipLoader.restClient.Fedora38Client; import de.nrw.hbz.genericSipLoader.util.FileScanner; import de.nrw.hbz.genericSipLoader.util.ZipExtractor;