From f8dd7c0a3509955bb3583dd473741e7fbde7b1fd Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 22:44:16 +0200 Subject: [PATCH 01/11] [maven-release-plugin] prepare release de4a-commons-parent-pom-0.2.3 --- de4a-canonical-evidences/pom.xml | 2 +- de4a-core-schemas/pom.xml | 2 +- de4a-kafka-client/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/de4a-canonical-evidences/pom.xml b/de4a-canonical-evidences/pom.xml index 9507be1..14273c1 100644 --- a/de4a-canonical-evidences/pom.xml +++ b/de4a-canonical-evidences/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.3-SNAPSHOT + 0.2.3 de4a-canonical-evidences bundle diff --git a/de4a-core-schemas/pom.xml b/de4a-core-schemas/pom.xml index 3a11015..6002829 100644 --- a/de4a-core-schemas/pom.xml +++ b/de4a-core-schemas/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.3-SNAPSHOT + 0.2.3 de4a-core-schemas bundle diff --git a/de4a-kafka-client/pom.xml b/de4a-kafka-client/pom.xml index 7ed9ce8..36ca134 100644 --- a/de4a-kafka-client/pom.xml +++ b/de4a-kafka-client/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.3-SNAPSHOT + 0.2.3 de4a-kafka-client bundle diff --git a/pom.xml b/pom.xml index 60ca1b5..b5c5476 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.3-SNAPSHOT + 0.2.3 pom de4a-commons-parent-pom Base POM to build the DE4A Commons projects @@ -42,7 +42,7 @@ scm:git:git@github.com:de4a-wp5/de4a-commons.git scm:git:git@github.com:de4a-wp5/de4a-commons.git http://github.com/de4a-wp5/de4a-commons - HEAD + de4a-commons-parent-pom-0.2.3 From 203586ffed0115751c8eb65c8f5787a8ee3ee2bb Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 22:44:21 +0200 Subject: [PATCH 02/11] [maven-release-plugin] prepare for next development iteration --- de4a-canonical-evidences/pom.xml | 2 +- de4a-core-schemas/pom.xml | 2 +- de4a-kafka-client/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/de4a-canonical-evidences/pom.xml b/de4a-canonical-evidences/pom.xml index 14273c1..39fc553 100644 --- a/de4a-canonical-evidences/pom.xml +++ b/de4a-canonical-evidences/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.3 + 0.2.4-SNAPSHOT de4a-canonical-evidences bundle diff --git a/de4a-core-schemas/pom.xml b/de4a-core-schemas/pom.xml index 6002829..d6ddb0a 100644 --- a/de4a-core-schemas/pom.xml +++ b/de4a-core-schemas/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.3 + 0.2.4-SNAPSHOT de4a-core-schemas bundle diff --git a/de4a-kafka-client/pom.xml b/de4a-kafka-client/pom.xml index 36ca134..35e3bbd 100644 --- a/de4a-kafka-client/pom.xml +++ b/de4a-kafka-client/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.3 + 0.2.4-SNAPSHOT de4a-kafka-client bundle diff --git a/pom.xml b/pom.xml index b5c5476..da38cdd 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.3 + 0.2.4-SNAPSHOT pom de4a-commons-parent-pom Base POM to build the DE4A Commons projects @@ -42,7 +42,7 @@ scm:git:git@github.com:de4a-wp5/de4a-commons.git scm:git:git@github.com:de4a-wp5/de4a-commons.git http://github.com/de4a-wp5/de4a-commons - de4a-commons-parent-pom-0.2.3 + HEAD From a29ec0e79a85d83ad811cd4885908b73a03d0f1d Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 22:58:00 +0200 Subject: [PATCH 03/11] Moved an include file --- .../src/main/java/eu/de4a/iem/core/CDE4ACoreJAXB.java | 5 +++-- .../src/main/resources/schemas/core/de4a/common-types.xsd | 2 +- .../schemas/core/{provided => external}/CV-DataTypes.xsd | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename de4a-core-schemas/src/main/resources/schemas/core/{provided => external}/CV-DataTypes.xsd (100%) diff --git a/de4a-core-schemas/src/main/java/eu/de4a/iem/core/CDE4ACoreJAXB.java b/de4a-core-schemas/src/main/java/eu/de4a/iem/core/CDE4ACoreJAXB.java index 1e0f2a7..0858488 100644 --- a/de4a-core-schemas/src/main/java/eu/de4a/iem/core/CDE4ACoreJAXB.java +++ b/de4a-core-schemas/src/main/java/eu/de4a/iem/core/CDE4ACoreJAXB.java @@ -42,7 +42,7 @@ private static ClassLoader _getCL () final ICommonsList a = new CommonsArrayList <> (); a.add (CXML_XSD.getXSDResource ()); a.add (CCCTS.getXSDResource ()); - a.add (new ClassPathResource ("schemas/core/provided/CV-DataTypes.xsd", _getCL ())); + a.add (new ClassPathResource ("schemas/core/external/CV-DataTypes.xsd", _getCL ())); a.add (new ClassPathResource ("schemas/core/external/eidas-LP.xsd", _getCL ())); a.add (new ClassPathResource ("schemas/core/external/eidas-NP.xsd", _getCL ())); a.add (new ClassPathResource ("schemas/core/de4a/common-types.xsd", _getCL ())); @@ -54,7 +54,8 @@ private static ClassLoader _getCL () public static final ClassPathResource XSD_DT = new ClassPathResource ("schemas/core/DT.xsd", _getCL ()); public static final ClassPathResource XSD_DO = new ClassPathResource ("schemas/core/DO.xsd", _getCL ()); - public static final ClassPathResource XSD_DEFAULT_RESPONSE = new ClassPathResource ("schemas/core/def-response.xsd", _getCL ()); + public static final ClassPathResource XSD_DEFAULT_RESPONSE = new ClassPathResource ("schemas/core/def-response.xsd", + _getCL ()); private CDE4ACoreJAXB () {} diff --git a/de4a-core-schemas/src/main/resources/schemas/core/de4a/common-types.xsd b/de4a-core-schemas/src/main/resources/schemas/core/de4a/common-types.xsd index 15ad53d..253342c 100644 --- a/de4a-core-schemas/src/main/resources/schemas/core/de4a/common-types.xsd +++ b/de4a-core-schemas/src/main/resources/schemas/core/de4a/common-types.xsd @@ -5,7 +5,7 @@ targetNamespace="http://www.de4a.eu/2020/commons/type/v2" elementFormDefault="qualified" attributeFormDefault="unqualified"> - + diff --git a/de4a-core-schemas/src/main/resources/schemas/core/provided/CV-DataTypes.xsd b/de4a-core-schemas/src/main/resources/schemas/core/external/CV-DataTypes.xsd similarity index 100% rename from de4a-core-schemas/src/main/resources/schemas/core/provided/CV-DataTypes.xsd rename to de4a-core-schemas/src/main/resources/schemas/core/external/CV-DataTypes.xsd From 3659ed7496bd59cca1cb7c66bc65667723fff9ac Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 23:00:45 +0200 Subject: [PATCH 04/11] Fixed path --- de4a-core-schemas/src/main/jaxb/bindings-core.xjb | 2 +- .../src/main/resources/schemas/core/de4a/common-types.xsd | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/de4a-core-schemas/src/main/jaxb/bindings-core.xjb b/de4a-core-schemas/src/main/jaxb/bindings-core.xjb index 4b1edc4..ac5b980 100644 --- a/de4a-core-schemas/src/main/jaxb/bindings-core.xjb +++ b/de4a-core-schemas/src/main/jaxb/bindings-core.xjb @@ -26,7 +26,7 @@ - + diff --git a/de4a-core-schemas/src/main/resources/schemas/core/de4a/common-types.xsd b/de4a-core-schemas/src/main/resources/schemas/core/de4a/common-types.xsd index 253342c..6f820f8 100644 --- a/de4a-core-schemas/src/main/resources/schemas/core/de4a/common-types.xsd +++ b/de4a-core-schemas/src/main/resources/schemas/core/de4a/common-types.xsd @@ -269,7 +269,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -407,8 +407,8 @@ - - + + From a355003f9f1e6390d674fea7b60ff4a4de49f1e8 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 23:02:50 +0200 Subject: [PATCH 05/11] Fixed the date time binding --- .../src/main/jaxb/bindings-pilot-shared.xjb | 9 +++++++++ .../src/main/jaxb/bindings-core.xjb | 16 +++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/de4a-canonical-evidences/src/main/jaxb/bindings-pilot-shared.xjb b/de4a-canonical-evidences/src/main/jaxb/bindings-pilot-shared.xjb index 2f22132..67bf528 100644 --- a/de4a-canonical-evidences/src/main/jaxb/bindings-pilot-shared.xjb +++ b/de4a-canonical-evidences/src/main/jaxb/bindings-pilot-shared.xjb @@ -18,6 +18,15 @@ xmlns="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + + + + + + diff --git a/de4a-core-schemas/src/main/jaxb/bindings-core.xjb b/de4a-core-schemas/src/main/jaxb/bindings-core.xjb index ac5b980..0c95918 100644 --- a/de4a-core-schemas/src/main/jaxb/bindings-core.xjb +++ b/de4a-core-schemas/src/main/jaxb/bindings-core.xjb @@ -26,18 +26,13 @@ + + - - - - - - - @@ -48,6 +43,13 @@ + + + + + + + From 5ee666cdfe0c82f46f318833915db99d48c20604 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 23:13:20 +0200 Subject: [PATCH 06/11] Beautified --- .../eu/de4a/kafkaclient/DE4AKafkaClient.java | 13 +++-- .../eu/de4a/kafkaclient/DE4AKafkaManager.java | 56 ++++++++++++------- .../de4a/kafkaclient/DE4AKafkaSettings.java | 28 ++++++++++ .../de4a/kafkaclient/DE4AKafkaClientTest.java | 2 +- 4 files changed, 71 insertions(+), 28 deletions(-) diff --git a/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaClient.java b/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaClient.java index c547ea9..4cb0132 100644 --- a/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaClient.java +++ b/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaClient.java @@ -48,11 +48,10 @@ private static void _sendIfKafkaEnabled (@Nullable final IErrorLevel aErrorLevel LOGGER.debug ("Sending to Kafka: '" + sLogText + "'"); // Send but don't wait for the commit! - if(DE4AKafkaSettings.isHttpEnabled()){ - DE4AKafkaManager.sendHTTP((String) null, sLogText); - } else { - DE4AKafkaManager.sendTCP((String) null, sLogText, null); - } + if (DE4AKafkaSettings.isKafkaHttpEnabled ()) + DE4AKafkaManager.sendHTTP ((String) null, sLogText); + else + DE4AKafkaManager.sendTCP ((String) null, sLogText, null); } /** @@ -102,7 +101,9 @@ public static void send (@Nullable final IErrorLevel aErrorLevel, @Nonnull final * Exception to be logged. May be null. * @see DE4AKafkaSettings#isKafkaEnabled() */ - public static void send (@Nullable final IErrorLevel aErrorLevel, @Nonnull final Supplier aValue, @Nullable final Throwable t) + public static void send (@Nullable final IErrorLevel aErrorLevel, + @Nonnull final Supplier aValue, + @Nullable final Throwable t) { String sValue = null; if (aErrorLevel != null && DE4AKafkaSettings.isLoggingEnabled ()) diff --git a/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaManager.java b/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaManager.java index 5cd6dbf..7d1893f 100644 --- a/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaManager.java +++ b/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaManager.java @@ -28,6 +28,7 @@ import org.apache.http.entity.ByteArrayEntity; import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.clients.producer.ProducerRecord; import org.apache.kafka.clients.producer.RecordMetadata; @@ -57,7 +58,7 @@ final class DE4AKafkaManager private static final Logger LOGGER = LoggerFactory.getLogger (DE4AKafkaManager.class); private static final SimpleReadWriteLock RW_LOCK = new SimpleReadWriteLock (); @GuardedBy ("RW_LOCK") - private static KafkaProducer s_aProducer; + private static Producer s_aProducer; private static final ICommonsMap DEFAULT_PROPS = new CommonsHashMap <> (); @@ -65,8 +66,10 @@ final class DE4AKafkaManager { // Instead of 16K // s_aProps.put ("batch.size", "1"); + // Server URL - MUST be configured // s_aProps.put ("bootstrap.servers", "193.10.8.211:7073"); + // Default: 5secs DEFAULT_PROPS.put (ProducerConfig.MAX_BLOCK_MS_CONFIG, "5000"); } @@ -104,10 +107,10 @@ private static ICommonsMap _getCreationProperties () * in case of invalid properties (like non-existing server domain) */ @Nonnull - public static KafkaProducer getOrCreateProducer () + public static Producer getOrCreateProducer () { // Read-lock first - KafkaProducer ret = RW_LOCK.readLockedGet ( () -> s_aProducer); + Producer ret = RW_LOCK.readLockedGet ( () -> s_aProducer); if (ret == null) { RW_LOCK.writeLock ().lock (); @@ -118,7 +121,9 @@ public static KafkaProducer getOrCreateProducer () if (ret == null) { // Create new one - s_aProducer = ret = new KafkaProducer <> (_getCreationProperties (), new StringSerializer (), new StringSerializer ()); + s_aProducer = ret = new KafkaProducer <> (_getCreationProperties (), + new StringSerializer (), + new StringSerializer ()); if (LOGGER.isDebugEnabled ()) LOGGER.debug ("Successfully created new KafkaProducer"); } @@ -140,6 +145,8 @@ public static void shutdown () RW_LOCK.writeLocked ( () -> { if (s_aProducer != null) { + if (LOGGER.isDebugEnabled ()) + LOGGER.debug ("Trying to close KafkaProducer"); s_aProducer.close (); s_aProducer = null; if (LOGGER.isDebugEnabled ()) @@ -170,33 +177,49 @@ public static Future sendTCP (@Nullable final String sKey, { ValueEnforcer.notNull (sValue, "Value"); - final ProducerRecord aMessage = new ProducerRecord <> (DE4AKafkaSettings.getKafkaTopic (), sKey, sValue); + final ProducerRecord aMessage = new ProducerRecord <> (DE4AKafkaSettings.getKafkaTopic (), + sKey, + sValue); return getOrCreateProducer ().send (aMessage, aKafkaCallback); } + @Nonnull + private static byte [] _getJsonAsBytes (@Nullable final String key, @Nonnull final String value) + { + return new JsonWriter ().writeAsByteArray (new JsonObject ().add ("records", + new JsonArray ().add (new JsonObject ().add ("key", + key) + .add ("value", + value))), + StandardCharsets.UTF_8); + } + @Nonnull public static void sendHTTP (@Nullable final String sKey, @Nonnull final String sValue) { ValueEnforcer.notNull (sValue, "Value"); - final HttpClientSettings settings = DE4AKafkaSettings.getHttpClientSettings (); + final HttpClientSettings aHttpClientSettings = DE4AKafkaSettings.getHttpClientSettings (); - try (final HttpClientManager mgr = HttpClientManager.create (settings)) + try (final HttpClientManager aHCMgr = HttpClientManager.create (aHttpClientSettings)) { - final ByteArrayEntity entity = new ByteArrayEntity (getJsonAsBytes (sKey, sValue)); - entity.setContentEncoding ("utf-8"); + final ByteArrayEntity entity = new ByteArrayEntity (_getJsonAsBytes (sKey, sValue)); + entity.setContentEncoding (StandardCharsets.UTF_8.name ()); - final String sURI = (String) _getCreationProperties ().get ("bootstrap.servers") + "/topics/" + DE4AKafkaSettings.getKafkaTopic (); + final String sURI = (String) _getCreationProperties ().get ("bootstrap.servers") + + "/topics/" + + DE4AKafkaSettings.getKafkaTopic (); if (LOGGER.isDebugEnabled ()) LOGGER.debug ("Posting to Kafka server " + sURI); final HttpUriRequest req = RequestBuilder.post () .setUri (sURI) - .setHeader (HttpHeaders.CONTENT_TYPE, "application/vnd.kafka.json.v2+json; charset=utf-8") + .setHeader (HttpHeaders.CONTENT_TYPE, + "application/vnd.kafka.json.v2+json; charset=utf-8") .setEntity (entity) .build (); - try (final CloseableHttpResponse res = mgr.execute (req)) + try (final CloseableHttpResponse res = aHCMgr.execute (req)) { if (LOGGER.isInfoEnabled ()) LOGGER.info ("Kafka REST responsecode: " + res.getStatusLine ().getStatusCode ()); @@ -207,13 +230,4 @@ public static void sendHTTP (@Nullable final String sKey, @Nonnull final String LOGGER.debug ("IOException: " + ex.getMessage ()); } } - - private static byte [] getJsonAsBytes (final String key, final String value) - { - return new JsonWriter ().writeAsByteArray (new JsonObject ().add ("records", - new JsonArray ().add (new JsonObject ().add ("key", key) - .add ("value", value))), - StandardCharsets.UTF_8); - } - } diff --git a/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaSettings.java b/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaSettings.java index 4e6a6c8..653e10a 100644 --- a/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaSettings.java +++ b/de4a-kafka-client/src/main/java/eu/de4a/kafkaclient/DE4AKafkaSettings.java @@ -118,8 +118,19 @@ public static void setKafkaTopic (@Nonnull final String sTopic) /** * @return true if HTTP mode is enable, false if * not. Disabled by default. + * @deprecated Use {@link #isKafkaHttpEnabled()} instead */ + @Deprecated public static boolean isHttpEnabled () + { + return isKafkaHttpEnabled (); + } + + /** + * @return true if HTTP mode is enable, false if + * not. Disabled by default. + */ + public static boolean isKafkaHttpEnabled () { return USE_HTTP.get (); } @@ -137,7 +148,24 @@ public static HttpClientSettings getHttpClientSettings () return HTTP_CLIENT_SETTINGS.get (); } + /** + * @param settings + * The new HTTP client settings to be used. May not be + * null. + * @deprecated Use {@link #setHttpClientSettings(HttpClientSettings)} instead + */ + @Deprecated public static void setHttpClientSetting (@Nonnull final HttpClientSettings settings) + { + setHttpClientSettings (settings); + } + + /** + * @param settings + * The new HTTP client settings to be used. May not be + * null. + */ + public static void setHttpClientSettings (@Nonnull final HttpClientSettings settings) { ValueEnforcer.notNull (settings, "HttpClientSettings"); HTTP_CLIENT_SETTINGS.set (settings); diff --git a/de4a-kafka-client/src/test/java/eu/de4a/kafkaclient/DE4AKafkaClientTest.java b/de4a-kafka-client/src/test/java/eu/de4a/kafkaclient/DE4AKafkaClientTest.java index 34336d8..1139657 100644 --- a/de4a-kafka-client/src/test/java/eu/de4a/kafkaclient/DE4AKafkaClientTest.java +++ b/de4a-kafka-client/src/test/java/eu/de4a/kafkaclient/DE4AKafkaClientTest.java @@ -91,7 +91,7 @@ public void testHttpMode () { DE4AKafkaSettings.setKafkaHttp (true); DE4AKafkaSettings.defaultProperties ().put ("bootstrap.servers", "https://de4a-dev-kafka.egovlab.eu"); - DE4AKafkaSettings.setHttpClientSetting (new HttpClientSettings ()); + DE4AKafkaSettings.setHttpClientSettings (new HttpClientSettings ()); try { From edb32de67149b888f880fc4c4dd80118b3ee6b9f Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 23:17:44 +0200 Subject: [PATCH 07/11] Renamed packages --- de4a-canonical-evidences/pom.xml | 5 +++-- .../CIEM.java => cev/CCanonicalEvidences.java} | 6 +++--- .../de4a => cev}/EDE4ACanonicalEvidenceType.java | 14 +++++++------- .../{xml => cev}/de4a/t41/v2021_02_11/CT41.java | 2 +- .../de4a/t41/v2021_02_11/DE4AT41Marshaller.java | 2 +- .../t41/v2021_02_11/DE4AT41NamespaceContext.java | 2 +- .../{xml => cev}/de4a/t41/v2021_04_13/CT41.java | 2 +- .../de4a/t41/v2021_04_13/DE4AT41Marshaller.java | 2 +- .../t41/v2021_04_13/DE4AT41NamespaceContext.java | 2 +- .../de4a/iem/{xml => cev}/de4a/t42/v0_6/CT42.java | 2 +- .../de4a/t42/v0_6/DE4AT42Marshaller.java | 2 +- .../de4a/t42/v0_6/DE4AT42NamespaceContext.java | 2 +- .../de4a/iem/{xml => cev}/de4a/t43/v1_6b/CT43.java | 2 +- .../de4a/t43/v1_6b/DE4AT43Marshaller.java | 2 +- .../de4a/t43/v1_6b/DE4AT43NamespaceContext.java | 2 +- .../DE4ACoreMarshallerTest.java} | 6 +++--- .../test/java/eu/de4a/iem/{ => cev}/SPITest.java | 2 +- .../de4a/t41/v2021_02_11}/CT41Test.java | 2 +- .../t41/v2021_02_11/DE4AT41MarshallerTest.java | 2 +- .../de4a/t41/v2021_04_13}/CT41Test.java | 2 +- .../t41/v2021_04_13/DE4AT41MarshallerTest.java | 2 +- .../iem/{xml => cev}/de4a/t42/v0_6/CT42Test.java | 2 +- .../de4a/t42/v0_6/DE4AT42MarshallerTest.java | 2 +- .../iem/{xml => cev}/de4a/t43/v1_6b/CT43Test.java | 2 +- .../de4a/t43/v1_6b/DE4AT43MarshallerTest.java | 2 +- 25 files changed, 37 insertions(+), 36 deletions(-) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml/CIEM.java => cev/CCanonicalEvidences.java} (73%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml/de4a => cev}/EDE4ACanonicalEvidenceType.java (85%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t41/v2021_02_11/CT41.java (98%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t41/v2021_02_11/DE4AT41Marshaller.java (97%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t41/v2021_02_11/DE4AT41NamespaceContext.java (96%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t41/v2021_04_13/CT41.java (98%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t41/v2021_04_13/DE4AT41Marshaller.java (97%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t41/v2021_04_13/DE4AT41NamespaceContext.java (96%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t42/v0_6/CT42.java (97%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t42/v0_6/DE4AT42Marshaller.java (97%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t42/v0_6/DE4AT42NamespaceContext.java (97%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t43/v1_6b/CT43.java (98%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t43/v1_6b/DE4AT43Marshaller.java (98%) rename de4a-canonical-evidences/src/main/java/eu/de4a/iem/{xml => cev}/de4a/t43/v1_6b/DE4AT43NamespaceContext.java (98%) rename de4a-canonical-evidences/src/test/java/eu/de4a/iem/{xml/de4a/DE4AMarshallerTest.java => cev/DE4ACoreMarshallerTest.java} (97%) rename de4a-canonical-evidences/src/test/java/eu/de4a/iem/{ => cev}/SPITest.java (97%) rename de4a-canonical-evidences/src/test/java/eu/de4a/iem/{xml/de4a/t41/v2021_04_13 => cev/de4a/t41/v2021_02_11}/CT41Test.java (95%) rename de4a-canonical-evidences/src/test/java/eu/de4a/iem/{xml => cev}/de4a/t41/v2021_02_11/DE4AT41MarshallerTest.java (98%) rename de4a-canonical-evidences/src/test/java/eu/de4a/iem/{xml/de4a/t41/v2021_02_11 => cev/de4a/t41/v2021_04_13}/CT41Test.java (95%) rename de4a-canonical-evidences/src/test/java/eu/de4a/iem/{xml => cev}/de4a/t41/v2021_04_13/DE4AT41MarshallerTest.java (98%) rename de4a-canonical-evidences/src/test/java/eu/de4a/iem/{xml => cev}/de4a/t42/v0_6/CT42Test.java (96%) rename de4a-canonical-evidences/src/test/java/eu/de4a/iem/{xml => cev}/de4a/t42/v0_6/DE4AT42MarshallerTest.java (98%) rename de4a-canonical-evidences/src/test/java/eu/de4a/iem/{xml => cev}/de4a/t43/v1_6b/CT43Test.java (96%) rename de4a-canonical-evidences/src/test/java/eu/de4a/iem/{xml => cev}/de4a/t43/v1_6b/DE4AT43MarshallerTest.java (99%) diff --git a/de4a-canonical-evidences/pom.xml b/de4a-canonical-evidences/pom.xml index 39fc553..f836842 100644 --- a/de4a-canonical-evidences/pom.xml +++ b/de4a-canonical-evidences/pom.xml @@ -121,8 +121,9 @@ maven-bundle-plugin - eu.de4a.iem.xml - eu.de4a.iem.xml.* + eu.de4a.iem.cev + eu.de4a.iem.cev.*, +eu.de4a.ieam.jaxb.* !javax.annotation.*,* osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" osgi.serviceloader; osgi.serviceloader=com.helger.schematron.svrl.ISVRLLocationBeautifierSPI diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/CIEM.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/CCanonicalEvidences.java similarity index 73% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/CIEM.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/CCanonicalEvidences.java index 1ef81bb..caa204a 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/CIEM.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/CCanonicalEvidences.java @@ -1,4 +1,4 @@ -package eu.de4a.iem.xml; +package eu.de4a.iem.cev; import javax.annotation.concurrent.Immutable; @@ -9,11 +9,11 @@ * @since 0.2.1 */ @Immutable -public final class CIEM +public final class CCanonicalEvidences { // Iteration 2 identifier for the IEM "/SpecificationId" element public static final String SPECIFICATION_ID = "de4a-iem-v2"; - private CIEM () + private CCanonicalEvidences () {} } diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/EDE4ACanonicalEvidenceType.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/EDE4ACanonicalEvidenceType.java similarity index 85% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/EDE4ACanonicalEvidenceType.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/EDE4ACanonicalEvidenceType.java index 0d5eb68..39828c8 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/EDE4ACanonicalEvidenceType.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/EDE4ACanonicalEvidenceType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a; +package eu.de4a.iem.cev; import javax.annotation.Nonnull; @@ -29,16 +29,16 @@ */ public enum EDE4ACanonicalEvidenceType implements IDE4ACanonicalEvidenceType { - T41_UC1_2021_02_11 ("t41-uc1-2021-02-11", "T4.1 UC1 v2021-02-11", eu.de4a.iem.xml.de4a.t41.v2021_02_11.CT41.getAllXSDs ()), - T41_UC1_2021_04_13 ("t41-uc1-2021-04-13", "T4.1 UC1 v2021-04-13", eu.de4a.iem.xml.de4a.t41.v2021_04_13.CT41.getAllXSDs ()), - T42_COMPANY_INFO_V06 ("t42-companyinfo-v06", "T4.2 Company Info v0.6", eu.de4a.iem.xml.de4a.t42.v0_6.CT42.getAllXSDs ()), - T43_BIRTH_EVIDENCE_V16B ("t43-birth-v16b", "T4.3 Birth Evidence v1.6b", eu.de4a.iem.xml.de4a.t43.v1_6b.CT43.getAllBirthEvidenceXSDs ()), + T41_UC1_2021_02_11 ("t41-uc1-2021-02-11", "T4.1 UC1 v2021-02-11", eu.de4a.iem.cev.de4a.t41.v2021_02_11.CT41.getAllXSDs ()), + T41_UC1_2021_04_13 ("t41-uc1-2021-04-13", "T4.1 UC1 v2021-04-13", eu.de4a.iem.cev.de4a.t41.v2021_04_13.CT41.getAllXSDs ()), + T42_COMPANY_INFO_V06 ("t42-companyinfo-v06", "T4.2 Company Info v0.6", eu.de4a.iem.cev.de4a.t42.v0_6.CT42.getAllXSDs ()), + T43_BIRTH_EVIDENCE_V16B ("t43-birth-v16b", "T4.3 Birth Evidence v1.6b", eu.de4a.iem.cev.de4a.t43.v1_6b.CT43.getAllBirthEvidenceXSDs ()), T43_DOMREG_EVIDENCE_V16B ("t43-domreg-v16b", "T4.3 Domicile Registration Evidence v1.6b", - eu.de4a.iem.xml.de4a.t43.v1_6b.CT43.getAllDomicileRegistrationEvidenceXSDs ()), + eu.de4a.iem.cev.de4a.t43.v1_6b.CT43.getAllDomicileRegistrationEvidenceXSDs ()), T43_MARRIAGE_EVIDENCE_V16B ("t43-marriage-v16b", "T4.3 Marriage Evidence v1.6b", - eu.de4a.iem.xml.de4a.t43.v1_6b.CT43.getAllMarriageEvidenceXSDs ()); + eu.de4a.iem.cev.de4a.t43.v1_6b.CT43.getAllMarriageEvidenceXSDs ()); private final String m_sID; private final String m_sDisplayName; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/CT41.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/CT41.java similarity index 98% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/CT41.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/CT41.java index 67c4681..41b4771 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/CT41.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/CT41.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t41.v2021_02_11; +package eu.de4a.iem.cev.de4a.t41.v2021_02_11; import javax.annotation.Nonnull; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/DE4AT41Marshaller.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/DE4AT41Marshaller.java similarity index 97% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/DE4AT41Marshaller.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/DE4AT41Marshaller.java index 109b392..ad3a6c0 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/DE4AT41Marshaller.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/DE4AT41Marshaller.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t41.v2021_02_11; +package eu.de4a.iem.cev.de4a.t41.v2021_02_11; import java.util.function.Function; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/DE4AT41NamespaceContext.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/DE4AT41NamespaceContext.java similarity index 96% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/DE4AT41NamespaceContext.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/DE4AT41NamespaceContext.java index e05f197..d75d83b 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/DE4AT41NamespaceContext.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/DE4AT41NamespaceContext.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t41.v2021_02_11; +package eu.de4a.iem.cev.de4a.t41.v2021_02_11; import javax.annotation.Nonnull; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/CT41.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/CT41.java similarity index 98% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/CT41.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/CT41.java index 679efa8..d73dcc9 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/CT41.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/CT41.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t41.v2021_04_13; +package eu.de4a.iem.cev.de4a.t41.v2021_04_13; import javax.annotation.Nonnull; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/DE4AT41Marshaller.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/DE4AT41Marshaller.java similarity index 97% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/DE4AT41Marshaller.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/DE4AT41Marshaller.java index 59361fe..12d1a52 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/DE4AT41Marshaller.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/DE4AT41Marshaller.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t41.v2021_04_13; +package eu.de4a.iem.cev.de4a.t41.v2021_04_13; import java.util.function.Function; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/DE4AT41NamespaceContext.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/DE4AT41NamespaceContext.java similarity index 96% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/DE4AT41NamespaceContext.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/DE4AT41NamespaceContext.java index 7242703..6cb6379 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/DE4AT41NamespaceContext.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/DE4AT41NamespaceContext.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t41.v2021_04_13; +package eu.de4a.iem.cev.de4a.t41.v2021_04_13; import javax.annotation.Nonnull; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t42/v0_6/CT42.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t42/v0_6/CT42.java similarity index 97% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t42/v0_6/CT42.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t42/v0_6/CT42.java index 6521eca..38bbea5 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t42/v0_6/CT42.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t42/v0_6/CT42.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t42.v0_6; +package eu.de4a.iem.cev.de4a.t42.v0_6; import javax.annotation.Nonnull; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t42/v0_6/DE4AT42Marshaller.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t42/v0_6/DE4AT42Marshaller.java similarity index 97% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t42/v0_6/DE4AT42Marshaller.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t42/v0_6/DE4AT42Marshaller.java index 64c151d..1f0150f 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t42/v0_6/DE4AT42Marshaller.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t42/v0_6/DE4AT42Marshaller.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t42.v0_6; +package eu.de4a.iem.cev.de4a.t42.v0_6; import java.util.function.Function; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t42/v0_6/DE4AT42NamespaceContext.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t42/v0_6/DE4AT42NamespaceContext.java similarity index 97% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t42/v0_6/DE4AT42NamespaceContext.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t42/v0_6/DE4AT42NamespaceContext.java index 780a148..39bf18a 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t42/v0_6/DE4AT42NamespaceContext.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t42/v0_6/DE4AT42NamespaceContext.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t42.v0_6; +package eu.de4a.iem.cev.de4a.t42.v0_6; import javax.annotation.Nonnull; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t43/v1_6b/CT43.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t43/v1_6b/CT43.java similarity index 98% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t43/v1_6b/CT43.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t43/v1_6b/CT43.java index 13f7708..96e5373 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t43/v1_6b/CT43.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t43/v1_6b/CT43.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t43.v1_6b; +package eu.de4a.iem.cev.de4a.t43.v1_6b; import javax.annotation.Nonnull; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t43/v1_6b/DE4AT43Marshaller.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t43/v1_6b/DE4AT43Marshaller.java similarity index 98% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t43/v1_6b/DE4AT43Marshaller.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t43/v1_6b/DE4AT43Marshaller.java index e0ec7fd..330bf73 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t43/v1_6b/DE4AT43Marshaller.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t43/v1_6b/DE4AT43Marshaller.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t43.v1_6b; +package eu.de4a.iem.cev.de4a.t43.v1_6b; import java.util.List; import java.util.function.Function; diff --git a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t43/v1_6b/DE4AT43NamespaceContext.java b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t43/v1_6b/DE4AT43NamespaceContext.java similarity index 98% rename from de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t43/v1_6b/DE4AT43NamespaceContext.java rename to de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t43/v1_6b/DE4AT43NamespaceContext.java index d0331f9..4311255 100644 --- a/de4a-canonical-evidences/src/main/java/eu/de4a/iem/xml/de4a/t43/v1_6b/DE4AT43NamespaceContext.java +++ b/de4a-canonical-evidences/src/main/java/eu/de4a/iem/cev/de4a/t43/v1_6b/DE4AT43NamespaceContext.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t43.v1_6b; +package eu.de4a.iem.cev.de4a.t43.v1_6b; import javax.annotation.Nonnull; diff --git a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/DE4AMarshallerTest.java b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/DE4ACoreMarshallerTest.java similarity index 97% rename from de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/DE4AMarshallerTest.java rename to de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/DE4ACoreMarshallerTest.java index 7f3d875..940ba1e 100644 --- a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/DE4AMarshallerTest.java +++ b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/DE4ACoreMarshallerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a; +package eu.de4a.iem.cev; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -31,9 +31,9 @@ * * @author Philip Helger */ -public final class DE4AMarshallerTest +public final class DE4ACoreMarshallerTest { - private static final Logger LOGGER = LoggerFactory.getLogger (DE4AMarshallerTest.class); + private static final Logger LOGGER = LoggerFactory.getLogger (DE4ACoreMarshallerTest.class); private static final String BASE_PATH = "src/test/resources/de4a/"; @SuppressWarnings ("unused") diff --git a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/SPITest.java b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/SPITest.java similarity index 97% rename from de4a-canonical-evidences/src/test/java/eu/de4a/iem/SPITest.java rename to de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/SPITest.java index 3b8b6af..32c050e 100644 --- a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/SPITest.java +++ b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/SPITest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem; +package eu.de4a.iem.cev; import org.junit.Test; diff --git a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/CT41Test.java b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/CT41Test.java similarity index 95% rename from de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/CT41Test.java rename to de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/CT41Test.java index 78aa99b..94e94c8 100644 --- a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/CT41Test.java +++ b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/CT41Test.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t41.v2021_04_13; +package eu.de4a.iem.cev.de4a.t41.v2021_02_11; import static org.junit.Assert.assertTrue; diff --git a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/DE4AT41MarshallerTest.java b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/DE4AT41MarshallerTest.java similarity index 98% rename from de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/DE4AT41MarshallerTest.java rename to de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/DE4AT41MarshallerTest.java index 9832ffc..23f4527 100644 --- a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/DE4AT41MarshallerTest.java +++ b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_02_11/DE4AT41MarshallerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t41.v2021_02_11; +package eu.de4a.iem.cev.de4a.t41.v2021_02_11; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/CT41Test.java b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/CT41Test.java similarity index 95% rename from de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/CT41Test.java rename to de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/CT41Test.java index 23746c4..6898d64 100644 --- a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_02_11/CT41Test.java +++ b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/CT41Test.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t41.v2021_02_11; +package eu.de4a.iem.cev.de4a.t41.v2021_04_13; import static org.junit.Assert.assertTrue; diff --git a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/DE4AT41MarshallerTest.java b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/DE4AT41MarshallerTest.java similarity index 98% rename from de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/DE4AT41MarshallerTest.java rename to de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/DE4AT41MarshallerTest.java index 58c4a17..4dddd52 100644 --- a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t41/v2021_04_13/DE4AT41MarshallerTest.java +++ b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t41/v2021_04_13/DE4AT41MarshallerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t41.v2021_04_13; +package eu.de4a.iem.cev.de4a.t41.v2021_04_13; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t42/v0_6/CT42Test.java b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t42/v0_6/CT42Test.java similarity index 96% rename from de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t42/v0_6/CT42Test.java rename to de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t42/v0_6/CT42Test.java index a890e8b..b8020fd 100644 --- a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t42/v0_6/CT42Test.java +++ b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t42/v0_6/CT42Test.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t42.v0_6; +package eu.de4a.iem.cev.de4a.t42.v0_6; import static org.junit.Assert.assertTrue; diff --git a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t42/v0_6/DE4AT42MarshallerTest.java b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t42/v0_6/DE4AT42MarshallerTest.java similarity index 98% rename from de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t42/v0_6/DE4AT42MarshallerTest.java rename to de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t42/v0_6/DE4AT42MarshallerTest.java index c576edb..627c6c3 100644 --- a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t42/v0_6/DE4AT42MarshallerTest.java +++ b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t42/v0_6/DE4AT42MarshallerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t42.v0_6; +package eu.de4a.iem.cev.de4a.t42.v0_6; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t43/v1_6b/CT43Test.java b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t43/v1_6b/CT43Test.java similarity index 96% rename from de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t43/v1_6b/CT43Test.java rename to de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t43/v1_6b/CT43Test.java index 26d22cf..70298fe 100644 --- a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t43/v1_6b/CT43Test.java +++ b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t43/v1_6b/CT43Test.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t43.v1_6b; +package eu.de4a.iem.cev.de4a.t43.v1_6b; import static org.junit.Assert.assertTrue; diff --git a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t43/v1_6b/DE4AT43MarshallerTest.java b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t43/v1_6b/DE4AT43MarshallerTest.java similarity index 99% rename from de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t43/v1_6b/DE4AT43MarshallerTest.java rename to de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t43/v1_6b/DE4AT43MarshallerTest.java index c8b8ed4..8e22366 100644 --- a/de4a-canonical-evidences/src/test/java/eu/de4a/iem/xml/de4a/t43/v1_6b/DE4AT43MarshallerTest.java +++ b/de4a-canonical-evidences/src/test/java/eu/de4a/iem/cev/de4a/t43/v1_6b/DE4AT43MarshallerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.de4a.iem.xml.de4a.t43.v1_6b; +package eu.de4a.iem.cev.de4a.t43.v1_6b; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; From 3bfd20706f6cd63afb0dd238015a25d0f68890d8 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 23:22:13 +0200 Subject: [PATCH 08/11] Added nice package names --- .../src/main/jaxb/bindings-t41.xjb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/de4a-canonical-evidences/src/main/jaxb/bindings-t41.xjb b/de4a-canonical-evidences/src/main/jaxb/bindings-t41.xjb index aadfeb4..8e4a9e3 100644 --- a/de4a-canonical-evidences/src/main/jaxb/bindings-t41.xjb +++ b/de4a-canonical-evidences/src/main/jaxb/bindings-t41.xjb @@ -39,6 +39,16 @@ + + + + + + + + + + From 09c02c414746015e6028abb321412bcc0e04dc2c Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 23:26:48 +0200 Subject: [PATCH 09/11] Updated news --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0107312..da2327d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Shared stuff for DE4A software components. Last release: -* Iteration 2: **0.2.2** +* Iteration 2: **0.2.4** * Iteration 1: **0.1.11** In the DE4A project we are differentiating between "Iteration 1" and "Iteration 2". As they are incompatible, care needs to be taken, that they are not mixed together. @@ -13,6 +13,9 @@ The `development` branch is used for development of Iteration 2 stuff. ## History +* v0.2.4 - 2022-04-13 + * Fixed the date/time/dateTime JAXB binding for T41 and T42. + * Changed the package names in the `de4a-canonical-evidences` submodule * v0.2.3 - 2022-04-13 * Renamed the submodule `de4a-iem` to `de4a-canonical-evidences` * v0.2.2 - 2022-03-11 @@ -59,7 +62,8 @@ mvn clean install and you receive a set of JAR files in the respective submodule `target` directory. -## Modules +## Submodules * **de4a-kafka-client**: a small wrapper to send messages to the shared Kafka instance for remote debugging -* **de4a-iem**: a wrapper around the DE4A IEM (Information Exchange Model) +* **de4a-core-schemas**: a wrapper around the DE4A IEM (Information Exchange Model) core schemas +* **de4a-canonical-evidences**: a wrapper around the pilot specific canonical evidence types From 310dad9a23d6f3af1065503d935334147bf0d7e9 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 23:27:38 +0200 Subject: [PATCH 10/11] [maven-release-plugin] prepare release de4a-commons-parent-pom-0.2.4 --- de4a-canonical-evidences/pom.xml | 2 +- de4a-core-schemas/pom.xml | 2 +- de4a-kafka-client/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/de4a-canonical-evidences/pom.xml b/de4a-canonical-evidences/pom.xml index f836842..84cdf9b 100644 --- a/de4a-canonical-evidences/pom.xml +++ b/de4a-canonical-evidences/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.4-SNAPSHOT + 0.2.4 de4a-canonical-evidences bundle diff --git a/de4a-core-schemas/pom.xml b/de4a-core-schemas/pom.xml index d6ddb0a..703421b 100644 --- a/de4a-core-schemas/pom.xml +++ b/de4a-core-schemas/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.4-SNAPSHOT + 0.2.4 de4a-core-schemas bundle diff --git a/de4a-kafka-client/pom.xml b/de4a-kafka-client/pom.xml index 35e3bbd..623a6c7 100644 --- a/de4a-kafka-client/pom.xml +++ b/de4a-kafka-client/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.4-SNAPSHOT + 0.2.4 de4a-kafka-client bundle diff --git a/pom.xml b/pom.xml index da38cdd..8f815af 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.4-SNAPSHOT + 0.2.4 pom de4a-commons-parent-pom Base POM to build the DE4A Commons projects @@ -42,7 +42,7 @@ scm:git:git@github.com:de4a-wp5/de4a-commons.git scm:git:git@github.com:de4a-wp5/de4a-commons.git http://github.com/de4a-wp5/de4a-commons - HEAD + de4a-commons-parent-pom-0.2.4 From aad731fd8f675a32ed1107706c65d187785e037a Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Wed, 13 Apr 2022 23:27:43 +0200 Subject: [PATCH 11/11] [maven-release-plugin] prepare for next development iteration --- de4a-canonical-evidences/pom.xml | 2 +- de4a-core-schemas/pom.xml | 2 +- de4a-kafka-client/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/de4a-canonical-evidences/pom.xml b/de4a-canonical-evidences/pom.xml index 84cdf9b..297c563 100644 --- a/de4a-canonical-evidences/pom.xml +++ b/de4a-canonical-evidences/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.4 + 0.2.5-SNAPSHOT de4a-canonical-evidences bundle diff --git a/de4a-core-schemas/pom.xml b/de4a-core-schemas/pom.xml index 703421b..685d955 100644 --- a/de4a-core-schemas/pom.xml +++ b/de4a-core-schemas/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.4 + 0.2.5-SNAPSHOT de4a-core-schemas bundle diff --git a/de4a-kafka-client/pom.xml b/de4a-kafka-client/pom.xml index 623a6c7..15f9cb4 100644 --- a/de4a-kafka-client/pom.xml +++ b/de4a-kafka-client/pom.xml @@ -19,7 +19,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.4 + 0.2.5-SNAPSHOT de4a-kafka-client bundle diff --git a/pom.xml b/pom.xml index 8f815af..e8c2c82 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ eu.de4a de4a-commons-parent-pom - 0.2.4 + 0.2.5-SNAPSHOT pom de4a-commons-parent-pom Base POM to build the DE4A Commons projects @@ -42,7 +42,7 @@ scm:git:git@github.com:de4a-wp5/de4a-commons.git scm:git:git@github.com:de4a-wp5/de4a-commons.git http://github.com/de4a-wp5/de4a-commons - de4a-commons-parent-pom-0.2.4 + HEAD