diff --git a/pom.xml b/pom.xml index 42fa0899c..f263fa848 100644 --- a/pom.xml +++ b/pom.xml @@ -24,14 +24,15 @@ steve steve-api + steve-bom steve-core - steve-jooq - steve-ocpp - steve-ocpp-1-x - steve-ocpp-2-x - steve-ocpp-transport-soap - steve-ocpp-transport-websocket - steve-ui-jsp + steve-db/steve-jooq + steve-ocpp/steve-ocpp-1-x + steve-ocpp/steve-ocpp-2-x + steve-ocpp/steve-ocpp-commons + steve-ocpp/steve-ocpp-transport-soap + steve-ocpp/steve-ocpp-transport-websocket + steve-ui/steve-ui-jsp @@ -62,7 +63,7 @@ de.rwth.idsg - steve-ocpp + steve-ocpp-commons ${project.version} @@ -227,13 +228,22 @@ + + com.mycila + license-maven-plugin + ${plugin.license-maven.version} + + + com.diffplug.spotless + spotless-maven-plugin + 2.46.1 + com.mycila license-maven-plugin - ${plugin.license-maven.version} diff --git a/steve-bom/pom.xml b/steve-bom/pom.xml new file mode 100644 index 000000000..a42b30976 --- /dev/null +++ b/steve-bom/pom.xml @@ -0,0 +1,75 @@ + + + 4.0.0 + + + de.rwth.idsg + steve-parent + 3.8.0-SNAPSHOT + + + steve-bom + pom + + + + + de.rwth.idsg + steve-core + ${project.version} + + + de.rwth.idsg + steve-jooq + ${project.version} + + + de.rwth.idsg + steve-ocpp-commons + ${project.version} + + + de.rwth.idsg + steve-ocpp-1-x + ${project.version} + + + de.rwth.idsg + steve-ocpp-2-x + ${project.version} + + + de.rwth.idsg + steve-ocpp-transport-soap + ${project.version} + + + de.rwth.idsg + steve-ocpp-transport-websocket + ${project.version} + + + de.rwth.idsg + steve-api + ${project.version} + + + de.rwth.idsg + steve-ui-jsp + ${project.version} + + + + + + + + com.diffplug.spotless + spotless-maven-plugin + + true + + + + + diff --git a/steve-core/src/main/java/de/rwth/idsg/steve/config/SteveProperties.java b/steve-core/src/main/java/de/rwth/idsg/steve/config/SteveProperties.java index eebce8456..0e7c85d78 100644 --- a/steve-core/src/main/java/de/rwth/idsg/steve/config/SteveProperties.java +++ b/steve-core/src/main/java/de/rwth/idsg/steve/config/SteveProperties.java @@ -23,6 +23,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.time.Duration; + /** * @author Sevket Goekay * @since 19.08.2014 @@ -84,5 +86,23 @@ public static class Ocpp { private boolean autoRegisterUnknownStations; private @Nullable String chargeBoxIdValidationRegex; private String wsSessionSelectStrategy; + private Ws ws = new Ws(); + + @Data + public static class Ws { + private static final int DEFAULT_MAX_MSG_SIZE = 8_388_608; // 8 MB for max message size + private static final Duration DEFAULT_IDLE_TIMEOUT = Duration.ofHours(2); + private static final String[] DEFAULT_ALLOWED_ORIGINS = new String[] {"*"}; + private static final Duration DEFAULT_SEND_TIME_LIMIT = Duration.ofSeconds(10); + + private int maxTextMessageSize = DEFAULT_MAX_MSG_SIZE; + private Duration idleTimeout = DEFAULT_IDLE_TIMEOUT; + private String[] allowedOriginPatterns = DEFAULT_ALLOWED_ORIGINS; + private Duration sendTimeLimit = DEFAULT_SEND_TIME_LIMIT; + + public int getBufferSizeLimit() { + return 5 * maxTextMessageSize; + } + } } } diff --git a/steve-jooq/pom.xml b/steve-db/steve-jooq/pom.xml similarity index 98% rename from steve-jooq/pom.xml rename to steve-db/steve-jooq/pom.xml index 20eff9dbf..e313b094d 100644 --- a/steve-jooq/pom.xml +++ b/steve-db/steve-jooq/pom.xml @@ -5,6 +5,7 @@ de.rwth.idsg steve-parent 3.8.0-SNAPSHOT + ../../pom.xml steve-jooq @@ -60,11 +61,6 @@ org.slf4j slf4j-api - - org.projectlombok - lombok - provided - diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/config/JooqConfiguration.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/config/JooqConfiguration.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/config/JooqConfiguration.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/config/JooqConfiguration.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/AddressMapper.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/AddressMapper.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/AddressMapper.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/AddressMapper.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/ChargePointMapper.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/ChargePointMapper.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/ChargePointMapper.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/ChargePointMapper.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/ChargingProfileMapper.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/ChargingProfileMapper.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/ChargingProfileMapper.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/ChargingProfileMapper.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/OcppTagMapper.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/OcppTagMapper.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/OcppTagMapper.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/OcppTagMapper.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/TransactionMapper.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/TransactionMapper.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/TransactionMapper.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/TransactionMapper.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/UserMapper.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/UserMapper.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/UserMapper.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/UserMapper.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/WebUserMapper.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/WebUserMapper.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/WebUserMapper.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/jooq/mapper/WebUserMapper.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/AddressRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ChargePointRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ChargingProfileRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/GenericRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/OcppTagRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/RepositoryUtils.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/RepositoryUtils.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/RepositoryUtils.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/RepositoryUtils.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/ReservationRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/SettingsRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/TaskStoreImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/WebUserRepositoryImpl.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/WebUserRepositoryImpl.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/WebUserRepositoryImpl.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/repository/impl/WebUserRepositoryImpl.java diff --git a/steve-jooq/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java b/steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java similarity index 100% rename from steve-jooq/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java rename to steve-db/steve-jooq/src/main/java/de/rwth/idsg/steve/utils/CustomDSL.java diff --git a/steve-jooq/src/main/resources/db/migration/B1_0_5__stevedb.sql b/steve-db/steve-jooq/src/main/resources/db/migration/B1_0_5__stevedb.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/B1_0_5__stevedb.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/B1_0_5__stevedb.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_6_6__inital.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_6_6__inital.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_6_6__inital.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_6_6__inital.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_6_7__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_6_7__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_6_7__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_6_7__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_6_8__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_6_8__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_6_8__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_6_8__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_6_9__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_6_9__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_6_9__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_6_9__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_7_0__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_7_0__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_7_0__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_7_0__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_7_1__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_7_1__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_7_1__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_7_1__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_7_2__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_7_2__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_7_2__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_7_2__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_7_3__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_7_3__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_7_3__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_7_3__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_7_6__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_7_6__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_7_6__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_7_6__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_7_7__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_7_7__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_7_7__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_7_7__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_7_8__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_7_8__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_7_8__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_7_8__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_7_9__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_7_9__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_7_9__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_7_9__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_8_0__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_8_0__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_8_0__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_8_0__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_8_1__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_8_1__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_8_1__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_8_1__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_8_2__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_8_2__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_8_2__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_8_2__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_8_4__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_8_4__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_8_4__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_8_4__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_8_5__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_8_5__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_8_5__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_8_5__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_8_6__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_8_6__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_8_6__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_8_6__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_8_7__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_8_7__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_8_7__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_8_7__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_8_8__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_8_8__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_8_8__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_8_8__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_8_9__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_8_9__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_8_9__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_8_9__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_9_0__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_9_0__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_9_0__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_9_0__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_9_1__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_9_1__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_9_1__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_9_1__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_9_2__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_9_2__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_9_2__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_9_2__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_9_3__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_9_3__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_9_3__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_9_3__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_9_4__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_9_4__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_9_4__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_9_4__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_9_5__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_9_5__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_9_5__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_9_5__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_9_6__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_9_6__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_9_6__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_9_6__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_9_7__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_9_7__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_9_7__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_9_7__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_9_8__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_9_8__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_9_8__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_9_8__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V0_9_9__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V0_9_9__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V0_9_9__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V0_9_9__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V1_0_0__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V1_0_0__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V1_0_0__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V1_0_0__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V1_0_1__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V1_0_1__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V1_0_1__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V1_0_1__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V1_0_2__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V1_0_2__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V1_0_2__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V1_0_2__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V1_0_3__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V1_0_3__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V1_0_3__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V1_0_3__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V1_0_4__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V1_0_4__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V1_0_4__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V1_0_4__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V1_0_5__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V1_0_5__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V1_0_5__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V1_0_5__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V1_0_6__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V1_0_6__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V1_0_6__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V1_0_6__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V1_0_7__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V1_0_7__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V1_0_7__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V1_0_7__update.sql diff --git a/steve-jooq/src/main/resources/db/migration/V1_0_8__update.sql b/steve-db/steve-jooq/src/main/resources/db/migration/V1_0_8__update.sql similarity index 100% rename from steve-jooq/src/main/resources/db/migration/V1_0_8__update.sql rename to steve-db/steve-jooq/src/main/resources/db/migration/V1_0_8__update.sql diff --git a/steve-ocpp-1-x/pom.xml b/steve-ocpp/steve-ocpp-1-x/pom.xml similarity index 96% rename from steve-ocpp-1-x/pom.xml rename to steve-ocpp/steve-ocpp-1-x/pom.xml index 5d7c42498..005d0d1ea 100644 --- a/steve-ocpp-1-x/pom.xml +++ b/steve-ocpp/steve-ocpp-1-x/pom.xml @@ -5,6 +5,7 @@ de.rwth.idsg steve-parent 3.8.0-SNAPSHOT + ../../pom.xml steve-ocpp-1-x @@ -12,7 +13,7 @@ de.rwth.idsg - steve-ocpp + steve-ocpp-commons diff --git a/steve-ocpp-1-x/src/main/resources/wsdl-binding/add_interface.xml b/steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl-binding/add_interface.xml similarity index 100% rename from steve-ocpp-1-x/src/main/resources/wsdl-binding/add_interface.xml rename to steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl-binding/add_interface.xml diff --git a/steve-ocpp-1-x/src/main/resources/wsdl-binding/async_binding.xml b/steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl-binding/async_binding.xml similarity index 100% rename from steve-ocpp-1-x/src/main/resources/wsdl-binding/async_binding.xml rename to steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl-binding/async_binding.xml diff --git a/steve-ocpp-1-x/src/main/resources/wsdl-binding/ocpp_binding.xml b/steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl-binding/ocpp_binding.xml similarity index 100% rename from steve-ocpp-1-x/src/main/resources/wsdl-binding/ocpp_binding.xml rename to steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl-binding/ocpp_binding.xml diff --git a/steve-ocpp-1-x/src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl b/steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl similarity index 100% rename from steve-ocpp-1-x/src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl rename to steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/OCPP_CentralSystemService_1.6.wsdl diff --git a/steve-ocpp-1-x/src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl b/steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl similarity index 100% rename from steve-ocpp-1-x/src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl rename to steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/OCPP_ChargePointService_1.6.wsdl diff --git a/steve-ocpp-1-x/src/main/resources/wsdl/centralsystemservice_0.wsdl b/steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/centralsystemservice_0.wsdl similarity index 100% rename from steve-ocpp-1-x/src/main/resources/wsdl/centralsystemservice_0.wsdl rename to steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/centralsystemservice_0.wsdl diff --git a/steve-ocpp-1-x/src/main/resources/wsdl/chargepointservice.wsdl b/steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/chargepointservice.wsdl similarity index 100% rename from steve-ocpp-1-x/src/main/resources/wsdl/chargepointservice.wsdl rename to steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/chargepointservice.wsdl diff --git a/steve-ocpp-1-x/src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl b/steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl similarity index 100% rename from steve-ocpp-1-x/src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl rename to steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/ocpp_centralsystemservice_1.5_final.wsdl diff --git a/steve-ocpp-1-x/src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl b/steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl similarity index 100% rename from steve-ocpp-1-x/src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl rename to steve-ocpp/steve-ocpp-1-x/src/main/resources/wsdl/ocpp_chargepointservice_1.5_final.wsdl diff --git a/steve-ocpp-2-x/pom.xml b/steve-ocpp/steve-ocpp-2-x/pom.xml similarity index 98% rename from steve-ocpp-2-x/pom.xml rename to steve-ocpp/steve-ocpp-2-x/pom.xml index 5de0d064c..248871635 100644 --- a/steve-ocpp-2-x/pom.xml +++ b/steve-ocpp/steve-ocpp-2-x/pom.xml @@ -5,6 +5,7 @@ de.rwth.idsg steve-parent 3.8.0-SNAPSHOT + ../../pom.xml steve-ocpp-2-x @@ -12,7 +13,7 @@ de.rwth.idsg - steve-ocpp + steve-ocpp-commons diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/AuthorizeResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/BootNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CancelReservationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CertificateSignedResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ChangeAvailabilityResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearCacheResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearChargingProfileResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearDisplayMessageResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ClearedChargingLimitResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CostUpdatedResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/CustomerInformationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DataTransferResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/DeleteCertificateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/Get15118EVCertificateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetBaseReportResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCertificateStatusResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetChargingProfilesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetCompositeScheduleResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetDisplayMessagesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLocalListVersionResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetLogResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetMonitoringReportResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetReportResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetTransactionStatusResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/GetVariablesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/HeartbeatResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/InstallCertificateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/LogStatusNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/MeterValuesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyChargingLimitResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyEventResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/NotifyReportResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReportChargingProfilesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStartTransactionResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/RequestStopTransactionResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ReserveNowResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/ResetResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SecurityEventNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SendLocalListResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetChargingProfileResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetDisplayMessageResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringBaseResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetMonitoringLevelResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetNetworkProfileResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariableMonitoringResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SetVariablesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/SignCertificateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/StatusNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TransactionEventResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/TriggerMessageResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnlockConnectorResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UnpublishFirmwareResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.0.1_part3_JSON_schemas/UpdateFirmwareResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AFRRSignalRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AFRRSignalRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AFRRSignalRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AFRRSignalRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AFRRSignalResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AFRRSignalResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AFRRSignalResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AFRRSignalResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AdjustPeriodicEventStreamRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AdjustPeriodicEventStreamRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AdjustPeriodicEventStreamRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AdjustPeriodicEventStreamRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AdjustPeriodicEventStreamResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AdjustPeriodicEventStreamResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AdjustPeriodicEventStreamResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AdjustPeriodicEventStreamResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AuthorizeRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AuthorizeRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AuthorizeRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AuthorizeRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AuthorizeResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AuthorizeResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AuthorizeResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/AuthorizeResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BatterySwapRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BatterySwapRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BatterySwapRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BatterySwapRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BatterySwapResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BatterySwapResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BatterySwapResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BatterySwapResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BootNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BootNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BootNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BootNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BootNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BootNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BootNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/BootNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CancelReservationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CancelReservationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CancelReservationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CancelReservationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CancelReservationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CancelReservationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CancelReservationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CancelReservationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CertificateSignedRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CertificateSignedRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CertificateSignedRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CertificateSignedRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CertificateSignedResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CertificateSignedResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CertificateSignedResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CertificateSignedResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeAvailabilityRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeAvailabilityRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeAvailabilityRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeAvailabilityRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeAvailabilityResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeAvailabilityResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeAvailabilityResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeAvailabilityResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeTransactionTariffRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeTransactionTariffRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeTransactionTariffRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeTransactionTariffRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeTransactionTariffResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeTransactionTariffResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeTransactionTariffResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ChangeTransactionTariffResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearCacheRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearCacheRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearCacheRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearCacheRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearCacheResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearCacheResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearCacheResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearCacheResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearChargingProfileRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearChargingProfileRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearChargingProfileRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearChargingProfileRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearChargingProfileResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearChargingProfileResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearChargingProfileResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearChargingProfileResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDERControlRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDERControlRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDERControlRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDERControlRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDERControlResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDERControlResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDERControlResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDERControlResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDisplayMessageRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDisplayMessageRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDisplayMessageRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDisplayMessageRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDisplayMessageResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDisplayMessageResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDisplayMessageResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearDisplayMessageResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearTariffsRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearTariffsRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearTariffsRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearTariffsRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearTariffsResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearTariffsResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearTariffsResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearTariffsResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearVariableMonitoringRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearVariableMonitoringResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearedChargingLimitRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearedChargingLimitRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearedChargingLimitRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearedChargingLimitRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearedChargingLimitResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearedChargingLimitResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearedChargingLimitResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClearedChargingLimitResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClosePeriodicEventStreamRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClosePeriodicEventStreamRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClosePeriodicEventStreamRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClosePeriodicEventStreamRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClosePeriodicEventStreamResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClosePeriodicEventStreamResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClosePeriodicEventStreamResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ClosePeriodicEventStreamResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CostUpdatedRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CostUpdatedRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CostUpdatedRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CostUpdatedRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CostUpdatedResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CostUpdatedResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CostUpdatedResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CostUpdatedResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CustomerInformationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CustomerInformationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CustomerInformationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CustomerInformationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CustomerInformationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CustomerInformationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CustomerInformationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/CustomerInformationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DataTransferRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DataTransferRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DataTransferRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DataTransferRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DataTransferResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DataTransferResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DataTransferResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DataTransferResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DeleteCertificateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DeleteCertificateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DeleteCertificateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DeleteCertificateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DeleteCertificateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DeleteCertificateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DeleteCertificateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/DeleteCertificateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/FirmwareStatusNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/FirmwareStatusNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/Get15118EVCertificateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/Get15118EVCertificateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/Get15118EVCertificateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/Get15118EVCertificateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/Get15118EVCertificateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/Get15118EVCertificateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/Get15118EVCertificateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/Get15118EVCertificateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetBaseReportRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetBaseReportRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetBaseReportRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetBaseReportRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetBaseReportResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetBaseReportResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetBaseReportResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetBaseReportResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateChainStatusRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateChainStatusRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateChainStatusRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateChainStatusRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateChainStatusResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateChainStatusResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateChainStatusResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateChainStatusResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateStatusRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateStatusRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateStatusRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateStatusRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateStatusResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateStatusResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateStatusResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCertificateStatusResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetChargingProfilesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetChargingProfilesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetChargingProfilesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetChargingProfilesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetChargingProfilesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetChargingProfilesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetChargingProfilesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetChargingProfilesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCompositeScheduleRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCompositeScheduleRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCompositeScheduleRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCompositeScheduleRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCompositeScheduleResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCompositeScheduleResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCompositeScheduleResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetCompositeScheduleResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDERControlRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDERControlRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDERControlRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDERControlRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDERControlResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDERControlResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDERControlResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDERControlResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDisplayMessagesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDisplayMessagesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDisplayMessagesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDisplayMessagesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDisplayMessagesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDisplayMessagesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDisplayMessagesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetDisplayMessagesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetInstalledCertificateIdsRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetInstalledCertificateIdsResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLocalListVersionRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLocalListVersionRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLocalListVersionRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLocalListVersionRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLocalListVersionResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLocalListVersionResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLocalListVersionResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLocalListVersionResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLogRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLogRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLogRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLogRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLogResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLogResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLogResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetLogResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetMonitoringReportRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetMonitoringReportRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetMonitoringReportRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetMonitoringReportRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetMonitoringReportResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetMonitoringReportResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetMonitoringReportResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetMonitoringReportResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetPeriodicEventStreamRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetPeriodicEventStreamRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetPeriodicEventStreamRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetPeriodicEventStreamRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetPeriodicEventStreamResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetPeriodicEventStreamResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetPeriodicEventStreamResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetPeriodicEventStreamResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetReportRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetReportRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetReportRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetReportRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetReportResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetReportResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetReportResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetReportResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTariffsRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTariffsRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTariffsRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTariffsRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTariffsResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTariffsResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTariffsResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTariffsResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTransactionStatusRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTransactionStatusRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTransactionStatusRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTransactionStatusRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTransactionStatusResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTransactionStatusResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTransactionStatusResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetTransactionStatusResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetVariablesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetVariablesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetVariablesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetVariablesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetVariablesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetVariablesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetVariablesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/GetVariablesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/HeartbeatRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/HeartbeatRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/HeartbeatRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/HeartbeatRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/HeartbeatResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/HeartbeatResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/HeartbeatResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/HeartbeatResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/InstallCertificateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/InstallCertificateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/InstallCertificateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/InstallCertificateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/InstallCertificateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/InstallCertificateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/InstallCertificateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/InstallCertificateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/LogStatusNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/LogStatusNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/LogStatusNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/LogStatusNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/LogStatusNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/LogStatusNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/LogStatusNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/LogStatusNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/MeterValuesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/MeterValuesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/MeterValuesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/MeterValuesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/MeterValuesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/MeterValuesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/MeterValuesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/MeterValuesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyAllowedEnergyTransferRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyAllowedEnergyTransferRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyAllowedEnergyTransferRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyAllowedEnergyTransferRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyAllowedEnergyTransferResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyAllowedEnergyTransferResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyAllowedEnergyTransferResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyAllowedEnergyTransferResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyChargingLimitRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyChargingLimitRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyChargingLimitRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyChargingLimitRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyChargingLimitResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyChargingLimitResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyChargingLimitResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyChargingLimitResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyCustomerInformationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyCustomerInformationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERAlarmRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERAlarmRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERAlarmRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERAlarmRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERAlarmResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERAlarmResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERAlarmResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERAlarmResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERStartStopRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERStartStopRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERStartStopRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERStartStopRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERStartStopResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERStartStopResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERStartStopResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDERStartStopResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDisplayMessagesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyDisplayMessagesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingNeedsRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingNeedsResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingScheduleRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEVChargingScheduleResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEventRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEventRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEventRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEventRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEventResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEventResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEventResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyEventResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyMonitoringReportRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyMonitoringReportResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPeriodicEventStream.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPeriodicEventStream.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPeriodicEventStream.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPeriodicEventStream.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPriorityChargingRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPriorityChargingRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPriorityChargingRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPriorityChargingRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPriorityChargingResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPriorityChargingResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPriorityChargingResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyPriorityChargingResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyReportRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyReportRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyReportRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyReportRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyReportResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyReportResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyReportResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyReportResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifySettlementRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifySettlementRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifySettlementRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifySettlementRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifySettlementResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifySettlementResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifySettlementResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifySettlementResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyWebPaymentStartedRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyWebPaymentStartedRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyWebPaymentStartedRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyWebPaymentStartedRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyWebPaymentStartedResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyWebPaymentStartedResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyWebPaymentStartedResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/NotifyWebPaymentStartedResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/OpenPeriodicEventStreamRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/OpenPeriodicEventStreamRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/OpenPeriodicEventStreamRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/OpenPeriodicEventStreamRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/OpenPeriodicEventStreamResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/OpenPeriodicEventStreamResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/OpenPeriodicEventStreamResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/OpenPeriodicEventStreamResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareStatusNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PublishFirmwareStatusNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PullDynamicScheduleUpdateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PullDynamicScheduleUpdateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PullDynamicScheduleUpdateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PullDynamicScheduleUpdateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PullDynamicScheduleUpdateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PullDynamicScheduleUpdateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PullDynamicScheduleUpdateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/PullDynamicScheduleUpdateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportChargingProfilesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportChargingProfilesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportChargingProfilesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportChargingProfilesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportChargingProfilesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportChargingProfilesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportChargingProfilesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportChargingProfilesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportDERControlRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportDERControlRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportDERControlRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportDERControlRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportDERControlResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportDERControlResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportDERControlResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReportDERControlResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestBatterySwapRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestBatterySwapRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestBatterySwapRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestBatterySwapRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestBatterySwapResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestBatterySwapResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestBatterySwapResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestBatterySwapResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStartTransactionRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStartTransactionRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStartTransactionRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStartTransactionRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStartTransactionResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStartTransactionResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStartTransactionResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStartTransactionResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStopTransactionRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStopTransactionRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStopTransactionRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStopTransactionRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStopTransactionResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStopTransactionResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStopTransactionResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/RequestStopTransactionResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReservationStatusUpdateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReservationStatusUpdateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReserveNowRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReserveNowRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReserveNowRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReserveNowRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReserveNowResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReserveNowResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReserveNowResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ReserveNowResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ResetRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ResetRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ResetRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ResetRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ResetResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ResetResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ResetResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/ResetResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SecurityEventNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SecurityEventNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SecurityEventNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SecurityEventNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SecurityEventNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SecurityEventNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SecurityEventNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SecurityEventNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SendLocalListRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SendLocalListRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SendLocalListRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SendLocalListRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SendLocalListResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SendLocalListResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SendLocalListResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SendLocalListResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetChargingProfileRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetChargingProfileRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetChargingProfileRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetChargingProfileRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetChargingProfileResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetChargingProfileResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetChargingProfileResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetChargingProfileResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDERControlRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDERControlRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDERControlRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDERControlRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDERControlResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDERControlResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDERControlResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDERControlResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDefaultTariffRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDefaultTariffRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDefaultTariffRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDefaultTariffRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDefaultTariffResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDefaultTariffResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDefaultTariffResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDefaultTariffResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDisplayMessageRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDisplayMessageRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDisplayMessageRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDisplayMessageRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDisplayMessageResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDisplayMessageResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDisplayMessageResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetDisplayMessageResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringBaseRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringBaseRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringBaseRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringBaseRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringBaseResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringBaseResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringBaseResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringBaseResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringLevelRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringLevelRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringLevelRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringLevelRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringLevelResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringLevelResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringLevelResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetMonitoringLevelResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetNetworkProfileRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetNetworkProfileRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetNetworkProfileRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetNetworkProfileRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetNetworkProfileResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetNetworkProfileResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetNetworkProfileResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetNetworkProfileResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariableMonitoringRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariableMonitoringRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariableMonitoringRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariableMonitoringRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariableMonitoringResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariableMonitoringResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariableMonitoringResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariableMonitoringResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariablesRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariablesRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariablesRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariablesRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariablesResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariablesResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariablesResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SetVariablesResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SignCertificateRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SignCertificateRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SignCertificateRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SignCertificateRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SignCertificateResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SignCertificateResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SignCertificateResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/SignCertificateResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/StatusNotificationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/StatusNotificationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/StatusNotificationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/StatusNotificationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/StatusNotificationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/StatusNotificationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/StatusNotificationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/StatusNotificationResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TransactionEventRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TransactionEventRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TransactionEventRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TransactionEventRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TransactionEventResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TransactionEventResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TransactionEventResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TransactionEventResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TriggerMessageRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TriggerMessageRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TriggerMessageRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TriggerMessageRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TriggerMessageResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TriggerMessageResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TriggerMessageResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/TriggerMessageResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnlockConnectorRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnlockConnectorRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnlockConnectorRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnlockConnectorRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnlockConnectorResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnlockConnectorResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnlockConnectorResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnlockConnectorResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnpublishFirmwareRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnpublishFirmwareRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnpublishFirmwareRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnpublishFirmwareRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnpublishFirmwareResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnpublishFirmwareResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnpublishFirmwareResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UnpublishFirmwareResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateDynamicScheduleRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateDynamicScheduleRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateDynamicScheduleRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateDynamicScheduleRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateDynamicScheduleResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateDynamicScheduleResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateDynamicScheduleResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateDynamicScheduleResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateFirmwareRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateFirmwareRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateFirmwareRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateFirmwareRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateFirmwareResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateFirmwareResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateFirmwareResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UpdateFirmwareResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UsePriorityChargingRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UsePriorityChargingRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UsePriorityChargingRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UsePriorityChargingRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UsePriorityChargingResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UsePriorityChargingResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UsePriorityChargingResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/UsePriorityChargingResponse.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/VatNumberValidationRequest.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/VatNumberValidationRequest.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/VatNumberValidationRequest.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/VatNumberValidationRequest.json diff --git a/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/VatNumberValidationResponse.json b/steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/VatNumberValidationResponse.json similarity index 100% rename from steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/VatNumberValidationResponse.json rename to steve-ocpp/steve-ocpp-2-x/src/main/resources/OCPP-2.1_part3_JSON_schemas/VatNumberValidationResponse.json diff --git a/steve-ocpp/README.md b/steve-ocpp/steve-ocpp-commons/README.md similarity index 100% rename from steve-ocpp/README.md rename to steve-ocpp/steve-ocpp-commons/README.md diff --git a/steve-ocpp/pom.xml b/steve-ocpp/steve-ocpp-commons/pom.xml similarity index 94% rename from steve-ocpp/pom.xml rename to steve-ocpp/steve-ocpp-commons/pom.xml index 9ff039a35..0587b4c54 100644 --- a/steve-ocpp/pom.xml +++ b/steve-ocpp/steve-ocpp-commons/pom.xml @@ -6,9 +6,10 @@ de.rwth.idsg steve-parent 3.8.0-SNAPSHOT + ../../pom.xml - steve-ocpp + steve-ocpp-commons diff --git a/steve-ocpp/src/main/java/de/rwth/idsg/ocpp/DateTimeUtils.java b/steve-ocpp/steve-ocpp-commons/src/main/java/de/rwth/idsg/ocpp/DateTimeUtils.java similarity index 100% rename from steve-ocpp/src/main/java/de/rwth/idsg/ocpp/DateTimeUtils.java rename to steve-ocpp/steve-ocpp-commons/src/main/java/de/rwth/idsg/ocpp/DateTimeUtils.java diff --git a/steve-ocpp/src/main/java/de/rwth/idsg/ocpp/jaxb/JavaDateTimeConverter.java b/steve-ocpp/steve-ocpp-commons/src/main/java/de/rwth/idsg/ocpp/jaxb/JavaDateTimeConverter.java similarity index 100% rename from steve-ocpp/src/main/java/de/rwth/idsg/ocpp/jaxb/JavaDateTimeConverter.java rename to steve-ocpp/steve-ocpp-commons/src/main/java/de/rwth/idsg/ocpp/jaxb/JavaDateTimeConverter.java diff --git a/steve-ocpp/src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java b/steve-ocpp/steve-ocpp-commons/src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java similarity index 100% rename from steve-ocpp/src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java rename to steve-ocpp/steve-ocpp-commons/src/main/java/de/rwth/idsg/ocpp/jaxb/RequestType.java diff --git a/steve-ocpp/src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java b/steve-ocpp/steve-ocpp-commons/src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java similarity index 100% rename from steve-ocpp/src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java rename to steve-ocpp/steve-ocpp-commons/src/main/java/de/rwth/idsg/ocpp/jaxb/ResponseType.java diff --git a/steve-ocpp/src/test/java/de/rwth/idsg/ocpp/jaxb/JavaDateTimeConverterTest.java b/steve-ocpp/steve-ocpp-commons/src/test/java/de/rwth/idsg/ocpp/jaxb/JavaDateTimeConverterTest.java similarity index 100% rename from steve-ocpp/src/test/java/de/rwth/idsg/ocpp/jaxb/JavaDateTimeConverterTest.java rename to steve-ocpp/steve-ocpp-commons/src/test/java/de/rwth/idsg/ocpp/jaxb/JavaDateTimeConverterTest.java diff --git a/steve-ocpp-transport-soap/pom.xml b/steve-ocpp/steve-ocpp-transport-soap/pom.xml similarity index 96% rename from steve-ocpp-transport-soap/pom.xml rename to steve-ocpp/steve-ocpp-transport-soap/pom.xml index 9bd56016c..4d108d8e3 100644 --- a/steve-ocpp-transport-soap/pom.xml +++ b/steve-ocpp/steve-ocpp-transport-soap/pom.xml @@ -5,6 +5,7 @@ de.rwth.idsg steve-parent 3.8.0-SNAPSHOT + ../../pom.xml steve-ocpp-transport-soap diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/config/OcppSoapConfiguration.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/config/OcppSoapConfiguration.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/config/OcppSoapConfiguration.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/config/OcppSoapConfiguration.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Convert.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server12to15Impl.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/converter/Server15to16Impl.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService12_SoapServer.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService15_SoapServer.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/CentralSystemService16_SoapServer.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ChargePointServiceSoapInvoker.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ChargePointServiceSoapInvoker.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ChargePointServiceSoapInvoker.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ChargePointServiceSoapInvoker.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProviderWithCache.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java diff --git a/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java b/steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java similarity index 100% rename from steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java rename to steve-ocpp/steve-ocpp-transport-soap/src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageIdInterceptor.java diff --git a/steve-ocpp-transport-websocket/pom.xml b/steve-ocpp/steve-ocpp-transport-websocket/pom.xml similarity index 97% rename from steve-ocpp-transport-websocket/pom.xml rename to steve-ocpp/steve-ocpp-transport-websocket/pom.xml index 134412e75..960cc00f0 100644 --- a/steve-ocpp-transport-websocket/pom.xml +++ b/steve-ocpp/steve-ocpp-transport-websocket/pom.xml @@ -5,6 +5,7 @@ de.rwth.idsg steve-parent 3.8.0-SNAPSHOT + ../../pom.xml steve-ocpp-transport-websocket diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/DelegatingTaskScheduler.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/DelegatingTaskScheduler.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/DelegatingTaskScheduler.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/DelegatingTaskScheduler.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/OcppWebSocketConfiguration.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/OcppWebSocketConfiguration.java similarity index 52% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/OcppWebSocketConfiguration.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/OcppWebSocketConfiguration.java index b658ee03b..3b3f82e4e 100644 --- a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/OcppWebSocketConfiguration.java +++ b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/config/OcppWebSocketConfiguration.java @@ -18,23 +18,24 @@ */ package de.rwth.idsg.steve.config; -import com.google.common.collect.Lists; -import de.rwth.idsg.steve.ocpp.ws.OcppWebSocketHandshakeHandler; -import de.rwth.idsg.steve.ocpp.ws.ocpp12.Ocpp12WebSocketEndpoint; -import de.rwth.idsg.steve.ocpp.ws.ocpp15.Ocpp15WebSocketEndpoint; -import de.rwth.idsg.steve.ocpp.ws.ocpp16.Ocpp16WebSocketEndpoint; +import de.rwth.idsg.steve.ocpp.ws.OcppWebSocketHandler; +import de.rwth.idsg.steve.ocpp.ws.OcppWebSocketHandshakeInterceptor; import de.rwth.idsg.steve.service.ChargePointRegistrationService; import de.rwth.idsg.steve.web.validation.ChargeBoxIdValidator; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.config.annotation.EnableWebSocket; import org.springframework.web.socket.config.annotation.WebSocketConfigurer; import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; +import org.springframework.web.socket.handler.TextWebSocketHandler; +import org.springframework.web.socket.server.HandshakeHandler; import org.springframework.web.socket.server.jetty.JettyRequestUpgradeStrategy; import org.springframework.web.socket.server.support.DefaultHandshakeHandler; -import java.time.Duration; +import java.util.List; /** * @author Sevket Goekay @@ -46,16 +47,10 @@ @RequiredArgsConstructor public class OcppWebSocketConfiguration implements WebSocketConfigurer { - public static final Duration PING_INTERVAL = Duration.ofMinutes(15); - public static final Duration IDLE_TIMEOUT = Duration.ofHours(2); - public static final int MAX_MSG_SIZE = 8_388_608; // 8 MB for max message size - private final ChargePointRegistrationService chargePointRegistrationService; private final ChargeBoxIdValidator chargeBoxIdValidator; - private final Ocpp12WebSocketEndpoint ocpp12WebSocketEndpoint; - private final Ocpp15WebSocketEndpoint ocpp15WebSocketEndpoint; - private final Ocpp16WebSocketEndpoint ocpp16WebSocketEndpoint; + private final List ocppWebSocketHandlers; private final SteveProperties steveProperties; @Override @@ -64,29 +59,35 @@ public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { var pathInfix = steveProperties.getPaths().getWebsocketMapping() + steveProperties.getPaths().getRouterEndpointPath() + "/"; - var handshakeHandler = new OcppWebSocketHandshakeHandler( - chargeBoxIdValidator, - createHandshakeHandler(), - Lists.newArrayList(ocpp16WebSocketEndpoint, ocpp15WebSocketEndpoint, ocpp12WebSocketEndpoint), - chargePointRegistrationService, - pathInfix); + var handshakeInterceptor = new OcppWebSocketHandshakeInterceptor( + chargeBoxIdValidator, ocppWebSocketHandlers, chargePointRegistrationService, pathInfix); + + /* + * We need some WebSocketHandler just for Spring to register it for the path. We will not use it for the actual + * operations. This instance will be passed to doHandshake(..) below. We will find the proper WebSocketEndpoint + * based on the selectedProtocol and replace the dummy one with the proper one in the subsequent call chain. + */ + registry.addHandler(dummyWebSocketHandler(), pathInfix + "*") + .setHandshakeHandler(handshakeHandler()) + .addInterceptors(handshakeInterceptor) + .setAllowedOrigins(steveProperties.getOcpp().getWs().getAllowedOriginPatterns()); + } - registry.addHandler(handshakeHandler.getDummyWebSocketHandler(), pathInfix + "*") - .setHandshakeHandler(handshakeHandler) - .setAllowedOrigins("*"); + @Bean + public WebSocketHandler dummyWebSocketHandler() { + return new TextWebSocketHandler(); } /** - * See Spring docs: - * https://docs.spring.io/spring-framework/reference/web/websocket/server.html#websocket-server-runtime-configurationCheck failure[checkstyle] src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java#L73 Check failure: [checkstyle] src/main/java/de/rwth/idsg/steve/config/WebSocketConfiguration.java#L73 Line is longer than 120 characters (found 121).build and run tests / checkstyleView detailsCode has alerts. Press enter to view. - * Otherwise, defaults come from {@link WebSocketConstants} + * See Spring docs: https://docs.spring.io/spring-framework/reference/web/websocket/server.html */ - private static DefaultHandshakeHandler createHandshakeHandler() { + @Bean + public HandshakeHandler handshakeHandler() { var strategy = new JettyRequestUpgradeStrategy(); strategy.addWebSocketConfigurer(configurable -> { - configurable.setMaxTextMessageSize(MAX_MSG_SIZE); - configurable.setIdleTimeout(IDLE_TIMEOUT); + configurable.setMaxTextMessageSize(steveProperties.getOcpp().getWs().getMaxTextMessageSize()); + configurable.setIdleTimeout(steveProperties.getOcpp().getWs().getIdleTimeout()); }); return new DefaultHandshakeHandler(strategy); diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractTypeStore.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java similarity index 95% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java index b8e4996cd..692381966 100644 --- a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java +++ b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractWebSocketEndpoint.java @@ -21,9 +21,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; import de.rwth.idsg.steve.config.DelegatingTaskScheduler; -import de.rwth.idsg.steve.config.OcppWebSocketConfiguration; +import de.rwth.idsg.steve.config.SteveProperties; import de.rwth.idsg.steve.ocpp.OcppTransport; -import de.rwth.idsg.steve.ocpp.OcppVersion; import de.rwth.idsg.steve.ocpp.ws.data.CommunicationContext; import de.rwth.idsg.steve.ocpp.ws.data.SessionContext; import de.rwth.idsg.steve.ocpp.ws.pipeline.Deserializer; @@ -43,6 +42,7 @@ import org.springframework.web.socket.WebSocketMessage; import org.springframework.web.socket.WebSocketSession; +import java.time.Duration; import java.time.Instant; import java.util.ArrayList; import java.util.Collections; @@ -55,7 +55,9 @@ * @author Sevket Goekay * @since 17.03.2015 */ -public abstract class AbstractWebSocketEndpoint extends ConcurrentWebSocketHandler implements SubProtocolCapable { +public abstract class AbstractWebSocketEndpoint extends ConcurrentWebSocketHandler + implements SubProtocolCapable, OcppWebSocketHandler { + public static final Duration PING_INTERVAL = Duration.ofMinutes(15); public static final String CHARGEBOX_ID_KEY = "CHARGEBOX_ID_KEY"; private final WebSocketLogger webSocketLogger; @@ -69,6 +71,7 @@ public abstract class AbstractWebSocketEndpoint extends ConcurrentWebSocketHandl private final Object sessionContextLock = new Object(); protected AbstractWebSocketEndpoint( + SteveProperties steveProperties, WebSocketLogger webSocketLogger, DelegatingTaskScheduler asyncTaskScheduler, OcppServerRepository ocppServerRepository, @@ -79,6 +82,7 @@ protected AbstractWebSocketEndpoint( ObjectMapper ocppMapper, TypeStore typeStore, Consumer handler) { + super(steveProperties); this.webSocketLogger = webSocketLogger; this.asyncTaskScheduler = asyncTaskScheduler; this.ocppServerRepository = ocppServerRepository; @@ -97,8 +101,6 @@ protected AbstractWebSocketEndpoint( applicationEventPublisher.publishEvent(new OcppStationWebSocketDisconnected(chargeBoxId))); } - public abstract OcppVersion getVersion(); - @Override public List getSubProtocols() { return Collections.singletonList(getVersion().getValue()); @@ -154,8 +156,8 @@ public void onOpen(WebSocketSession session) throws Exception { // the connection because of a idle timeout, we ping-pong at fixed intervals. var pingSchedule = asyncTaskScheduler.scheduleAtFixedRate( new PingTask(webSocketLogger, chargeBoxId, session), - Instant.now().plus(OcppWebSocketConfiguration.PING_INTERVAL), - OcppWebSocketConfiguration.PING_INTERVAL); + Instant.now().plus(PING_INTERVAL), + PING_INTERVAL); futureResponseContextStore.addSession(session); @@ -209,7 +211,7 @@ public boolean supportsPartialMessages() { // Helpers // ------------------------------------------------------------------------- - protected @Nullable String getChargeBoxId(WebSocketSession session) { + protected static @Nullable String getChargeBoxId(WebSocketSession session) { return (String) session.getAttributes().get(CHARGEBOX_ID_KEY); } diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceJsonInvoker.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceJsonInvoker.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceJsonInvoker.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ChargePointServiceJsonInvoker.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java similarity index 86% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java index 485d1d843..95300739a 100644 --- a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java +++ b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ConcurrentWebSocketHandler.java @@ -18,16 +18,16 @@ */ package de.rwth.idsg.steve.ocpp.ws; -import de.rwth.idsg.steve.config.OcppWebSocketConfiguration; +import de.rwth.idsg.steve.config.SteveProperties; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketMessage; import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator; +import java.time.Duration; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; /** * @author Sevket Goekay @@ -35,10 +35,14 @@ */ public abstract class ConcurrentWebSocketHandler implements WebSocketHandler { - private static final int SEND_TIME_LIMIT = (int) TimeUnit.SECONDS.toMillis(10); - private static final int BUFFER_SIZE_LIMIT = 5 * OcppWebSocketConfiguration.MAX_MSG_SIZE; - private final Map sessions = new ConcurrentHashMap<>(); + private final Duration sendTimeLimit; + private final int bufferSizeLimit; + + protected ConcurrentWebSocketHandler(SteveProperties steveProperties) { + sendTimeLimit = steveProperties.getOcpp().getWs().getSendTimeLimit(); + bufferSizeLimit = steveProperties.getOcpp().getWs().getBufferSizeLimit(); + } @Override public void afterConnectionEstablished(WebSocketSession session) throws Exception { @@ -63,7 +67,7 @@ public void afterConnectionClosed(WebSocketSession session, CloseStatus closeSta private ConcurrentWebSocketSessionDecorator internalGet(WebSocketSession session) { return sessions.computeIfAbsent( session.getId(), - s -> new ConcurrentWebSocketSessionDecorator(session, SEND_TIME_LIMIT, BUFFER_SIZE_LIMIT)); + s -> new ConcurrentWebSocketSessionDecorator(session, (int) sendTimeLimit.toMillis(), bufferSizeLimit)); } // ------------------------------------------------------------------------- diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ErrorFactory.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStore.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/FutureResponseContextStoreImpl.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/InvocationContext.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/InvocationContext.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/InvocationContext.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/InvocationContext.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/JsonObjectMapper.java diff --git a/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandler.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandler.java new file mode 100644 index 000000000..4ee9076ed --- /dev/null +++ b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandler.java @@ -0,0 +1,27 @@ +/* + * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve + * Copyright (C) 2013-2025 SteVe Community Team + * All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package de.rwth.idsg.steve.ocpp.ws; + +import de.rwth.idsg.steve.ocpp.OcppVersion; +import org.springframework.web.socket.WebSocketHandler; + +public interface OcppWebSocketHandler extends WebSocketHandler { + + OcppVersion getVersion(); +} diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeInterceptor.java similarity index 80% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeInterceptor.java index 0ec05b133..86597aed0 100644 --- a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java +++ b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeInterceptor.java @@ -30,10 +30,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketHttpHeaders; -import org.springframework.web.socket.handler.TextWebSocketHandler; -import org.springframework.web.socket.server.HandshakeFailureException; -import org.springframework.web.socket.server.HandshakeHandler; -import org.springframework.web.socket.server.support.DefaultHandshakeHandler; +import org.springframework.web.socket.server.HandshakeInterceptor; import java.util.List; import java.util.Map; @@ -44,31 +41,20 @@ */ @Slf4j @RequiredArgsConstructor -public class OcppWebSocketHandshakeHandler implements HandshakeHandler { +public class OcppWebSocketHandshakeInterceptor implements HandshakeInterceptor { private final ChargeBoxIdValidator chargeBoxIdValidator; - private final DefaultHandshakeHandler delegate; - private final List endpoints; + private final List endpoints; private final ChargePointRegistrationService chargePointRegistrationService; private final String pathInfix; - /** - * We need some WebSocketHandler just for Spring to register it for the path. We will not use it for the actual - * operations. This instance will be passed to doHandshake(..) below. We will find the proper WebSocketEndpoint - * based on the selectedProtocol and replace the dummy one with the proper one in the subsequent call chain. - */ - public WebSocketHandler getDummyWebSocketHandler() { - return new TextWebSocketHandler(); - } - @Override - public boolean doHandshake( + public boolean beforeHandshake( ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) - throws HandshakeFailureException { - + throws Exception { // ------------------------------------------------------------------------- // 1. Check the chargeBoxId // ------------------------------------------------------------------------- @@ -119,10 +105,19 @@ public boolean doHandshake( "ChargeBoxId '{}' will be using {}", chargeBoxId, endpoint.getClass().getSimpleName()); - return delegate.doHandshake(request, response, endpoint, attributes); + return true; + } + + @Override + public void afterHandshake( + ServerHttpRequest request, + ServerHttpResponse response, + WebSocketHandler wsHandler, + @Nullable Exception exception) { + // Nothing to do here } - private @Nullable AbstractWebSocketEndpoint selectEndpoint(List requestedProtocols) { + private @Nullable OcppWebSocketHandler selectEndpoint(List requestedProtocols) { for (var requestedProtocol : requestedProtocols) { for (var item : endpoints) { if (item.getVersion().getValue().equals(requestedProtocol)) { diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/PingTask.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStore.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/SessionContextStoreImpl.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/TypeStore.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/WebSocketLogger.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModule.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModule.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModule.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModule.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumMixin.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/EnumProcessor.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Deserializer.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/MeterValue15Mixin.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategy.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/custom/WsSessionSelectStrategyEnum.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/AbstractOcppJsonMessage.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/AbstractOcppJsonMessage.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/AbstractOcppJsonMessage.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/AbstractOcppJsonMessage.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ActionResponsePair.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/CommunicationContext.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/ErrorCode.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/FutureResponseContext.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/MessageType.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonCall.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonError.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonMessage.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResponse.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/OcppJsonResult.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/data/SessionContext.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java similarity index 97% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java index 6f1669b5e..687797a11 100644 --- a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java +++ b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12WebSocketEndpoint.java @@ -22,6 +22,7 @@ import de.rwth.idsg.ocpp.jaxb.RequestType; import de.rwth.idsg.ocpp.jaxb.ResponseType; import de.rwth.idsg.steve.config.DelegatingTaskScheduler; +import de.rwth.idsg.steve.config.SteveProperties; import de.rwth.idsg.steve.ocpp.OcppProtocol; import de.rwth.idsg.steve.ocpp.OcppVersion; import de.rwth.idsg.steve.ocpp.soap.CentralSystemService12_SoapServer; @@ -54,6 +55,7 @@ public class Ocpp12WebSocketEndpoint extends AbstractWebSocketEndpoint { public Ocpp12WebSocketEndpoint( + SteveProperties steveProperties, WebSocketLogger webSocketLogger, DelegatingTaskScheduler asyncTaskScheduler, OcppServerRepository ocppServerRepository, @@ -65,6 +67,7 @@ public Ocpp12WebSocketEndpoint( CentralSystemService12_SoapServer ocpp12Server, Ocpp12TypeStore ocpp12TypeStore) { super( + steveProperties, webSocketLogger, asyncTaskScheduler, ocppServerRepository, diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java similarity index 97% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java index 9e7625ad4..d8c3292f5 100644 --- a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java +++ b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15WebSocketEndpoint.java @@ -22,6 +22,7 @@ import de.rwth.idsg.ocpp.jaxb.RequestType; import de.rwth.idsg.ocpp.jaxb.ResponseType; import de.rwth.idsg.steve.config.DelegatingTaskScheduler; +import de.rwth.idsg.steve.config.SteveProperties; import de.rwth.idsg.steve.ocpp.OcppProtocol; import de.rwth.idsg.steve.ocpp.OcppVersion; import de.rwth.idsg.steve.ocpp.soap.CentralSystemService15_SoapServer; @@ -55,6 +56,7 @@ public class Ocpp15WebSocketEndpoint extends AbstractWebSocketEndpoint { public Ocpp15WebSocketEndpoint( + SteveProperties steveProperties, WebSocketLogger webSocketLogger, DelegatingTaskScheduler asyncTaskScheduler, OcppServerRepository ocppServerRepository, @@ -66,6 +68,7 @@ public Ocpp15WebSocketEndpoint( CentralSystemService15_SoapServer ocpp15Server, Ocpp15TypeStore ocpp15TypeStore) { super( + steveProperties, webSocketLogger, asyncTaskScheduler, ocppServerRepository, diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java similarity index 97% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java index 2e547ca29..64c1a1727 100644 --- a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java +++ b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16WebSocketEndpoint.java @@ -22,6 +22,7 @@ import de.rwth.idsg.ocpp.jaxb.RequestType; import de.rwth.idsg.ocpp.jaxb.ResponseType; import de.rwth.idsg.steve.config.DelegatingTaskScheduler; +import de.rwth.idsg.steve.config.SteveProperties; import de.rwth.idsg.steve.ocpp.OcppProtocol; import de.rwth.idsg.steve.ocpp.OcppVersion; import de.rwth.idsg.steve.ocpp.soap.CentralSystemService16_SoapServer; @@ -55,6 +56,7 @@ public class Ocpp16WebSocketEndpoint extends AbstractWebSocketEndpoint { public Ocpp16WebSocketEndpoint( + SteveProperties steveProperties, WebSocketLogger webSocketLogger, DelegatingTaskScheduler asyncTaskScheduler, OcppServerRepository ocppServerRepository, @@ -66,6 +68,7 @@ public Ocpp16WebSocketEndpoint( CentralSystemService16_SoapServer ocpp16Server, Ocpp16TypeStore ocpp16TypeStore) { super( + steveProperties, webSocketLogger, asyncTaskScheduler, ocppServerRepository, diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/AbstractCallHandler.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Deserializer.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/IncomingPipeline.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingCallPipeline.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Sender.java diff --git a/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java b/steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java similarity index 100% rename from steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/Serializer.java diff --git a/steve/src/test/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandlerTest.java b/steve-ocpp/steve-ocpp-transport-websocket/src/test/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeInterceptorTest.java similarity index 75% rename from steve/src/test/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandlerTest.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/test/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeInterceptorTest.java index a5e130fe3..d6960b0c9 100644 --- a/steve/src/test/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandlerTest.java +++ b/steve-ocpp/steve-ocpp-transport-websocket/src/test/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeInterceptorTest.java @@ -22,77 +22,77 @@ import static org.assertj.core.api.Assertions.assertThat; -public class OcppWebSocketHandshakeHandlerTest { +public class OcppWebSocketHandshakeInterceptorTest { private static final String PATH_INFIX = "/steve/websocket/CentralSystemService/"; @Test public void testGetLastBitFromUrl_empty() { var in = ""; - var out = OcppWebSocketHandshakeHandler.getLastBitFromUrl(PATH_INFIX, in); + var out = OcppWebSocketHandshakeInterceptor.getLastBitFromUrl(PATH_INFIX, in); assertThat(out).isEmpty(); } @Test public void testGetLastBitFromUrl_null() { String in = null; - var out = OcppWebSocketHandshakeHandler.getLastBitFromUrl(PATH_INFIX, in); + var out = OcppWebSocketHandshakeInterceptor.getLastBitFromUrl(PATH_INFIX, in); assertThat(out).isEmpty(); } @Test public void testGetLastBitFromUrl_successFull() { var in = "https://www.google.com/steve/websocket/CentralSystemService/BBEI12"; - var out = OcppWebSocketHandshakeHandler.getLastBitFromUrl(PATH_INFIX, in); + var out = OcppWebSocketHandshakeInterceptor.getLastBitFromUrl(PATH_INFIX, in); assertThat(out).isEqualTo("BBEI12"); } @Test public void testGetLastBitFromUrl_noPostfix() { var in = "/steve/websocket/CentralSystemService/"; - var out = OcppWebSocketHandshakeHandler.getLastBitFromUrl(PATH_INFIX, in); + var out = OcppWebSocketHandshakeInterceptor.getLastBitFromUrl(PATH_INFIX, in); assertThat(out).isEmpty(); } @Test public void testGetLastBitFromUrl_successPartial() { var in = "/steve/websocket/CentralSystemService/BBEI12"; - var out = OcppWebSocketHandshakeHandler.getLastBitFromUrl(PATH_INFIX, in); + var out = OcppWebSocketHandshakeInterceptor.getLastBitFromUrl(PATH_INFIX, in); assertThat(out).isEqualTo("BBEI12"); } @Test public void testGetLastBitFromUrl_successWithPercent() { var in = "/steve/websocket/CentralSystemService/BBE%I12"; - var out = OcppWebSocketHandshakeHandler.getLastBitFromUrl(PATH_INFIX, in); + var out = OcppWebSocketHandshakeInterceptor.getLastBitFromUrl(PATH_INFIX, in); assertThat(out).isEqualTo("BBE%I12"); } @Test public void testGetLastBitFromUrl_successWithDash() { var in = "/steve/websocket/CentralSystemService/BBE-I12"; - var out = OcppWebSocketHandshakeHandler.getLastBitFromUrl(PATH_INFIX, in); + var out = OcppWebSocketHandshakeInterceptor.getLastBitFromUrl(PATH_INFIX, in); assertThat(out).isEqualTo("BBE-I12"); } @Test public void testGetLastBitFromUrl_successWithSpace() { var in = "/steve/websocket/CentralSystemService/BBE I12"; - var out = OcppWebSocketHandshakeHandler.getLastBitFromUrl(PATH_INFIX, in); + var out = OcppWebSocketHandshakeInterceptor.getLastBitFromUrl(PATH_INFIX, in); assertThat(out).isEqualTo("BBE I12"); } @Test public void testGetLastBitFromUrl_successWithExtraSlash() { var in = "/steve/websocket/CentralSystemService/889/BBEI12"; - var out = OcppWebSocketHandshakeHandler.getLastBitFromUrl(PATH_INFIX, in); + var out = OcppWebSocketHandshakeInterceptor.getLastBitFromUrl(PATH_INFIX, in); assertThat(out).isEqualTo("889/BBEI12"); } @Test public void testGetLastBitFromUrl_successComplex() { var in = "/steve/websocket/CentralSystemService/%889 /BBEI12-"; - var out = OcppWebSocketHandshakeHandler.getLastBitFromUrl(PATH_INFIX, in); + var out = OcppWebSocketHandshakeInterceptor.getLastBitFromUrl(PATH_INFIX, in); assertThat(out).isEqualTo("%889 /BBEI12-"); } } diff --git a/steve-ocpp-transport-websocket/src/test/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModuleTest.java b/steve-ocpp/steve-ocpp-transport-websocket/src/test/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModuleTest.java similarity index 100% rename from steve-ocpp-transport-websocket/src/test/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModuleTest.java rename to steve-ocpp/steve-ocpp-transport-websocket/src/test/java/de/rwth/idsg/steve/ocpp/ws/custom/CustomStringModuleTest.java diff --git a/steve-ui-jsp/pom.xml b/steve-ui/steve-ui-jsp/pom.xml similarity index 98% rename from steve-ui-jsp/pom.xml rename to steve-ui/steve-ui-jsp/pom.xml index f0fb9a319..b2c699ba3 100644 --- a/steve-ui-jsp/pom.xml +++ b/steve-ui/steve-ui-jsp/pom.xml @@ -5,6 +5,7 @@ de.rwth.idsg steve-parent 3.8.0-SNAPSHOT + ../../pom.xml steve-ui-jsp diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/config/JspConfiguration.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/config/JspConfiguration.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/config/JspConfiguration.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/config/JspConfiguration.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/ControllerHelper.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/WebDateTimeUtils.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/WebDateTimeUtils.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/WebDateTimeUtils.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/utils/WebDateTimeUtils.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/BatchInsertConverter.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/ChargePointSelectEditor.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/GlobalControllerAdvice.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/InstantEditor.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/InstantEditor.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/InstantEditor.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/InstantEditor.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/LocalDateEditor.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/AboutSettingsController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/AjaxCallController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ChargePointsController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ChargingProfilesController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/HomeController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/LogController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/NoAccessController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/NoAccessController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/NoAccessController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/NoAccessController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp12Controller.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp15Controller.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/Ocpp16Controller.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/OcppTagsController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ReservationsController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ReservationsController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ReservationsController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/ReservationsController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/RootRedirectController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/RootRedirectController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/RootRedirectController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/RootRedirectController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/SignInOutController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/SignInOutController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/SignInOutController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/SignInOutController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/TasksController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/TasksController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/TasksController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/TasksController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/WebUsersController.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/WebUsersController.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/WebUsersController.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/controller/WebUsersController.java diff --git a/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java b/steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java similarity index 100% rename from steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java rename to steve-ui/steve-ui-jsp/src/main/java/de/rwth/idsg/steve/web/dto/EndpointInfo.java diff --git a/steve-ui-jsp/src/main/resources/META-INF/datetime.tld b/steve-ui/steve-ui-jsp/src/main/resources/META-INF/datetime.tld similarity index 100% rename from steve-ui-jsp/src/main/resources/META-INF/datetime.tld rename to steve-ui/steve-ui-jsp/src/main/resources/META-INF/datetime.tld diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-context.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-context.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/00-context.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-context.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-cp-multiple.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-cp-multiple.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/00-cp-multiple.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-cp-multiple.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-cp-single.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-cp-single.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/00-cp-single.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-cp-single.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-error.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-error.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/00-error.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-error.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-footer.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-footer.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/00-footer.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-footer.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-header.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-header.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/00-header.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-header.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-op-bind-errors.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-op-bind-errors.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/00-op-bind-errors.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/00-op-bind-errors.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/GetConfigurationResponse.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/GetConfigurationResponse.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/GetConfigurationResponse.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/GetConfigurationResponse.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/about.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/about.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/about.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/about.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/connectorStatus.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/connectorStatus.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/connectorStatus.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/connectorStatus.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-address.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-address.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-address.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-address.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-charging-profile.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-charging-profile.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-charging-profile.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-charging-profile.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-cp-misc.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-cp-misc.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-cp-misc.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-cp-misc.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-ocppTag.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-ocppTag.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-ocppTag.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-ocppTag.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-user-ocpp.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-user-profile.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-user-profile.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-user-profile.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/00-user-profile.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepointAdd.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepointAdd.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepointAdd.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepointAdd.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepointDetails.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepointDetails.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepointDetails.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepointDetails.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepoints.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepoints.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepoints.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargepoints.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileAdd.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileAssignments.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfileDetails.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfiles.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfiles.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfiles.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/chargingProfiles.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTagAdd.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTagDetails.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTags.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTags.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTags.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/ocppTags.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/reservations.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/reservations.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/reservations.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/reservations.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/transactionDetails.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/transactionDetails.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/transactionDetails.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/transactionDetails.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/transactions.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/transactions.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/transactions.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/transactions.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/userAdd.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/userAdd.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/userAdd.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/userAdd.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/userDetails.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/userDetails.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/userDetails.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/userDetails.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/users.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/users.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/users.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/users.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserAdd.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserAdd.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserAdd.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserAdd.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserApiPassword.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserApiPassword.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserApiPassword.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserApiPassword.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserDetails.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserDetails.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserDetails.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserDetails.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserPassword.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserPassword.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserPassword.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webuserPassword.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webusers.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webusers.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webusers.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/data-man/webusers.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/home.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/home.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/home.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/home.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/noAccess.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/noAccess.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/noAccess.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/noAccess.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/ocppJsonStatus.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/ocppJsonStatus.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/ocppJsonStatus.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/ocppJsonStatus.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/CancelReservationForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ChangeAvailabilityForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ChangeConfigurationForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ClearCacheForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ClearChargingProfileForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/DataTransferForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetCompositeScheduleForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetConfigurationForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetDiagnosticsForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/GetLocalListForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/RemoteStartTransactionForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/RemoteStopTransactionForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ReserveNowForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ResetForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ResetForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ResetForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/ResetForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/SendLocalListForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/SetChargingProfileForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/TriggerMessageForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/UnlockConnectorForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op-forms/UpdateFirmwareForm.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ChangeAvailability.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ChangeAvailability.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ChangeAvailability.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ChangeAvailability.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ChangeConfiguration.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ClearCache.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ClearCache.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ClearCache.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/ClearCache.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/GetDiagnostics.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/GetDiagnostics.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/GetDiagnostics.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/GetDiagnostics.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/RemoteStartTransaction.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/RemoteStopTransaction.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/Reset.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/Reset.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/Reset.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/Reset.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/UnlockConnector.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/UnlockConnector.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/UnlockConnector.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/UnlockConnector.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/UpdateFirmware.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/UpdateFirmware.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/UpdateFirmware.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op12/UpdateFirmware.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/CancelReservation.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/CancelReservation.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/CancelReservation.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/CancelReservation.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ChangeAvailability.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ChangeAvailability.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ChangeAvailability.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ChangeAvailability.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ChangeConfiguration.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ClearCache.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ClearCache.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ClearCache.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ClearCache.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/DataTransfer.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/DataTransfer.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/DataTransfer.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/DataTransfer.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetConfiguration.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetConfiguration.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetConfiguration.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetConfiguration.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetDiagnostics.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetDiagnostics.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetDiagnostics.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetDiagnostics.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/GetLocalListVersion.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/RemoteStartTransaction.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/RemoteStopTransaction.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ReserveNow.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ReserveNow.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ReserveNow.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/ReserveNow.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/Reset.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/Reset.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/Reset.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/Reset.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/SendLocalList.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/SendLocalList.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/SendLocalList.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/SendLocalList.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/UnlockConnector.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/UnlockConnector.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/UnlockConnector.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/UnlockConnector.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/UpdateFirmware.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/UpdateFirmware.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/UpdateFirmware.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op15/UpdateFirmware.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/CancelReservation.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/CancelReservation.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/CancelReservation.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/CancelReservation.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ChangeAvailability.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ChangeAvailability.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ChangeAvailability.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ChangeAvailability.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ChangeConfiguration.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ClearCache.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ClearCache.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ClearCache.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ClearCache.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ClearChargingProfile.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/DataTransfer.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/DataTransfer.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/DataTransfer.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/DataTransfer.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetCompositeSchedule.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetCompositeScheduleResponse.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetConfiguration.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetConfiguration.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetConfiguration.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetConfiguration.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetDiagnostics.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetDiagnostics.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetDiagnostics.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetDiagnostics.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/GetLocalListVersion.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/RemoteStartTransaction.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/RemoteStopTransaction.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ReserveNow.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ReserveNow.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ReserveNow.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/ReserveNow.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/Reset.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/Reset.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/Reset.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/Reset.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/SendLocalList.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/SendLocalList.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/SendLocalList.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/SendLocalList.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/SetChargingProfile.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/SetChargingProfile.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/SetChargingProfile.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/SetChargingProfile.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/TriggerMessage.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/TriggerMessage.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/TriggerMessage.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/TriggerMessage.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/UnlockConnector.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/UnlockConnector.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/UnlockConnector.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/UnlockConnector.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/UpdateFirmware.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/UpdateFirmware.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/UpdateFirmware.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/op16/UpdateFirmware.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/settings.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/settings.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/settings.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/settings.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/signin.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/signin.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/signin.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/signin.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/clearChargingProfile.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/clearChargingProfile.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/clearChargingProfile.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/clearChargingProfile.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/confKeySelect.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/confKeySelect.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/confKeySelect.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/confKeySelect.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/datePicker-past.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/datePicker-past.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/datePicker-past.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/datePicker-past.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker-future.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker-future.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker-future.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker-future.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker-past.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker-past.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker-past.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker-past.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/dateTimePicker.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getConnectorIds.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getConnectorIds.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getConnectorIds.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getConnectorIds.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getConnectorIdsZeroAllowed.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getConnectorIdsZeroAllowed.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getConnectorIdsZeroAllowed.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getConnectorIdsZeroAllowed.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getReservationIds.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getReservationIds.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getReservationIds.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getReservationIds.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getTransactionIds.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getTransactionIds.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getTransactionIds.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/getTransactionIds.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/periodTypeSelect.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/periodTypeSelect.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/periodTypeSelect.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/periodTypeSelect.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/schedulePeriodsTable.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/schedulePeriodsTable.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/schedulePeriodsTable.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/schedulePeriodsTable.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/sendLocalList.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/sendLocalList.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/sendLocalList.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/sendLocalList.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/sortable.js b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/sortable.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/sortable.js rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/snippets/sortable.js diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/taskResult.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/taskResult.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/taskResult.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/taskResult.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/views/tasks.jsp b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/tasks.jsp similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/views/tasks.jsp rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/views/tasks.jsp diff --git a/steve-ui-jsp/src/main/webapp/WEB-INF/web.xml b/steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from steve-ui-jsp/src/main/webapp/WEB-INF/web.xml rename to steve-ui/steve-ui-jsp/src/main/webapp/WEB-INF/web.xml diff --git a/steve-ui-jsp/src/main/webapp/static/css/DroidSerif.ttf b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/DroidSerif.ttf similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/DroidSerif.ttf rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/DroidSerif.ttf diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_flat_10_000000_40x100.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_flat_10_000000_40x100.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_flat_10_000000_40x100.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_flat_10_000000_40x100.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_65_ffffff_1x400.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_65_ffffff_1x400.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_222222_256x240.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_222222_256x240.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_222222_256x240.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_222222_256x240.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_228ef1_256x240.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_228ef1_256x240.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_228ef1_256x240.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_228ef1_256x240.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ef8c08_256x240.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ef8c08_256x240.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ef8c08_256x240.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ef8c08_256x240.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ffd27a_256x240.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ffd27a_256x240.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ffd27a_256x240.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ffd27a_256x240.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ffffff_256x240.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ffffff_256x240.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ffffff_256x240.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/images/ui-icons_ffffff_256x240.png diff --git a/steve-ui-jsp/src/main/webapp/static/css/jquery-ui-timepicker-addon.min.css b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/jquery-ui-timepicker-addon.min.css similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/jquery-ui-timepicker-addon.min.css rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/jquery-ui-timepicker-addon.min.css diff --git a/steve-ui-jsp/src/main/webapp/static/css/jquery-ui.min.css b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/jquery-ui.min.css similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/jquery-ui.min.css rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/jquery-ui.min.css diff --git a/steve-ui-jsp/src/main/webapp/static/css/style.css b/steve-ui/steve-ui-jsp/src/main/webapp/static/css/style.css similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/css/style.css rename to steve-ui/steve-ui-jsp/src/main/webapp/static/css/style.css diff --git a/steve-ui-jsp/src/main/webapp/static/images/favicon.ico b/steve-ui/steve-ui-jsp/src/main/webapp/static/images/favicon.ico similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/images/favicon.ico rename to steve-ui/steve-ui-jsp/src/main/webapp/static/images/favicon.ico diff --git a/steve-ui-jsp/src/main/webapp/static/images/info.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/images/info.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/images/info.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/images/info.png diff --git a/steve-ui-jsp/src/main/webapp/static/images/logo.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/images/logo.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/images/logo.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/images/logo.png diff --git a/steve-ui-jsp/src/main/webapp/static/images/logo2.png b/steve-ui/steve-ui-jsp/src/main/webapp/static/images/logo2.png similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/images/logo2.png rename to steve-ui/steve-ui-jsp/src/main/webapp/static/images/logo2.png diff --git a/steve-ui-jsp/src/main/webapp/static/images/offline-icon.svg b/steve-ui/steve-ui-jsp/src/main/webapp/static/images/offline-icon.svg similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/images/offline-icon.svg rename to steve-ui/steve-ui-jsp/src/main/webapp/static/images/offline-icon.svg diff --git a/steve-ui-jsp/src/main/webapp/static/js/jquery-2.0.3.min.js b/steve-ui/steve-ui-jsp/src/main/webapp/static/js/jquery-2.0.3.min.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/js/jquery-2.0.3.min.js rename to steve-ui/steve-ui-jsp/src/main/webapp/static/js/jquery-2.0.3.min.js diff --git a/steve-ui-jsp/src/main/webapp/static/js/jquery-ui-timepicker-addon.min.js b/steve-ui/steve-ui-jsp/src/main/webapp/static/js/jquery-ui-timepicker-addon.min.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/js/jquery-ui-timepicker-addon.min.js rename to steve-ui/steve-ui-jsp/src/main/webapp/static/js/jquery-ui-timepicker-addon.min.js diff --git a/steve-ui-jsp/src/main/webapp/static/js/jquery-ui.min.js b/steve-ui/steve-ui-jsp/src/main/webapp/static/js/jquery-ui.min.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/js/jquery-ui.min.js rename to steve-ui/steve-ui-jsp/src/main/webapp/static/js/jquery-ui.min.js diff --git a/steve-ui-jsp/src/main/webapp/static/js/script.js b/steve-ui/steve-ui-jsp/src/main/webapp/static/js/script.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/js/script.js rename to steve-ui/steve-ui-jsp/src/main/webapp/static/js/script.js diff --git a/steve-ui-jsp/src/main/webapp/static/js/stupidtable.min.js b/steve-ui/steve-ui-jsp/src/main/webapp/static/js/stupidtable.min.js similarity index 100% rename from steve-ui-jsp/src/main/webapp/static/js/stupidtable.min.js rename to steve-ui/steve-ui-jsp/src/main/webapp/static/js/stupidtable.min.js diff --git a/steve-ui-jsp/src/test/java/de/rwth/idsg/steve/web/InstantEditorTest.java b/steve-ui/steve-ui-jsp/src/test/java/de/rwth/idsg/steve/web/InstantEditorTest.java similarity index 100% rename from steve-ui-jsp/src/test/java/de/rwth/idsg/steve/web/InstantEditorTest.java rename to steve-ui/steve-ui-jsp/src/test/java/de/rwth/idsg/steve/web/InstantEditorTest.java diff --git a/steve/src/main/resources/application.yml b/steve/src/main/resources/application.yml index c706262d4..fcaae1c7b 100644 --- a/steve/src/main/resources/application.yml +++ b/steve/src/main/resources/application.yml @@ -83,3 +83,9 @@ steve: # de.rwth.idsg.steve.web.validation.ChargeBoxIdValidator.REGEX to validate the format of the chargeBoxId values # charge-box-id-validation-regex: + + ws: + max-text-message-size: 8388608 # 8 MiB + idle-timeout: 2h + allowed-origin-patterns: + - "*"