diff --git a/.gitignore b/.gitignore index e5b50b8..8f268bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/target -/.idea +target +.idea *.iml -.DS_Store \ No newline at end of file +.DS_Store diff --git a/ocpp-custom/pom.xml b/ocpp-custom/pom.xml new file mode 100644 index 0000000..f7206ef --- /dev/null +++ b/ocpp-custom/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + + de.rwth.idsg + ocpp-parent + 0.0.14-SNAPSHOT + + + ocpp-custom + jar + + + + org.jsonschema2pojo + jsonschema2pojo-core + ${jsonschema2pojo.version} + + + + diff --git a/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java b/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java new file mode 100644 index 0000000..ccd7a3b --- /dev/null +++ b/ocpp-custom/src/main/java/de/rwth/idsg/ocpp/jaxb/CustomAnnotator.java @@ -0,0 +1,44 @@ +package de.rwth.idsg.ocpp.jaxb; + +import com.fasterxml.jackson.databind.JsonNode; +import com.sun.codemodel.JDefinedClass; +import com.sun.codemodel.JFieldVar; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.joda.time.DateTime; +import org.jsonschema2pojo.AbstractAnnotator; +import tools.jackson.databind.annotation.JsonDeserialize; +import tools.jackson.databind.annotation.JsonSerialize; + +public class CustomAnnotator extends AbstractAnnotator { + + @Override + public void typeInfo(JDefinedClass clazz, JsonNode schema) { + super.typeInfo(clazz, schema); + + clazz.annotate(ToString.class); + clazz.annotate(Getter.class); + clazz.annotate(Setter.class); + clazz.annotate(EqualsAndHashCode.class); + } + + @Override + public void propertyField(JFieldVar field, JDefinedClass clazz, + String propertyName, + JsonNode propertyNode) { + super.propertyField(field, clazz, propertyName, propertyNode); + + // Add custom converter annotations to all DateTime fields + if (field.type().fullName().equals(DateTime.class.getName())) { + // Add @JsonSerialize annotation + field.annotate(JsonSerialize.class) + .param("using", clazz.owner().ref("de.rwth.idsg.ocpp.jaxb.JodaDateTimeSerializer").dotclass()); + + // Add @JsonDeserialize annotation + field.annotate(JsonDeserialize.class) + .param("using", clazz.owner().ref("de.rwth.idsg.ocpp.jaxb.JodaDateTimeDeserializer").dotclass()); + } + } +} diff --git a/ocpp-jaxb/pom.xml b/ocpp-jaxb/pom.xml new file mode 100644 index 0000000..fad436e --- /dev/null +++ b/ocpp-jaxb/pom.xml @@ -0,0 +1,228 @@ + + + 4.0.0 + + + de.rwth.idsg + ocpp-parent + 0.0.14-SNAPSHOT + + + ocpp-jaxb + jar + + + OCPP-1.6_Security_3rd_Edition_schemas + OCPP-2.0.1_part3_JSON_schemas + + + + + + org.apache.cxf + cxf-codegen-plugin + ${cxf.version} + + ${project.build.directory}/generated-sources + ${basedir}/src/main/resources/wsdl + + + ${basedir}/src/main/resources/wsdl-binding/ocpp_binding.xml + ${basedir}/src/main/resources/wsdl-binding/async_binding.xml + ${basedir}/src/main/resources/wsdl-binding/add_interface.xml + + + -xjc-Xfluent-api + -xjc-Xinheritance + -xjc-Xannotate + + -exsh + true + + + + + + generate-sources + generate-sources + + wsdl2java + + + + + + org.projectlombok + lombok + ${lombok.version} + + + org.jvnet.jaxb + jaxb-plugins + 4.0.8 + + + org.jvnet.jaxb + jaxb-plugin-annotate + 4.0.8 + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + + + add-request-interface-ocpp-1.6j-security + generate-resources + + replace + + + ${basedir}/src/main/resources/${ocpp-1.6-security-schemas-dir}/*.json + false + ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} + + + "\$schema" + + "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.RequestType"], + "\$schema" + + + + + + add-response-interface-ocpp-1.6j-security + generate-resources + + replace + + + ${basedir}/src/main/resources/${ocpp-1.6-security-schemas-dir}/*Response.json + false + ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} + + + "\$schema" + + "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.ResponseType"], + "\$schema" + + + + + + + add-request-interface-ocpp-2.0.1 + generate-resources + + replace + + + ${basedir}/src/main/resources/${ocpp-2.0.1-schemas-dir}/*Request.json + false + ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} + + + "\$schema" + + "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.RequestType"], + "\$schema" + + + + + + add-response-interface-ocpp-2.0.1 + generate-resources + + replace + + + ${basedir}/src/main/resources/${ocpp-2.0.1-schemas-dir}/*Response.json + false + ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} + + + "\$schema" + + "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.ResponseType"], + "\$schema" + + + + + + + + org.jsonschema2pojo + jsonschema2pojo-maven-plugin + ${jsonschema2pojo.version} + + ${project.build.directory}/generated-sources + true + true + false + true + true + true + true + de.rwth.idsg.ocpp.jaxb.CustomAnnotator + + false + false + false + false + + + + generate-ocpp-1.6j-security + process-resources + + generate + + + ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} + + ocpp._2022._02.security + + + + generate-ocpp-2.0.1 + process-resources + + generate + + + ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} + ocpp._2020._03 + + + + + + ${project.groupId} + ocpp-custom + ${project.version} + + + tools.jackson.core + jackson-databind + ${jackson.version} + + + + + + + diff --git a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java new file mode 100644 index 0000000..bdea3d0 --- /dev/null +++ b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java @@ -0,0 +1,35 @@ +package de.rwth.idsg.ocpp.jaxb; + +import org.joda.time.DateTime; + +import jakarta.xml.bind.annotation.adapters.XmlAdapter; + +import static de.rwth.idsg.ocpp.jaxb.Utils.FORMATTER; +import static de.rwth.idsg.ocpp.jaxb.Utils.isNullOrEmpty; + +/** + * Joda-Time and XSD represent data and time information according to ISO 8601. + * + * @author Sevket Goekay + * @since 20.10.2014 + */ +public class JodaDateTimeConverter extends XmlAdapter { + + @Override + public DateTime unmarshal(String v) throws Exception { + if (isNullOrEmpty(v)) { + return null; + } else { + return FORMATTER.parseDateTime(v); + } + } + + @Override + public String marshal(DateTime v) throws Exception { + if (v == null) { + return null; + } else { + return v.toString(); + } + } +} diff --git a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java new file mode 100644 index 0000000..0556cd1 --- /dev/null +++ b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeDeserializer.java @@ -0,0 +1,22 @@ +package de.rwth.idsg.ocpp.jaxb; + +import org.joda.time.DateTime; +import tools.jackson.core.JacksonException; +import tools.jackson.core.JsonParser; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.ValueDeserializer; + +import static de.rwth.idsg.ocpp.jaxb.Utils.FORMATTER; +import static de.rwth.idsg.ocpp.jaxb.Utils.isNullOrEmpty; + +public class JodaDateTimeDeserializer extends ValueDeserializer { + + @Override + public DateTime deserialize(JsonParser p, DeserializationContext ctxt) throws JacksonException { + String value = p.getString(); + if (isNullOrEmpty(value)) { + return null; + } + return FORMATTER.parseDateTime(value); + } +} diff --git a/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java new file mode 100644 index 0000000..61d281a --- /dev/null +++ b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeSerializer.java @@ -0,0 +1,19 @@ +package de.rwth.idsg.ocpp.jaxb; + +import org.joda.time.DateTime; +import tools.jackson.core.JacksonException; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ValueSerializer; + +public class JodaDateTimeSerializer extends ValueSerializer { + + @Override + public void serialize(DateTime value, JsonGenerator gen, SerializationContext serializers) throws JacksonException { + if (value == null) { + gen.writeNull(); + } else { + gen.writeString(value.toString()); + } + } +} diff --git a/src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java similarity index 100% rename from src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java rename to ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java diff --git a/src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java similarity index 100% rename from src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java rename to ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java diff --git a/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/Utils.java similarity index 73% rename from src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java rename to ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/Utils.java index 57b00c1..d6385d7 100644 --- a/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java +++ b/ocpp-jaxb/src/main/java/de/rwth/idsg/ocpp/jaxb/Utils.java @@ -1,45 +1,18 @@ package de.rwth.idsg.ocpp.jaxb; -import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.DateTimeFormatterBuilder; -import jakarta.xml.bind.annotation.adapters.XmlAdapter; - import static org.joda.time.format.ISODateTimeFormat.date; -/** - * Joda-Time and XSD represent data and time information according to ISO 8601. - * - * @author Sevket Goekay - * @since 20.10.2014 - */ -public class JodaDateTimeConverter extends XmlAdapter { - - private static final DateTimeFormatter formatter = dateTimeParser(); +public class Utils { - @Override - public DateTime unmarshal(String v) throws Exception { - if (isNullOrEmpty(v)) { - return null; - } else { - return DateTime.parse(v, formatter); - } - } - - @Override - public String marshal(DateTime v) throws Exception { - if (v == null) { - return null; - } else { - return v.toString(); - } - } + public static final DateTimeFormatter FORMATTER = dateTimeParser(); /** * Because I did not want to include Guava or similar only for this. */ - private static boolean isNullOrEmpty(String string) { + public static boolean isNullOrEmpty(String string) { return string == null || string.isEmpty(); } diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSigned.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSigned.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSigned.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSigned.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSignedResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSignedResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSignedResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/CertificateSignedResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificate.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificate.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificate.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificate.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/DeleteCertificateResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessage.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessage.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessage.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessage.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessageResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessageResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessageResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/ExtendedTriggerMessageResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIds.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIds.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIds.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIds.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIdsResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIdsResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIdsResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetInstalledCertificateIdsResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLog.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLog.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLog.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLog.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLogResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLogResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLogResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/GetLogResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificate.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificate.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificate.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificate.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/InstallCertificateResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotification.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotification.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotification.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotification.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/LogStatusNotificationResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotification.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotification.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotification.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotification.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SecurityEventNotificationResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificate.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificate.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificate.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificate.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignCertificateResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotification.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotification.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotification.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotification.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedFirmwareStatusNotificationResponse.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmware.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmware.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmware.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmware.json diff --git a/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmwareResponse.json b/ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmwareResponse.json similarity index 100% rename from src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmwareResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-1.6_Security_3rd_Edition_schemas/SignedUpdateFirmwareResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json diff --git a/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json b/ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json similarity index 100% rename from src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json rename to ocpp-jaxb/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json diff --git a/src/main/resources/wsdl-binding/add_interface.xml b/ocpp-jaxb/src/main/resources/wsdl-binding/add_interface.xml similarity index 100% rename from src/main/resources/wsdl-binding/add_interface.xml rename to ocpp-jaxb/src/main/resources/wsdl-binding/add_interface.xml diff --git a/src/main/resources/wsdl-binding/async_binding.xml b/ocpp-jaxb/src/main/resources/wsdl-binding/async_binding.xml similarity index 100% rename from src/main/resources/wsdl-binding/async_binding.xml rename to ocpp-jaxb/src/main/resources/wsdl-binding/async_binding.xml diff --git a/src/main/resources/wsdl-binding/ocpp_binding.xml b/ocpp-jaxb/src/main/resources/wsdl-binding/ocpp_binding.xml similarity index 100% rename from src/main/resources/wsdl-binding/ocpp_binding.xml rename to ocpp-jaxb/src/main/resources/wsdl-binding/ocpp_binding.xml diff --git a/src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl b/ocpp-jaxb/src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl similarity index 100% rename from src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl diff --git a/src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl b/ocpp-jaxb/src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl similarity index 100% rename from src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl diff --git a/src/main/resources/wsdl/centralsystemservice_0.wsdl b/ocpp-jaxb/src/main/resources/wsdl/centralsystemservice_0.wsdl similarity index 100% rename from src/main/resources/wsdl/centralsystemservice_0.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/centralsystemservice_0.wsdl diff --git a/src/main/resources/wsdl/chargepointservice.wsdl b/ocpp-jaxb/src/main/resources/wsdl/chargepointservice.wsdl similarity index 100% rename from src/main/resources/wsdl/chargepointservice.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/chargepointservice.wsdl diff --git a/src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl b/ocpp-jaxb/src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl similarity index 100% rename from src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl diff --git a/src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl b/ocpp-jaxb/src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl similarity index 100% rename from src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl rename to ocpp-jaxb/src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl diff --git a/src/test/java/de/rwth/idsg/ocpp/jaxb/DateTimePatternTest.java b/ocpp-jaxb/src/test/java/de/rwth/idsg/ocpp/jaxb/DateTimePatternTest.java similarity index 100% rename from src/test/java/de/rwth/idsg/ocpp/jaxb/DateTimePatternTest.java rename to ocpp-jaxb/src/test/java/de/rwth/idsg/ocpp/jaxb/DateTimePatternTest.java diff --git a/src/test/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverterTest.java b/ocpp-jaxb/src/test/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverterTest.java similarity index 100% rename from src/test/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverterTest.java rename to ocpp-jaxb/src/test/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverterTest.java diff --git a/pom.xml b/pom.xml index c69907c..a1e799d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,15 @@ 4.0.0 de.rwth.idsg - ocpp-jaxb + ocpp-parent 0.0.14-SNAPSHOT - jar + pom + + + + ocpp-custom + ocpp-jaxb + SteVe Community Team @@ -31,11 +37,10 @@ 17 UTF-8 - OCPP-1.6_Security_3rd_Edition_schemas - OCPP-2.0.1_part3_JSON_schemas - 4.0.5 1.18.34 + 1.2.1 + 3.0.3 @@ -80,197 +85,10 @@ maven-release-plugin 3.1.1 + true @{project.version} - - org.apache.cxf - cxf-codegen-plugin - ${cxf.version} - - ${project.build.directory}/generated-sources - ${basedir}/src/main/resources/wsdl - - - ${basedir}/src/main/resources/wsdl-binding/ocpp_binding.xml - ${basedir}/src/main/resources/wsdl-binding/async_binding.xml - ${basedir}/src/main/resources/wsdl-binding/add_interface.xml - - - -xjc-Xfluent-api - -xjc-Xinheritance - -xjc-Xannotate - - -exsh - true - - - - - - generate-sources - generate-sources - - wsdl2java - - - - - - org.projectlombok - lombok - ${lombok.version} - - - org.jvnet.jaxb - jaxb-plugins - 4.0.8 - - - org.jvnet.jaxb - jaxb-plugin-annotate - 4.0.8 - - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - - - add-request-interface-ocpp-1.6j-security - generate-resources - - replace - - - ${basedir}/src/main/resources/${ocpp-1.6-security-schemas-dir}/*.json - false - ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} - - - "\$schema" - - "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.RequestType"], - "\$schema" - - - - - - add-response-interface-ocpp-1.6j-security - generate-resources - - replace - - - ${basedir}/src/main/resources/${ocpp-1.6-security-schemas-dir}/*Response.json - false - ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} - - - "\$schema" - - "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.ResponseType"], - "\$schema" - - - - - - - add-request-interface-ocpp-2.0.1 - generate-resources - - replace - - - ${basedir}/src/main/resources/${ocpp-2.0.1-schemas-dir}/*Request.json - false - ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} - - - "\$schema" - - "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.RequestType"], - "\$schema" - - - - - - add-response-interface-ocpp-2.0.1 - generate-resources - - replace - - - ${basedir}/src/main/resources/${ocpp-2.0.1-schemas-dir}/*Response.json - false - ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} - - - "\$schema" - - "javaInterfaces" : ["de.rwth.idsg.ocpp.jaxb.ResponseType"], - "\$schema" - - - - - - - - org.jsonschema2pojo - jsonschema2pojo-maven-plugin - 1.2.1 - - ${project.build.directory}/generated-sources - true - true - false - true - true - true - true - - - - generate-ocpp-1.6j-security - process-resources - - generate - - - ${project.build.directory}/generated-resources/${ocpp-1.6-security-schemas-dir} - - ocpp._2022._02.security - yyyy-MM-dd'T'HH:mm:ss.SSS'Z' - - - - generate-ocpp-2.0.1 - process-resources - - generate - - - ${project.build.directory}/generated-resources/${ocpp-2.0.1-schemas-dir} - ocpp._2020._03 - yyyy-MM-dd'T'HH:mm:ss.SSS'Z' - - - - @@ -319,6 +137,12 @@ jackson-annotations 2.20 + + tools.jackson.core + jackson-databind + ${jackson.version} + provided + org.junit.jupiter