diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/RISE-V2G-Certificates/copyNewCertsAndKeys.sh b/RISE-V2G-Certificates/copyNewCertsAndKeys.sh index 42a93e2..ed95206 100644 --- a/RISE-V2G-Certificates/copyNewCertsAndKeys.sh +++ b/RISE-V2G-Certificates/copyNewCertsAndKeys.sh @@ -1,11 +1,11 @@ # This is a useful small shell script to automatically copy the Java Keystores (.jks files), .p12 containers and the DER encoded Mobility Operator Sub-CA private key to the places in the RISE V2G project where they belong. Execute this script after you executed the generateCertificates.sh script. -cp keystores/evccKeystore.jks ../RISE-V2G-EVCC -cp keystores/evccTruststore.jks ../RISE-V2G-EVCC -cp keystores/seccKeystore.jks ../RISE-V2G-SECC -cp keystores/seccTruststore.jks ../RISE-V2G-SECC +cp keystores/evccKeystore.jks ../RISE-V2G-EVCC/ +cp keystores/evccTruststore.jks ../RISE-V2G-EVCC/ +cp keystores/seccKeystore.jks ../RISE-V2G-SECC/ +cp keystores/seccTruststore.jks ../RISE-V2G-SECC/ -cp certs/cpsCertChain.p12 ../RISE-V2G-SECC -cp certs/moCertChain.p12 ../RISE-V2G-SECC +cp certs/cpsCertChain.p12 ../RISE-V2G-SECC/ +cp certs/moCertChain.p12 ../RISE-V2G-SECC/ -cp privateKeys/moSubCA2.pkcs8.der ../RISE-V2G-SECC \ No newline at end of file +cp privateKeys/moSubCA2.pkcs8.der ../RISE-V2G-SECC/ \ No newline at end of file diff --git a/RISE-V2G-Certificates/generateCertificates.bat b/RISE-V2G-Certificates/generateCertificates.bat index 04eaa60..0f708ef 100644 --- a/RISE-V2G-Certificates/generateCertificates.bat +++ b/RISE-V2G-Certificates/generateCertificates.bat @@ -2,7 +2,7 @@ REM ******************************************************************************* REM The MIT License (MIT) REM -REM Copyright (c) 2015-207 V2G Clarity (Dr.-Ing. Marc Mültin) +REM Copyright (c) 2015-2017 V2G Clarity (Dr. Marc Mültin) REM REM Permission is hereby granted, free of charge, to any person obtaining a copy REM of this software and associated documentation files (the "Software"), to deal @@ -23,16 +23,19 @@ REM OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN REM THE SOFTWARE. REM ******************************************************************************* +REM =========================================================================================================== REM This shell script can be used to create all necessary certificates and keystores needed in order to REM - successfully perform a TLS handshake between the EVCC (TLSClient) and the SECC (TLSServer) and REM - install/update a contract certificate in the EVCC. -REM Previously created certificates should have been provided with the respective release of the RISE V2G project for testing purposes. However, certain certificates might not be valid any more in which case you need to create new certificates. +REM REM This file shall serve you with all information needed to create your own certificate chains. REM REM Helpful information about using openssl is provided by Ivan Ristic's book "Bulletproof SSL and TLS". -REM Furthermore, you should have openssl 1.0.2 (or above) installed to comply with all security requirements imposed by ISO 15118. For example, openssl 0.9.8 does not come with SHA-2 for SHA-256 signature algorithms. Some MacOS X installations unfortunately still use openssl < v1.0.2. You could use Homebrew to install openssl. Be aware that you probably then need to use an absolute path for your openssl commands, such as /usr/local/Cellar/openssl/1.0.2h_1/bin/openssl (for linux based systems). +REM Furthermore, you should have openssl 1.0.2 (or above) installed to comply with all security requirements +REM imposed by ISO 15118. For example, openssl 0.9.8 does not come with SHA-2 for SHA-256 signature algorithms. REM -REM Author: Marc Mültin (marc.mueltin@v2g-clarity.com) +REM Author: Dr. Marc Mültin (marc.mueltin@v2g-clarity.com) +REM =========================================================================================================== REM Some variables to create different outcomes of the PKI for testing purposes. Change the validity periods (given in number of days) to test @@ -56,7 +59,8 @@ SET validity_oem_root_cert=3650 SET validity_mo_root_cert=3650 -REM 0) Create directories if not yet existing +REM 0) Create directories if not yet existing. The keystores in the keystores folder (if existing) need to be deleted at first, so delete the complete folder. +if exist keystores rd /s /q keystores if not exist certs mkdir certs if not exist csrs mkdir csrs if not exist keystores mkdir keystores diff --git a/RISE-V2G-Certificates/generateCertificates.sh b/RISE-V2G-Certificates/generateCertificates.sh index ec3964d..e8165db 100644 --- a/RISE-V2G-Certificates/generateCertificates.sh +++ b/RISE-V2G-Certificates/generateCertificates.sh @@ -1,7 +1,7 @@ #******************************************************************************* # The MIT License (MIT) # -# Copyright (c) 2015-207 V2G Clarity (Dr.-Ing. Marc Mültin) +# Copyright (c) 2015-207 V2G Clarity (Dr. Marc Mültin) # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -21,16 +21,23 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. #******************************************************************************* + +# =============================================================================================================== # This shell script can be used to create all necessary certificates and keystores needed in order to # - successfully perform a TLS handshake between the EVCC (TLSClient) and the SECC (TLSServer) and # - install/update a contract certificate in the EVCC. -# Previously created certificates should have been provided with the respective release of the RISE V2G project for testing purposes. However, certain certificates might not be valid any more in which case you need to create new certificates. +# # This file shall serve you with all information needed to create your own certificate chains. # # Helpful information about using openssl is provided by Ivan Ristic's book "Bulletproof SSL and TLS". -# Furthermore, you should have openssl 1.0.2 (or above) installed to comply with all security requirements imposed by ISO 15118. For example, openssl 0.9.8 does not come with SHA-2 for SHA-256 signature algorithms. Some MacOS X installations unfortunately still use openssl < v1.0.2. You could use Homebrew to install openssl. Be aware that you probably then need to use an absolute path for your openssl commands, such as /usr/local/Cellar/openssl/1.0.2h_1/bin/openssl. +# Furthermore, you should have openssl 1.0.2 (or above) installed to comply with all security requirements +# imposed by ISO 15118. For example, openssl 0.9.8 does not come with SHA-2 for SHA-256 signature algorithms. +# Some MacOS X installations unfortunately still use openssl < v1.0.2. You could use Homebrew to install openssl. +# Be aware that you probably then need to use an absolute path for your openssl commands, such as +# /usr/local/Cellar/openssl/1.0.2h_1/bin/openssl. # -# Author: Marc Mültin (marc.mueltin@v2g-clarity.com) +# Author: Dr. Marc Mültin (marc.mueltin@v2g-clarity.com) +# =============================================================================================================== # Some variables to create different outcomes of the PKI for testing purposes. Change the validity periods (given in number of days) to test @@ -55,6 +62,7 @@ validity_mo_root_cert=3650 # 0) Create directories if not yet existing +rm -r keystores # the keystores in the keystores folder (if existing) need to be deleted at first, so delete the complete folder mkdir -p certs mkdir -p csrs mkdir -p keystores diff --git a/RISE-V2G-EVCC/EVCCConfig.properties b/RISE-V2G-EVCC/EVCCConfig.properties index 0bcbb3b..bcdafaa 100644 --- a/RISE-V2G-EVCC/EVCCConfig.properties +++ b/RISE-V2G-EVCC/EVCCConfig.properties @@ -30,7 +30,7 @@ # # The network interface name like en3 or eth1 of the network interface on which to communicate with the SECC via a # link-local IPv6 address -NetworkInterface = en0 +network.interface = en0 # Security @@ -41,7 +41,7 @@ NetworkInterface = en0 # - false # If this value is set to 'false', TCP will be used on transport layer # If no correct value is provided here, 'false' will be chosen -TLSSecurity = true +tls = false # Contract certificate update time span @@ -49,7 +49,7 @@ TLSSecurity = true # # Integer value defining the time span in days which precedes the expiration of a contract certificate # and during which an update of the contract certificate needs to be performed -ContractCertificateUpdateTimespan = 14 +contract.certificate.update.timespan = 14 # SessionID @@ -57,7 +57,7 @@ ContractCertificateUpdateTimespan = 14 # # If this value is unequal to zero, then it represents a previously # paused V2G communication session -SessionID = 0 +session.id = 0 # Selected payment option @@ -67,7 +67,7 @@ SessionID = 0 # Possible values are: # - Contract # - ExternalPayment -RequestedPaymentOption = +authentication.mode = # Requested energy transfer mode @@ -81,7 +81,7 @@ RequestedPaymentOption = # - DC_extended # - DC_combo_core # - DC_unique -RequestedEnergyTransferMode = AC_three_phase_core +energy.transfermode.requested = AC_three_phase_core # XML representation of messages @@ -92,7 +92,7 @@ RequestedEnergyTransferMode = AC_three_phase_core # - false # If this value is set to 'true', the EXICodec will print each message's XML representation (for debugging purposes) # If no correct value is provided here, 'false' will be chosen -XMLRepresentationOfMessages = true +exi.messages.showxml = true # Hexadecimal and Base64 representation of messages @@ -103,7 +103,7 @@ XMLRepresentationOfMessages = true # - false # If this value is set to 'true', the EXICodec will print each message's hexadecimal and Base64 representation (for debugging purposes) # If no correct value is provided here, 'false' will be chosen -HexAndBase64RepresentationOfMessages = true +exi.messages.showhex = true # Extended logging of signature verification @@ -114,7 +114,7 @@ HexAndBase64RepresentationOfMessages = true # - false # If this value is set to 'true', extended logging will be printed upon verification of signatures (for debugging purposes) # If no correct value is provided here, 'false' will be chosen -SignatureVerificationLog = true +signature.verification.showlog = true # EXI codec @@ -125,4 +125,4 @@ SignatureVerificationLog = true # - exificient # - open_exi # If no correct value is provided here, 'exificient' will be used -EXICodec = open_exi +exi.codec = open_exi diff --git a/RISE-V2G-EVCC/LICENSE.txt b/RISE-V2G-EVCC/LICENSE.txt new file mode 100644 index 0000000..957a62a --- /dev/null +++ b/RISE-V2G-EVCC/LICENSE.txt @@ -0,0 +1,23 @@ +/******************************************************************************* + * The MIT License (MIT) + * + * Copyright (c) 2015-2017 V2G Clarity (Dr. Marc Mültin) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + *******************************************************************************/ \ No newline at end of file diff --git a/RISE-V2G-EVCC/pom.xml b/RISE-V2G-EVCC/pom.xml index 7a6b39d..72d4532 100644 --- a/RISE-V2G-EVCC/pom.xml +++ b/RISE-V2G-EVCC/pom.xml @@ -2,76 +2,84 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.v2gclarity.risev2g - parent - 1.0.0-SNAPSHOT + com.v2gclarity.risev2g + rise-v2g-parent + 1.1.4-SNAPSHOT + ../RISE-V2G-PARENT - + 4.0.0 - jar - http://maven.apache.org - evcc - risev2g.evcc + rise-v2g-evcc + rise-v2g-evcc - org.v2gclarity.risev2g - shared - 1.0.0-SNAPSHOT - - - org.apache.logging.log4j - log4j-api - 2.1 - - - org.apache.logging.log4j - log4j-core - 2.1 + com.v2gclarity.risev2g + rise-v2g-shared + 1.1.4-SNAPSHOT - + + + UTF-8 + 1.1.4-SNAPSHOT + + - maven-assembly-plugin + org.apache.maven.plugins + maven-assembly-plugin + 3.1.0 + rise-v2g-evcc-${project.version} + false true - org.v2gclarity.risev2g.evcc.main.StartEVCC + com.v2gclarity.risev2g.evcc.main.StartEVCC - - jar-with-dependencies - - false + + src/assembly/bin.xml + - make-my-jar-with-dependencies - package - - single - - - - - - maven-assembly-plugin - - false - ${project.baseUri}src/assembly/bin.xml - - - - package + one-jar-only + package single + + maven-resources-plugin + 3.0.2 + + + copy-resources + install + + copy-resources + + + ${basedir}/target + + + ${basedir} + + *.p12 + *.jks + *.properties + + + + + + + diff --git a/RISE-V2G-EVCC/src/assembly/bin.xml b/RISE-V2G-EVCC/src/assembly/bin.xml index 0c9ef86..749c998 100644 --- a/RISE-V2G-EVCC/src/assembly/bin.xml +++ b/RISE-V2G-EVCC/src/assembly/bin.xml @@ -1,39 +1,18 @@ - - bin - - tar.gz - tar.bz2 - zip - - - - - - README* - - - - target - . - - *.jar - - - - . - . - - *.p12 - *.jks - - - - . - . - - *.properties - - - - + + + jar-with-dependencies + + jar + + false + + + / + true + true + runtime + + \ No newline at end of file diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/DummyEVController.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/DummyEVController.java similarity index 89% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/DummyEVController.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/DummyEVController.java index 9424d58..7ad28b6 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/DummyEVController.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/DummyEVController.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.evController; +package com.v2gclarity.risev2g.evcc.evController; import java.util.List; @@ -30,25 +30,25 @@ import javax.xml.namespace.QName; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.CPStates; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVErrorCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVPowerDeliveryParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleEntryType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ProfileEntryType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.RelativeTimeIntervalType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.CPStates; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVErrorCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVPowerDeliveryParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleEntryType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ProfileEntryType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.RelativeTimeIntervalType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType; public class DummyEVController implements IACEVController, IDCEVController { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/IACEVController.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/IACEVController.java similarity index 91% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/IACEVController.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/IACEVController.java index 44ddbc1..66631b5 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/IACEVController.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/IACEVController.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.evController; +package com.v2gclarity.risev2g.evcc.evController; import javax.xml.bind.JAXBElement; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; public interface IACEVController extends IEVController { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/IDCEVController.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/IDCEVController.java similarity index 92% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/IDCEVController.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/IDCEVController.java index 392e0cf..ee6456c 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/IDCEVController.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/IDCEVController.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.evController; +package com.v2gclarity.risev2g.evcc.evController; import javax.xml.bind.JAXBElement; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVPowerDeliveryParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVPowerDeliveryParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; public interface IDCEVController extends IEVController { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/IEVController.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/IEVController.java similarity index 89% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/IEVController.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/IEVController.java index c69a59d..43b758c 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/IEVController.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/IEVController.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.evController; +package com.v2gclarity.risev2g.evcc.evController; -import org.v2gclarity.risev2g.shared.enumerations.CPStates; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.enumerations.CPStates; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; public interface IEVController { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/main/StartEVCC.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/main/StartEVCC.java similarity index 87% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/main/StartEVCC.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/main/StartEVCC.java index 61767b4..608f078 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/main/StartEVCC.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/main/StartEVCC.java @@ -21,17 +21,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.main; +package com.v2gclarity.risev2g.evcc.main; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionHandlerEVCC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionHandlerEVCC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; public class StartEVCC { public static void main(String[] args) { MiscUtils.setV2gEntityConfig(GlobalValues.EVCC_CONFIG_PROPERTIES_PATH.toString()); - new V2GCommunicationSessionHandlerEVCC(); } diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionEVCC.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionEVCC.java similarity index 84% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionEVCC.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionEVCC.java index 9d6038a..e241d39 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionEVCC.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionEVCC.java @@ -21,58 +21,58 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.session; +package com.v2gclarity.risev2g.evcc.session; import java.util.ArrayList; import java.util.List; import java.util.Observable; import java.util.Observer; -import org.v2gclarity.risev2g.evcc.evController.DummyEVController; -import org.v2gclarity.risev2g.evcc.evController.IEVController; -import org.v2gclarity.risev2g.evcc.states.WaitForAuthorizationRes; -import org.v2gclarity.risev2g.evcc.states.WaitForCableCheckRes; -import org.v2gclarity.risev2g.evcc.states.WaitForCertificateInstallationRes; -import org.v2gclarity.risev2g.evcc.states.WaitForCertificateUpdateRes; -import org.v2gclarity.risev2g.evcc.states.WaitForChargeParameterDiscoveryRes; -import org.v2gclarity.risev2g.evcc.states.WaitForChargingStatusRes; -import org.v2gclarity.risev2g.evcc.states.WaitForCurrentDemandRes; -import org.v2gclarity.risev2g.evcc.states.WaitForMeteringReceiptRes; -import org.v2gclarity.risev2g.evcc.states.WaitForPaymentDetailsRes; -import org.v2gclarity.risev2g.evcc.states.WaitForPaymentServiceSelectionRes; -import org.v2gclarity.risev2g.evcc.states.WaitForPowerDeliveryRes; -import org.v2gclarity.risev2g.evcc.states.WaitForPreChargeRes; -import org.v2gclarity.risev2g.evcc.states.WaitForServiceDetailRes; -import org.v2gclarity.risev2g.evcc.states.WaitForServiceDiscoveryRes; -import org.v2gclarity.risev2g.evcc.states.WaitForSessionSetupRes; -import org.v2gclarity.risev2g.evcc.states.WaitForSessionStopRes; -import org.v2gclarity.risev2g.evcc.states.WaitForSupportedAppProtocolRes; -import org.v2gclarity.risev2g.evcc.states.WaitForWeldingDetectionRes; -import org.v2gclarity.risev2g.evcc.transportLayer.StatefulTransportLayerClient; -import org.v2gclarity.risev2g.evcc.transportLayer.TCPClient; -import org.v2gclarity.risev2g.evcc.transportLayer.TLSClient; -import org.v2gclarity.risev2g.shared.enumerations.CPStates; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ChangeProcessingState; -import org.v2gclarity.risev2g.shared.messageHandling.PauseSession; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.SendMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.V2GCommunicationSession; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils.ContractCertificateStatus; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.AppProtocolType; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SelectedServiceListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SelectedServiceType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.evController.DummyEVController; +import com.v2gclarity.risev2g.evcc.evController.IEVController; +import com.v2gclarity.risev2g.evcc.states.WaitForAuthorizationRes; +import com.v2gclarity.risev2g.evcc.states.WaitForCableCheckRes; +import com.v2gclarity.risev2g.evcc.states.WaitForCertificateInstallationRes; +import com.v2gclarity.risev2g.evcc.states.WaitForCertificateUpdateRes; +import com.v2gclarity.risev2g.evcc.states.WaitForChargeParameterDiscoveryRes; +import com.v2gclarity.risev2g.evcc.states.WaitForChargingStatusRes; +import com.v2gclarity.risev2g.evcc.states.WaitForCurrentDemandRes; +import com.v2gclarity.risev2g.evcc.states.WaitForMeteringReceiptRes; +import com.v2gclarity.risev2g.evcc.states.WaitForPaymentDetailsRes; +import com.v2gclarity.risev2g.evcc.states.WaitForPaymentServiceSelectionRes; +import com.v2gclarity.risev2g.evcc.states.WaitForPowerDeliveryRes; +import com.v2gclarity.risev2g.evcc.states.WaitForPreChargeRes; +import com.v2gclarity.risev2g.evcc.states.WaitForServiceDetailRes; +import com.v2gclarity.risev2g.evcc.states.WaitForServiceDiscoveryRes; +import com.v2gclarity.risev2g.evcc.states.WaitForSessionSetupRes; +import com.v2gclarity.risev2g.evcc.states.WaitForSessionStopRes; +import com.v2gclarity.risev2g.evcc.states.WaitForSupportedAppProtocolRes; +import com.v2gclarity.risev2g.evcc.states.WaitForWeldingDetectionRes; +import com.v2gclarity.risev2g.evcc.transportLayer.StatefulTransportLayerClient; +import com.v2gclarity.risev2g.evcc.transportLayer.TCPClient; +import com.v2gclarity.risev2g.evcc.transportLayer.TLSClient; +import com.v2gclarity.risev2g.shared.enumerations.CPStates; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ChangeProcessingState; +import com.v2gclarity.risev2g.shared.messageHandling.PauseSession; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.SendMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.V2GCommunicationSession; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils.ContractCertificateStatus; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.AppProtocolType; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SelectedServiceListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SelectedServiceType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; // The state machine public class V2GCommunicationSessionEVCC extends V2GCommunicationSession implements Observer { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionHandlerEVCC.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionHandlerEVCC.java similarity index 91% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionHandlerEVCC.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionHandlerEVCC.java index 11e45b3..5cf91cd 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionHandlerEVCC.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/session/V2GCommunicationSessionHandlerEVCC.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.session; +package com.v2gclarity.risev2g.evcc.session; import java.net.Inet6Address; import java.net.InetAddress; @@ -33,23 +33,23 @@ import java.util.Observer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.evcc.transportLayer.StatefulTransportLayerClient; -import org.v2gclarity.risev2g.evcc.transportLayer.TCPClient; -import org.v2gclarity.risev2g.evcc.transportLayer.TLSClient; -import org.v2gclarity.risev2g.evcc.transportLayer.UDPClient; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.MessageHandler; -import org.v2gclarity.risev2g.shared.messageHandling.PauseSession; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.SECCDiscoveryReq; -import org.v2gclarity.risev2g.shared.v2gMessages.SECCDiscoveryRes; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.AppProtocolType; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq; +import com.v2gclarity.risev2g.evcc.transportLayer.StatefulTransportLayerClient; +import com.v2gclarity.risev2g.evcc.transportLayer.TCPClient; +import com.v2gclarity.risev2g.evcc.transportLayer.TLSClient; +import com.v2gclarity.risev2g.evcc.transportLayer.UDPClient; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.MessageHandler; +import com.v2gclarity.risev2g.shared.messageHandling.PauseSession; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.SECCDiscoveryReq; +import com.v2gclarity.risev2g.shared.v2gMessages.SECCDiscoveryRes; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.AppProtocolType; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq; public class V2GCommunicationSessionHandlerEVCC implements Observer { @@ -68,8 +68,8 @@ public class V2GCommunicationSessionHandlerEVCC implements Observer { setMessageHandler(new MessageHandler()); setSecurity( - (MiscUtils.getPropertyValue("TLSSecurity") != null ? - (byte) MiscUtils.getPropertyValue("TLSSecurity") : + (MiscUtils.getPropertyValue("tls") != null ? + (byte) MiscUtils.getPropertyValue("tls") : GlobalValues.V2G_SECURITY_WITHOUT_TLS.getByteValue()) ); diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/ClientState.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/ClientState.java similarity index 84% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/ClientState.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/ClientState.java index 24f903c..eda9924 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/ClientState.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/ClientState.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; import java.security.KeyStore; import java.util.Arrays; @@ -30,54 +30,54 @@ import java.util.ListIterator; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; -import org.v2gclarity.risev2g.evcc.evController.DummyEVController; -import org.v2gclarity.risev2g.evcc.evController.IACEVController; -import org.v2gclarity.risev2g.evcc.evController.IDCEVController; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.CPStates; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.misc.State; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingSessionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVPowerDeliveryParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MessageHeaderType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType; +import com.v2gclarity.risev2g.evcc.evController.DummyEVController; +import com.v2gclarity.risev2g.evcc.evController.IACEVController; +import com.v2gclarity.risev2g.evcc.evController.IDCEVController; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.CPStates; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.misc.State; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingSessionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVPowerDeliveryParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MessageHeaderType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType; /** * Some request messages are to be sent from different states which makes it more convenient (having @@ -456,7 +456,7 @@ public abstract class ClientState extends State { protected EnergyTransferModeType getRequestedEnergyTransferMode() { // Check if an EnergyTransferModeType has been requested in a previously paused session EnergyTransferModeType requestedEnergyTransferMode = - (EnergyTransferModeType) MiscUtils.getPropertyValue("RequestedEnergyTransferMode"); + (EnergyTransferModeType) MiscUtils.getPropertyValue("energy.transfermode.requested"); if (requestedEnergyTransferMode == null) { requestedEnergyTransferMode = getCommSessionContext().getEvController().getRequestedEnergyTransferMode(); @@ -469,7 +469,7 @@ public abstract class ClientState extends State { protected PaymentOptionType getSelectedPaymentOption() { // Check if a PaymentOptionType has been requested in a previously paused session - PaymentOptionType selectedPaymentOption = (PaymentOptionType) MiscUtils.getPropertyValue("RequestedPaymentOption"); + PaymentOptionType selectedPaymentOption = (PaymentOptionType) MiscUtils.getPropertyValue("authentication.mode"); if (selectedPaymentOption == null) { selectedPaymentOption = getCommSessionContext().getEvController().getPaymentOption(getCommSessionContext().getPaymentOptions()); diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForAuthorizationRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForAuthorizationRes.java similarity index 83% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForAuthorizationRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForAuthorizationRes.java index d806dfd..5aaf677 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForAuthorizationRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForAuthorizationRes.java @@ -1,7 +1,7 @@ /******************************************************************************* * The MIT License (MIT) * - * Copyright (c) 2015-207 V2G Clarity (Dr.-Ing. Marc Mültin) + * Copyright (c) 2015-2017 V2G Clarity (Dr.-Ing. Marc Mültin) * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,23 +21,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; import java.util.concurrent.TimeUnit; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForAuthorizationRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCableCheckRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCableCheckRes.java similarity index 84% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCableCheckRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCableCheckRes.java index a70022d..126eada 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCableCheckRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCableCheckRes.java @@ -21,20 +21,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; import java.util.concurrent.TimeUnit; -import org.v2gclarity.risev2g.evcc.evController.IDCEVController; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.evController.IDCEVController; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForCableCheckRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCertificateInstallationRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCertificateInstallationRes.java similarity index 87% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCertificateInstallationRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCertificateInstallationRes.java index 72e495b..3a67465 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCertificateInstallationRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCertificateInstallationRes.java @@ -21,22 +21,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; import java.security.interfaces.ECPrivateKey; import java.util.HashMap; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.PKI; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.PKI; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForCertificateInstallationRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCertificateUpdateRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCertificateUpdateRes.java similarity index 87% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCertificateUpdateRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCertificateUpdateRes.java index 630359e..59f3e9e 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCertificateUpdateRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCertificateUpdateRes.java @@ -21,22 +21,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; import java.security.interfaces.ECPrivateKey; import java.util.HashMap; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.PKI; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.PKI; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForCertificateUpdateRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForChargeParameterDiscoveryRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForChargeParameterDiscoveryRes.java similarity index 90% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForChargeParameterDiscoveryRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForChargeParameterDiscoveryRes.java index ebb1112..71c3af2 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForChargeParameterDiscoveryRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForChargeParameterDiscoveryRes.java @@ -21,31 +21,31 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; import java.security.cert.X509Certificate; import java.util.HashMap; import java.util.List; import java.util.concurrent.TimeUnit; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.CPStates; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.CPStates; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForChargeParameterDiscoveryRes extends ClientState { @@ -121,10 +121,11 @@ public class WaitForChargeParameterDiscoveryRes extends ClientState { // If TLS is used, verify each sales tariff (if present) with the mobility operator sub 2 certificate if (getCommSessionContext().isTlsConnection() && saSchedules != null) { - if (!verifySalesTariffs(saSchedules, v2gMessageRes.getHeader().getSignature())) + if (!verifySalesTariffs(saSchedules, v2gMessageRes.getHeader().getSignature())) { getLogger().warn("The SalesTariff will be ignored for the charge process due to " + "failed signature verification during TLS communication."); deleteUnverifiedSalesTariffs(saSchedules); + } } // Save the list of SASchedules (saves the time of reception as well) diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForChargingStatusRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForChargingStatusRes.java similarity index 86% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForChargingStatusRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForChargingStatusRes.java index cf1531b..e1839b7 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForChargingStatusRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForChargingStatusRes.java @@ -21,20 +21,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; -import org.v2gclarity.risev2g.evcc.evController.IACEVController; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.evController.IACEVController; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForChargingStatusRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCurrentDemandRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCurrentDemandRes.java similarity index 85% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCurrentDemandRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCurrentDemandRes.java index 2b5eb6e..928b664 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCurrentDemandRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForCurrentDemandRes.java @@ -21,20 +21,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForCurrentDemandRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java similarity index 84% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java index 883f12a..7aefdc1 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java @@ -21,19 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForMeteringReceiptRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPaymentDetailsRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPaymentDetailsRes.java similarity index 84% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPaymentDetailsRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPaymentDetailsRes.java index d3e76da..d200077 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPaymentDetailsRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPaymentDetailsRes.java @@ -21,17 +21,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForPaymentDetailsRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPaymentServiceSelectionRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPaymentServiceSelectionRes.java similarity index 90% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPaymentServiceSelectionRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPaymentServiceSelectionRes.java index 7ef26bf..28cd6ff 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPaymentServiceSelectionRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPaymentServiceSelectionRes.java @@ -21,21 +21,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; import java.security.KeyStore; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils.ContractCertificateStatus; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils.ContractCertificateStatus; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType; public class WaitForPaymentServiceSelectionRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPowerDeliveryRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPowerDeliveryRes.java similarity index 84% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPowerDeliveryRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPowerDeliveryRes.java index 7f3f1bf..c1fd234 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPowerDeliveryRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPowerDeliveryRes.java @@ -21,20 +21,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; -import org.v2gclarity.risev2g.evcc.evController.IDCEVController; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.CPStates; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingSessionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionReqType; +import com.v2gclarity.risev2g.evcc.evController.IDCEVController; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.CPStates; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingSessionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionReqType; public class WaitForPowerDeliveryRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPreChargeRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPreChargeRes.java similarity index 83% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPreChargeRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPreChargeRes.java index 48a249a..384d8fe 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPreChargeRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForPreChargeRes.java @@ -21,20 +21,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; import java.util.concurrent.TimeUnit; -import org.v2gclarity.risev2g.evcc.evController.IDCEVController; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.evController.IDCEVController; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForPreChargeRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForServiceDetailRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForServiceDetailRes.java similarity index 83% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForServiceDetailRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForServiceDetailRes.java index ddd744a..19ec046 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForServiceDetailRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForServiceDetailRes.java @@ -21,15 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForServiceDetailRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForServiceDiscoveryRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForServiceDiscoveryRes.java similarity index 88% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForServiceDiscoveryRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForServiceDiscoveryRes.java index fde59a9..877b86b 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForServiceDiscoveryRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForServiceDiscoveryRes.java @@ -21,23 +21,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.evcc.transportLayer.TLSClient; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils.ContractCertificateStatus; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SelectedServiceType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceCategoryType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.evcc.transportLayer.TLSClient; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils.ContractCertificateStatus; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SelectedServiceType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceCategoryType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForServiceDiscoveryRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSessionSetupRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForSessionSetupRes.java similarity index 86% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSessionSetupRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForSessionSetupRes.java index 6d75c2e..fc67cbf 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSessionSetupRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForSessionSetupRes.java @@ -21,17 +21,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForSessionSetupRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSessionStopRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForSessionStopRes.java similarity index 86% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSessionStopRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForSessionStopRes.java index 16b1d9b..713f8e7 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSessionStopRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForSessionStopRes.java @@ -21,12 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopResType; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopResType; public class WaitForSessionStopRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSupportedAppProtocolRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForSupportedAppProtocolRes.java similarity index 86% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSupportedAppProtocolRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForSupportedAppProtocolRes.java index f782de3..1967ccb 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSupportedAppProtocolRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForSupportedAppProtocolRes.java @@ -21,20 +21,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; import java.util.concurrent.TimeUnit; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.AppProtocolType; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupReqType; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.AppProtocolType; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupReqType; public class WaitForSupportedAppProtocolRes extends ClientState { @@ -81,7 +81,7 @@ public class WaitForSupportedAppProtocolRes extends ClientState { * saving reasons. * The initial value for a completely new charging session must be 0. */ - long sessionID = (long) MiscUtils.getPropertyValue("SessionID"); + long sessionID = (long) MiscUtils.getPropertyValue("session.id"); getCommSessionContext().setSessionID( getCommSessionContext().generateSessionIDFromValue(sessionID) ); diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForWeldingDetectionRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForWeldingDetectionRes.java similarity index 85% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForWeldingDetectionRes.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForWeldingDetectionRes.java index 2b15ec0..fd405f3 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForWeldingDetectionRes.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForWeldingDetectionRes.java @@ -21,15 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.states; +package com.v2gclarity.risev2g.evcc.states; -import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingSessionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType; +import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingSessionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType; public class WaitForWeldingDetectionRes extends ClientState { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/StatefulTransportLayerClient.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/StatefulTransportLayerClient.java similarity index 96% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/StatefulTransportLayerClient.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/StatefulTransportLayerClient.java index 3dfb2a6..f0bd6f9 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/StatefulTransportLayerClient.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/StatefulTransportLayerClient.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.transportLayer; +package com.v2gclarity.risev2g.evcc.transportLayer; import java.io.IOException; import java.io.InputStream; @@ -32,10 +32,10 @@ import java.util.Observable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; public abstract class StatefulTransportLayerClient extends Observable implements Runnable { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/TCPClient.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/TCPClient.java similarity index 97% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/TCPClient.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/TCPClient.java index 95f9f59..fdf1836 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/TCPClient.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/TCPClient.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.transportLayer; +package com.v2gclarity.risev2g.evcc.transportLayer; import java.io.IOException; import java.net.Inet6Address; @@ -29,7 +29,7 @@ import java.net.Socket; import java.net.SocketTimeoutException; import java.net.UnknownHostException; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; public class TCPClient extends StatefulTransportLayerClient { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/TLSClient.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/TLSClient.java similarity index 96% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/TLSClient.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/TLSClient.java index 6d282fd..e2b9e16 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/TLSClient.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/TLSClient.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.transportLayer; +package com.v2gclarity.risev2g.evcc.transportLayer; import java.io.IOException; import java.net.Inet6Address; @@ -34,10 +34,10 @@ import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; public class TLSClient extends StatefulTransportLayerClient { diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/UDPClient.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/UDPClient.java similarity index 96% rename from RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/UDPClient.java rename to RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/UDPClient.java index c2c9645..64d471f 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/transportLayer/UDPClient.java +++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/transportLayer/UDPClient.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.evcc.transportLayer; +package com.v2gclarity.risev2g.evcc.transportLayer; import java.io.IOException; import java.net.DatagramPacket; @@ -32,10 +32,10 @@ import java.net.UnknownHostException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; /** * The UDP client is handling the SECCDiscovery messages only. The standard does not diff --git a/RISE-V2G-EVCC/src/main/resources/log4j2.xml b/RISE-V2G-EVCC/src/main/resources/log4j2.xml index 628bf69..92fddc8 100644 --- a/RISE-V2G-EVCC/src/main/resources/log4j2.xml +++ b/RISE-V2G-EVCC/src/main/resources/log4j2.xml @@ -2,7 +2,7 @@ - + diff --git a/RISE-V2G-PARENT/pom.xml b/RISE-V2G-PARENT/pom.xml new file mode 100644 index 0000000..0990e15 --- /dev/null +++ b/RISE-V2G-PARENT/pom.xml @@ -0,0 +1,87 @@ + + + 4.0.0 + + com.v2gclarity.risev2g + rise-v2g-parent + rise-v2g-parent + 1.1.4-SNAPSHOT + pom + + + ../RISE-V2G-EVCC + ../RISE-V2G-SECC + ../RISE-V2G-Shared + + + https://www.v2g-clarity.com/en/risev2g/ + RISE V2G is a complete reference implementation of ISO 15118-2, both implementing the EV (EVCC) and charging station (SECC) side. Messages are provided for AC as well as DC charging. Both identification modes, EIM (External Identification Means) as well as Plug and Charge are supported, including all the security relevant features such as TLS, X.509 certificates and digital signatures. + + + V2G Clarity + https://www.v2g-clarity.com + + + + GitHub + https://github.com/V2GClarity/RISE-V2G/issues + + + + + Dr. Marc Mültin + marc.mueltin@v2g-clarity.com + V2G Clarity + + + + + + MIT License + https://opensource.org/licenses/MIT + + + + + UTF-8 + 1.1.4-SNAPSHOT + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.0 + + rise-v2g-${project.version}-src + false + + src/assembly/src.xml + + + + + one-jar-only + package + + single + + + + + + + + diff --git a/RISE-V2G-PARENT/src/assembly/src.xml b/RISE-V2G-PARENT/src/assembly/src.xml new file mode 100644 index 0000000..40f303c --- /dev/null +++ b/RISE-V2G-PARENT/src/assembly/src.xml @@ -0,0 +1,65 @@ + + project + + zip + + + + ../ + + + LICENSE.txt + README.md + + + + ${project.basedir} + rise-v2g-parent + + **/*.log + **/${project.build.directory}/** + + + + ../RISE-V2G-Certificates + rise-v2g-certificates + + /certs/** + /csrs/** + /keystores/** + /privateKeys/** + /testing-symposia/** + + + + + + + + true + + + + + ${project.basedir} + / + true + + **/*.log + **/${project.build.directory}/** + **/.classpath + **/.project + **/.settings + /src/main/resources/*.p12 + /src/main/resources/*.jks + /src/main/resources/*.pkcs8.der + + + + + + + \ No newline at end of file diff --git a/RISE-V2G-SECC/LICENSE.txt b/RISE-V2G-SECC/LICENSE.txt new file mode 100644 index 0000000..957a62a --- /dev/null +++ b/RISE-V2G-SECC/LICENSE.txt @@ -0,0 +1,23 @@ +/******************************************************************************* + * The MIT License (MIT) + * + * Copyright (c) 2015-2017 V2G Clarity (Dr. Marc Mültin) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + *******************************************************************************/ \ No newline at end of file diff --git a/RISE-V2G-SECC/SECCConfig.properties b/RISE-V2G-SECC/SECCConfig.properties index abbeb19..a11668a 100644 --- a/RISE-V2G-SECC/SECCConfig.properties +++ b/RISE-V2G-SECC/SECCConfig.properties @@ -30,7 +30,7 @@ # # The network interface name like en3 or eth1 of the network interface on which to communicate with the EVCC via a # link-local IPv6 address -NetworkInterface = en0 +network.interface = en0 # Supported energy transfer modes @@ -44,7 +44,7 @@ NetworkInterface = en0 # - DC_extended # - DC_combo_core # - DC_unique -SupportedEnergyTransferModes = AC_three_phase_core, AC_single_phase_core, DC_core, DC_extended, DC_combo_core +energy.transfermodes.supported = AC_three_phase_core, AC_single_phase_core, DC_core, DC_extended, DC_combo_core # Is charging a free service? @@ -53,7 +53,7 @@ SupportedEnergyTransferModes = AC_three_phase_core, AC_single_phase_core, DC_cor # Possible values: # - true # - false -ChargingForFree = false +charging.free = false # PaymentOptions @@ -64,7 +64,7 @@ ChargingForFree = false # - ExternalPayment # The supported values must be separated by the comma delimiter (","). It does not matter # if you add white spaces between the values or not. -SupportedPaymentOptions = Contract, ExternalPayment +authentication.modes.supported = Contract, ExternalPayment # Is the SECC located in a private environment? @@ -74,7 +74,7 @@ SupportedPaymentOptions = Contract, ExternalPayment # Possible values: # - true # - false -PrivateEnvironment = false +environment.private = false # XML representation of messages @@ -85,7 +85,7 @@ PrivateEnvironment = false # - false # If this value is set to 'true', the EXICodec will print each message's XML representation (for debugging purposes) # If no correct value is provided here, 'false' will be chosen -XMLRepresentationOfMessages = true +exi.messages.showxml = true # Hexadecimal and Base64 representation of messages @@ -96,7 +96,7 @@ XMLRepresentationOfMessages = true # - false # If this value is set to 'true', the EXICodec will print each message's hexadecimal and Base64 representation (for debugging purposes) # If no correct value is provided here, 'false' will be chosen -HexAndBase64RepresentationOfMessages = true +exi.messages.showhex = true # Extended logging of signature verification @@ -107,7 +107,7 @@ HexAndBase64RepresentationOfMessages = true # - false # If this value is set to 'true', extended logging will be printed upon verification of signatures (for debugging purposes) # If no correct value is provided here, 'false' will be chosen -SignatureVerificationLog = true +signature.verification.showlog = true # EXI codec @@ -118,4 +118,4 @@ SignatureVerificationLog = true # - exificient # - open_exi # If no correct value is provided here, 'exificient' will be used -EXICodec = exificient +exi.codec = exificient diff --git a/RISE-V2G-SECC/pom.xml b/RISE-V2G-SECC/pom.xml index 8842b90..cb14d8b 100644 --- a/RISE-V2G-SECC/pom.xml +++ b/RISE-V2G-SECC/pom.xml @@ -2,65 +2,85 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.v2gclarity.risev2g - parent - 1.0.0-SNAPSHOT + com.v2gclarity.risev2g + rise-v2g-parent + 1.1.4-SNAPSHOT + ../RISE-V2G-PARENT - + 4.0.0 - http://maven.apache.org - secc - risev2g.secc - + rise-v2g-secc + rise-v2g-secc + - org.v2gclarity.risev2g - shared - 1.0.0-SNAPSHOT + com.v2gclarity.risev2g + rise-v2g-shared + 1.1.4-SNAPSHOT - + + + UTF-8 + 1.1.4-SNAPSHOT + + - - maven-assembly-plugin + + org.apache.maven.plugins + maven-assembly-plugin + 3.1.0 + rise-v2g-secc-${project.version} + false true - org.v2gclarity.risev2g.secc.main.StartSECC + com.v2gclarity.risev2g.secc.main.StartSECC - - jar-with-dependencies - - false + + src/assembly/bin.xml + - make-my-jar-with-dependencies - package - - single - - - - - - maven-assembly-plugin - - false - ${project.baseUri}src/assembly/bin.xml - - - - package + one-jar-only + package single + + maven-resources-plugin + 3.0.2 + + + copy-resources + install + + copy-resources + + + ${basedir}/target + + + ${basedir} + + *.p12 + *.jks + *.der + *.properties + + + + + + + diff --git a/RISE-V2G-SECC/src/assembly/bin.xml b/RISE-V2G-SECC/src/assembly/bin.xml index dedcf22..1df39e7 100644 --- a/RISE-V2G-SECC/src/assembly/bin.xml +++ b/RISE-V2G-SECC/src/assembly/bin.xml @@ -1,40 +1,18 @@ - - bin - - tar.gz - tar.bz2 - zip - - - - - - README* - - - - target - . - - *.jar - - - - . - . - - *.p12 - *.jks - *.pkcs8.der - - - - . - . - - *.properties - - - - + + + jar-with-dependencies + + jar + + false + + + / + true + true + runtime + + \ No newline at end of file diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/DummyBackendInterface.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/backend/DummyBackendInterface.java similarity index 93% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/DummyBackendInterface.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/backend/DummyBackendInterface.java index 703bb9c..83a8829 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/DummyBackendInterface.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/backend/DummyBackendInterface.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.backend; +package com.v2gclarity.risev2g.secc.backend; import java.security.KeyStore; import java.security.cert.X509Certificate; @@ -34,20 +34,20 @@ import javax.xml.namespace.QName; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleEntryType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.RelativeTimeIntervalType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SalesTariffEntryType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SalesTariffType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleEntryType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.RelativeTimeIntervalType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SalesTariffEntryType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SalesTariffType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType; public class DummyBackendInterface implements IBackendInterface { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/IBackendInterface.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/backend/IBackendInterface.java similarity index 95% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/IBackendInterface.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/backend/IBackendInterface.java index bbeca07..a8cfdbd 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/IBackendInterface.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/backend/IBackendInterface.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.backend; +package com.v2gclarity.risev2g.secc.backend; import java.security.cert.X509Certificate; import java.security.interfaces.ECPrivateKey; import java.util.HashMap; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; public interface IBackendInterface { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/DummyACEVSEController.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/DummyACEVSEController.java similarity index 87% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/DummyACEVSEController.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/DummyACEVSEController.java index 5eb7439..c9c915b 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/DummyACEVSEController.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/DummyACEVSEController.java @@ -21,21 +21,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.evseController; +package com.v2gclarity.risev2g.secc.evseController; import java.math.BigInteger; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType; public class DummyACEVSEController implements IACEVSEController { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/DummyDCEVSEController.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/DummyDCEVSEController.java similarity index 92% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/DummyDCEVSEController.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/DummyDCEVSEController.java index 40df66e..cc5ba3a 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/DummyDCEVSEController.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/DummyDCEVSEController.java @@ -21,22 +21,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.evseController; +package com.v2gclarity.risev2g.secc.evseController; import java.math.BigInteger; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.IsolationLevelType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.IsolationLevelType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType; public class DummyDCEVSEController implements IDCEVSEController { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/IACEVSEController.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/IACEVSEController.java similarity index 89% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/IACEVSEController.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/IACEVSEController.java index 95d6227..6e009c4 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/IACEVSEController.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/IACEVSEController.java @@ -21,13 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.evseController; +package com.v2gclarity.risev2g.secc.evseController; import javax.xml.bind.JAXBElement; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; public interface IACEVSEController extends IEVSEController { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/IDCEVSEController.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/IDCEVSEController.java similarity index 93% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/IDCEVSEController.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/IDCEVSEController.java index 0c81d08..a7e5885 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/IDCEVSEController.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/IDCEVSEController.java @@ -21,15 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.evseController; +package com.v2gclarity.risev2g.secc.evseController; import javax.xml.bind.JAXBElement; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.IsolationLevelType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.IsolationLevelType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; public interface IDCEVSEController extends IEVSEController { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/IEVSEController.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/IEVSEController.java similarity index 95% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/IEVSEController.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/IEVSEController.java index c98659c..e10c655 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/IEVSEController.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/IEVSEController.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.evseController; +package com.v2gclarity.risev2g.secc.evseController; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; public interface IEVSEController { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/main/StartSECC.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/main/StartSECC.java similarity index 85% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/main/StartSECC.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/main/StartSECC.java index 66213f1..73ddc85 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/main/StartSECC.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/main/StartSECC.java @@ -21,16 +21,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.main; +package com.v2gclarity.risev2g.secc.main; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionHandlerSECC; -import org.v2gclarity.risev2g.secc.transportLayer.TCPServer; -import org.v2gclarity.risev2g.secc.transportLayer.TLSServer; -import org.v2gclarity.risev2g.secc.transportLayer.UDPServer; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionHandlerSECC; +import com.v2gclarity.risev2g.secc.transportLayer.TCPServer; +import com.v2gclarity.risev2g.secc.transportLayer.TLSServer; +import com.v2gclarity.risev2g.secc.transportLayer.UDPServer; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; public class StartSECC { @@ -55,7 +55,7 @@ public class StartSECC { tlsServerThread.setName("TLSServerThread"); // All transport layer threads need to be initialized before initializing the SECC session handler. - V2GCommunicationSessionHandlerSECC sessionHandler = new V2GCommunicationSessionHandlerSECC(); + new V2GCommunicationSessionHandlerSECC(); /* * To avoid possible race conditions, the transport layer threads need to be started AFTER the SECC diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/session/V2GCommunicationSessionHandlerSECC.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/session/V2GCommunicationSessionHandlerSECC.java similarity index 93% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/session/V2GCommunicationSessionHandlerSECC.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/session/V2GCommunicationSessionHandlerSECC.java index 5453158..15b75e4 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/session/V2GCommunicationSessionHandlerSECC.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/session/V2GCommunicationSessionHandlerSECC.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.session; +package com.v2gclarity.risev2g.secc.session; import java.net.DatagramPacket; import java.net.Inet6Address; @@ -33,17 +33,17 @@ import java.util.Observer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.secc.transportLayer.ConnectionHandler; -import org.v2gclarity.risev2g.secc.transportLayer.TCPServer; -import org.v2gclarity.risev2g.secc.transportLayer.TLSServer; -import org.v2gclarity.risev2g.secc.transportLayer.UDPServer; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.messageHandling.MessageHandler; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.SECCDiscoveryReq; -import org.v2gclarity.risev2g.shared.v2gMessages.SECCDiscoveryRes; +import com.v2gclarity.risev2g.secc.transportLayer.ConnectionHandler; +import com.v2gclarity.risev2g.secc.transportLayer.TCPServer; +import com.v2gclarity.risev2g.secc.transportLayer.TLSServer; +import com.v2gclarity.risev2g.secc.transportLayer.UDPServer; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.messageHandling.MessageHandler; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.SECCDiscoveryReq; +import com.v2gclarity.risev2g.shared.v2gMessages.SECCDiscoveryRes; public class V2GCommunicationSessionHandlerSECC implements Observer { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/session/V2GCommunicationSessionSECC.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/session/V2GCommunicationSessionSECC.java similarity index 83% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/session/V2GCommunicationSessionSECC.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/session/V2GCommunicationSessionSECC.java index 8c8084b..127a40e 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/session/V2GCommunicationSessionSECC.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/session/V2GCommunicationSessionSECC.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.session; +package com.v2gclarity.risev2g.secc.session; import java.util.ArrayList; @@ -29,55 +29,55 @@ import java.util.Arrays; import java.util.Observable; import java.util.Observer; -import org.v2gclarity.risev2g.secc.backend.DummyBackendInterface; -import org.v2gclarity.risev2g.secc.backend.IBackendInterface; -import org.v2gclarity.risev2g.secc.evseController.DummyACEVSEController; -import org.v2gclarity.risev2g.secc.evseController.DummyDCEVSEController; -import org.v2gclarity.risev2g.secc.evseController.IACEVSEController; -import org.v2gclarity.risev2g.secc.evseController.IDCEVSEController; -import org.v2gclarity.risev2g.secc.evseController.IEVSEController; -import org.v2gclarity.risev2g.secc.states.ForkState; -import org.v2gclarity.risev2g.secc.states.WaitForAuthorizationReq; -import org.v2gclarity.risev2g.secc.states.WaitForCableCheckReq; -import org.v2gclarity.risev2g.secc.states.WaitForCertificateInstallationReq; -import org.v2gclarity.risev2g.secc.states.WaitForCertificateUpdateReq; -import org.v2gclarity.risev2g.secc.states.WaitForChargeParameterDiscoveryReq; -import org.v2gclarity.risev2g.secc.states.WaitForChargingStatusReq; -import org.v2gclarity.risev2g.secc.states.WaitForCurrentDemandReq; -import org.v2gclarity.risev2g.secc.states.WaitForMeteringReceiptReq; -import org.v2gclarity.risev2g.secc.states.WaitForPaymentDetailsReq; -import org.v2gclarity.risev2g.secc.states.WaitForPaymentServiceSelectionReq; -import org.v2gclarity.risev2g.secc.states.WaitForPowerDeliveryReq; -import org.v2gclarity.risev2g.secc.states.WaitForPreChargeReq; -import org.v2gclarity.risev2g.secc.states.WaitForServiceDetailReq; -import org.v2gclarity.risev2g.secc.states.WaitForServiceDiscoveryReq; -import org.v2gclarity.risev2g.secc.states.WaitForSessionSetupReq; -import org.v2gclarity.risev2g.secc.states.WaitForSessionStopReq; -import org.v2gclarity.risev2g.secc.states.WaitForSupportedAppProtocolReq; -import org.v2gclarity.risev2g.secc.states.WaitForWeldingDetectionReq; -import org.v2gclarity.risev2g.secc.transportLayer.ConnectionHandler; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ChangeProcessingState; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.SendMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.V2GCommunicationSession; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MessageHeaderType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.backend.DummyBackendInterface; +import com.v2gclarity.risev2g.secc.backend.IBackendInterface; +import com.v2gclarity.risev2g.secc.evseController.DummyACEVSEController; +import com.v2gclarity.risev2g.secc.evseController.DummyDCEVSEController; +import com.v2gclarity.risev2g.secc.evseController.IACEVSEController; +import com.v2gclarity.risev2g.secc.evseController.IDCEVSEController; +import com.v2gclarity.risev2g.secc.evseController.IEVSEController; +import com.v2gclarity.risev2g.secc.states.ForkState; +import com.v2gclarity.risev2g.secc.states.WaitForAuthorizationReq; +import com.v2gclarity.risev2g.secc.states.WaitForCableCheckReq; +import com.v2gclarity.risev2g.secc.states.WaitForCertificateInstallationReq; +import com.v2gclarity.risev2g.secc.states.WaitForCertificateUpdateReq; +import com.v2gclarity.risev2g.secc.states.WaitForChargeParameterDiscoveryReq; +import com.v2gclarity.risev2g.secc.states.WaitForChargingStatusReq; +import com.v2gclarity.risev2g.secc.states.WaitForCurrentDemandReq; +import com.v2gclarity.risev2g.secc.states.WaitForMeteringReceiptReq; +import com.v2gclarity.risev2g.secc.states.WaitForPaymentDetailsReq; +import com.v2gclarity.risev2g.secc.states.WaitForPaymentServiceSelectionReq; +import com.v2gclarity.risev2g.secc.states.WaitForPowerDeliveryReq; +import com.v2gclarity.risev2g.secc.states.WaitForPreChargeReq; +import com.v2gclarity.risev2g.secc.states.WaitForServiceDetailReq; +import com.v2gclarity.risev2g.secc.states.WaitForServiceDiscoveryReq; +import com.v2gclarity.risev2g.secc.states.WaitForSessionSetupReq; +import com.v2gclarity.risev2g.secc.states.WaitForSessionStopReq; +import com.v2gclarity.risev2g.secc.states.WaitForSupportedAppProtocolReq; +import com.v2gclarity.risev2g.secc.states.WaitForWeldingDetectionReq; +import com.v2gclarity.risev2g.secc.transportLayer.ConnectionHandler; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ChangeProcessingState; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.SendMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.V2GCommunicationSession; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MessageHeaderType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class V2GCommunicationSessionSECC extends V2GCommunicationSession implements Observer { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/ForkState.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/ForkState.java similarity index 87% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/ForkState.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/ForkState.java index 2c22d56..b60dc58 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/ForkState.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/ForkState.java @@ -21,20 +21,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; import java.util.ArrayList; import java.util.List; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ChangeProcessingState; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.State; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ChangeProcessingState; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.misc.State; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class ForkState extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/ServerState.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/ServerState.java similarity index 90% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/ServerState.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/ServerState.java index b05d3cc..54b8003 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/ServerState.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/ServerState.java @@ -21,44 +21,44 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.evseController.IACEVSEController; -import org.v2gclarity.risev2g.secc.evseController.IDCEVSEController; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.SendMessage; -import org.v2gclarity.risev2g.shared.misc.State; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DiffieHellmanPublickeyType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType; +import com.v2gclarity.risev2g.secc.evseController.IACEVSEController; +import com.v2gclarity.risev2g.secc.evseController.IDCEVSEController; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.SendMessage; +import com.v2gclarity.risev2g.shared.misc.State; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DiffieHellmanPublickeyType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType; public abstract class ServerState extends State { @@ -176,7 +176,7 @@ public abstract class ServerState extends State { protected SendMessage getSendMessage( SupportedAppProtocolRes message, V2GMessages nextExpectedMessage, - org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.ResponseCodeType responseCode) { + com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.ResponseCodeType responseCode) { String messageName = message.getClass().getSimpleName(); if (!responseCode.value().substring(0, 2).toUpperCase().equals("OK")) { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForAuthorizationReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForAuthorizationReq.java similarity index 87% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForAuthorizationReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForAuthorizationReq.java index 9b1ac92..4aa999f 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForAuthorizationReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForAuthorizationReq.java @@ -21,23 +21,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; import java.util.Arrays; import java.util.HashMap; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForAuthorizationReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCableCheckReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCableCheckReq.java similarity index 83% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCableCheckReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCableCheckReq.java index d485035..5e85e26 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCableCheckReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCableCheckReq.java @@ -21,20 +21,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.evseController.IDCEVSEController; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.IsolationLevelType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.evseController.IDCEVSEController; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CableCheckResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.IsolationLevelType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForCableCheckReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCertificateInstallationReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCertificateInstallationReq.java similarity index 91% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCertificateInstallationReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCertificateInstallationReq.java index d3a677b..06d9fc1 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCertificateInstallationReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCertificateInstallationReq.java @@ -21,26 +21,26 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; import java.security.KeyPair; import java.security.cert.X509Certificate; import java.security.interfaces.ECPublicKey; import java.util.HashMap; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.PKI; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.PKI; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForCertificateInstallationReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCertificateUpdateReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCertificateUpdateReq.java similarity index 90% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCertificateUpdateReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCertificateUpdateReq.java index f5abccd..c6a17ca 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCertificateUpdateReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCertificateUpdateReq.java @@ -21,25 +21,26 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; import java.security.KeyPair; import java.security.interfaces.ECPublicKey; import java.util.HashMap; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.PKI; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; + +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.PKI; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForCertificateUpdateReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java similarity index 92% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java index cc7245c..2ab376d 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java @@ -21,28 +21,28 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; import java.util.ArrayList; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; -import org.v2gclarity.risev2g.secc.evseController.IACEVSEController; -import org.v2gclarity.risev2g.secc.evseController.IDCEVSEController; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVChargeParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.evseController.IACEVSEController; +import com.v2gclarity.risev2g.secc.evseController.IDCEVSEController; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVChargeParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForChargeParameterDiscoveryReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java similarity index 86% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java index a78094b..c6e4c69 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java @@ -21,18 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; public class WaitForChargingStatusReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCurrentDemandReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCurrentDemandReq.java similarity index 88% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCurrentDemandReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCurrentDemandReq.java index 9428ebd..fa31c98 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCurrentDemandReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForCurrentDemandReq.java @@ -21,19 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.evseController.IDCEVSEController; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.evseController.IDCEVSEController; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForCurrentDemandReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForMeteringReceiptReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForMeteringReceiptReq.java similarity index 88% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForMeteringReceiptReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForMeteringReceiptReq.java index 9d13124..bb588b8 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForMeteringReceiptReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForMeteringReceiptReq.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; import java.util.Arrays; import java.util.HashMap; @@ -29,20 +29,20 @@ import java.util.HashMap; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForMeteringReceiptReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPaymentDetailsReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPaymentDetailsReq.java similarity index 87% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPaymentDetailsReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPaymentDetailsReq.java index 9388889..e8afd4c 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPaymentDetailsReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPaymentDetailsReq.java @@ -21,19 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.PKI; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.PKI; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForPaymentDetailsReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPaymentServiceSelectionReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPaymentServiceSelectionReq.java similarity index 88% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPaymentServiceSelectionReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPaymentServiceSelectionReq.java index 446c53d..7b802e5 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPaymentServiceSelectionReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPaymentServiceSelectionReq.java @@ -21,19 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SelectedServiceType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SelectedServiceType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForPaymentServiceSelectionReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPowerDeliveryReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPowerDeliveryReq.java similarity index 90% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPowerDeliveryReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPowerDeliveryReq.java index 3f83ed0..ecb3d1f 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPowerDeliveryReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPowerDeliveryReq.java @@ -21,29 +21,30 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; import java.util.ArrayList; import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleEntryType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ProfileEntryType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.RelativeTimeIntervalType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; + +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeProgressType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PMaxScheduleEntryType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ProfileEntryType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.RelativeTimeIntervalType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForPowerDeliveryReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPreChargeReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPreChargeReq.java similarity index 83% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPreChargeReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPreChargeReq.java index f6dc182..03097af 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPreChargeReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForPreChargeReq.java @@ -21,18 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.evseController.IDCEVSEController; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.evseController.IDCEVSEController; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForPreChargeReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForServiceDetailReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForServiceDetailReq.java similarity index 89% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForServiceDetailReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForServiceDetailReq.java index 8733873..aeea60a 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForServiceDetailReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForServiceDetailReq.java @@ -21,20 +21,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ParameterSetType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ParameterType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceParameterListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ParameterSetType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ParameterType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceParameterListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForServiceDetailReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForServiceDiscoveryReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForServiceDiscoveryReq.java similarity index 87% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForServiceDiscoveryReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForServiceDiscoveryReq.java index e26389a..9d54486 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForServiceDiscoveryReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForServiceDiscoveryReq.java @@ -21,22 +21,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeServiceType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceCategoryType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SupportedEnergyTransferModeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeServiceType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceCategoryType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ServiceType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SupportedEnergyTransferModeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class WaitForServiceDiscoveryReq extends ServerState { @@ -116,7 +116,7 @@ public class WaitForServiceDiscoveryReq extends ServerState { */ chargeService.setServiceScope("chargingServiceScope"); - boolean isChargingForFree = ((boolean) MiscUtils.getPropertyValue("ChargingForFree")); + boolean isChargingForFree = ((boolean) MiscUtils.getPropertyValue("charging.free")); chargeService.setFreeService(isChargingForFree); return chargeService; diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSessionSetupReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForSessionSetupReq.java similarity index 85% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSessionSetupReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForSessionSetupReq.java index 549135a..832b81f 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSessionSetupReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForSessionSetupReq.java @@ -21,15 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupResType; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupResType; public class WaitForSessionSetupReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSessionStopReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForSessionStopReq.java similarity index 83% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSessionStopReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForSessionStopReq.java index 029d9b2..7fd11dc 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSessionStopReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForSessionStopReq.java @@ -21,15 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopResType; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopResType; public class WaitForSessionStopReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSupportedAppProtocolReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForSupportedAppProtocolReq.java similarity index 88% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSupportedAppProtocolReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForSupportedAppProtocolReq.java index 2ef58c5..c90052b 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSupportedAppProtocolReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForSupportedAppProtocolReq.java @@ -21,23 +21,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ChangeProcessingState; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.SECCDiscoveryReq; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.AppProtocolType; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ChangeProcessingState; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.SECCDiscoveryReq; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.AppProtocolType; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; public class WaitForSupportedAppProtocolReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForWeldingDetectionReq.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForWeldingDetectionReq.java similarity index 83% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForWeldingDetectionReq.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForWeldingDetectionReq.java index ed0d6be..5fdee4c 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForWeldingDetectionReq.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/states/WaitForWeldingDetectionReq.java @@ -21,18 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.states; +package com.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.evseController.IDCEVSEController; -import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionReqType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType; +import com.v2gclarity.risev2g.secc.evseController.IDCEVSEController; +import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionReqType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType; public class WaitForWeldingDetectionReq extends ServerState { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/ConnectionHandler.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/ConnectionHandler.java similarity index 97% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/ConnectionHandler.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/ConnectionHandler.java index 7d53d5d..d093235 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/ConnectionHandler.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/ConnectionHandler.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.transportLayer; +package com.v2gclarity.risev2g.secc.transportLayer; import java.io.IOException; import java.io.InputStream; @@ -36,9 +36,9 @@ import javax.net.ssl.SSLSocket; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; public class ConnectionHandler extends Observable implements Runnable { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/StatefulTransportLayerServer.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/StatefulTransportLayerServer.java similarity index 95% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/StatefulTransportLayerServer.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/StatefulTransportLayerServer.java index c37deba..6e3aa55 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/StatefulTransportLayerServer.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/StatefulTransportLayerServer.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.transportLayer; +package com.v2gclarity.risev2g.secc.transportLayer; import java.net.Inet6Address; import java.util.Observable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; public abstract class StatefulTransportLayerServer extends Observable implements Runnable { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TCPServer.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/TCPServer.java similarity index 98% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TCPServer.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/TCPServer.java index 098d961..7ef6e1f 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TCPServer.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/TCPServer.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.transportLayer; +package com.v2gclarity.risev2g.secc.transportLayer; import java.io.IOException; import java.net.ServerSocket; diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TLSServer.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/TLSServer.java similarity index 97% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TLSServer.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/TLSServer.java index ad90377..b1ce07f 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TLSServer.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/TLSServer.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.transportLayer; +package com.v2gclarity.risev2g.secc.transportLayer; import java.io.IOException; import java.net.SocketException; @@ -29,8 +29,8 @@ import javax.net.ssl.SSLServerSocket; import javax.net.ssl.SSLServerSocketFactory; import javax.net.ssl.SSLSocket; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; public final class TLSServer extends StatefulTransportLayerServer { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/UDPServer.java b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/UDPServer.java similarity index 96% rename from RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/UDPServer.java rename to RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/UDPServer.java index e0fc18a..5f1aeba 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/UDPServer.java +++ b/RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/transportLayer/UDPServer.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.secc.transportLayer; +package com.v2gclarity.risev2g.secc.transportLayer; import java.io.IOException; import java.net.DatagramPacket; @@ -33,9 +33,9 @@ import java.util.Observable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; /** * The UDP server is handling the SECCDiscovery messages only. The standard does not diff --git a/RISE-V2G-SECC/src/main/resources/log4j2.xml b/RISE-V2G-SECC/src/main/resources/log4j2.xml index 5ab6eeb..702f6e9 100644 --- a/RISE-V2G-SECC/src/main/resources/log4j2.xml +++ b/RISE-V2G-SECC/src/main/resources/log4j2.xml @@ -2,7 +2,7 @@ - + diff --git a/RISE-V2G-Shared/LICENSE.txt b/RISE-V2G-Shared/LICENSE.txt new file mode 100644 index 0000000..957a62a --- /dev/null +++ b/RISE-V2G-Shared/LICENSE.txt @@ -0,0 +1,23 @@ +/******************************************************************************* + * The MIT License (MIT) + * + * Copyright (c) 2015-2017 V2G Clarity (Dr. Marc Mültin) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + *******************************************************************************/ \ No newline at end of file diff --git a/RISE-V2G-Shared/pom.xml b/RISE-V2G-Shared/pom.xml index ce10682..28a08db 100644 --- a/RISE-V2G-Shared/pom.xml +++ b/RISE-V2G-Shared/pom.xml @@ -2,21 +2,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.v2gclarity.risev2g - parent - 1.0.0-SNAPSHOT + com.v2gclarity.risev2g + rise-v2g-parent + 1.1.4-SNAPSHOT + ../RISE-V2G-PARENT 4.0.0 - http://maven.apache.org - shared - risev2g.shared + rise-v2g-shared + rise-v2g-shared - - in-project - In Project Repo - file://${project.basedir}/libs + + + project.local + project + file:${project.basedir}/repo @@ -32,20 +35,15 @@ 2.11.0 - xml-apis - xml-apis - 1.4.01 + org.apache.logging.log4j + log4j-api + 2.9.1 - org.apache.logging.log4j - log4j-api - 2.9.0 - - org.apache.logging.log4j log4j-core - 2.9.0 - + 2.9.1 + net.sourceforge.openexi nagasena @@ -58,28 +56,4 @@ - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.1 - - - package - - shade - - - - - org.sonatype.haven.HavenCli - - - - - - - - \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar new file mode 100644 index 0000000..6c3700d Binary files /dev/null and b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar differ diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar.md5 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar.md5 new file mode 100644 index 0000000..b6ce7d7 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar.md5 @@ -0,0 +1 @@ +7b375be13edb0bd60115484b9ee910ae \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar.sha1 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar.sha1 new file mode 100644 index 0000000..33669a5 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar.sha1 @@ -0,0 +1 @@ +151a0ffbfad58d963fef8d7eb9afee45caa097f5 \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.pom b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.pom new file mode 100644 index 0000000..3031d2e --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.pom @@ -0,0 +1,8 @@ + + + 4.0.0 + net.sourceforge.openexi + nagasena-rta + 0000.0002.0052.0 + diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.pom.md5 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.pom.md5 new file mode 100644 index 0000000..5ec8749 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.pom.md5 @@ -0,0 +1 @@ +6804aff1bd5d5a64ad32c77fa340a210 \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.pom.sha1 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.pom.sha1 new file mode 100644 index 0000000..6ede0d6 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.pom.sha1 @@ -0,0 +1 @@ +d3a85dd867e323d64a4ada41ba727b8037bbb0c5 \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/maven-metadata.xml b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/maven-metadata.xml new file mode 100644 index 0000000..6dae53f --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/maven-metadata.xml @@ -0,0 +1,12 @@ + + + net.sourceforge.openexi + nagasena-rta + + 0000.0002.0052.0 + + 0000.0002.0052.0 + + 20171010062755 + + diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/maven-metadata.xml.md5 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/maven-metadata.xml.md5 new file mode 100644 index 0000000..9a194e3 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/maven-metadata.xml.md5 @@ -0,0 +1 @@ +5339d557de85298bce41835f018e1e24 \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/maven-metadata.xml.sha1 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/maven-metadata.xml.sha1 new file mode 100644 index 0000000..acc9434 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena-rta/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +7a9eb14772b77dd0ad07f2eeb0edee95dafcb07a \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar new file mode 100644 index 0000000..827d56b Binary files /dev/null and b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar differ diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar.md5 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar.md5 new file mode 100644 index 0000000..98faef0 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar.md5 @@ -0,0 +1 @@ +c192a17d3e1cddf9ede1a665b519aec9 \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar.sha1 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar.sha1 new file mode 100644 index 0000000..6411988 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar.sha1 @@ -0,0 +1 @@ +cca128e2267b20bf33224ad5174d2b413fa0b060 \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.pom b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.pom new file mode 100644 index 0000000..916fcb9 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.pom @@ -0,0 +1,8 @@ + + + 4.0.0 + net.sourceforge.openexi + nagasena + 0000.0002.0052.0 + diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.pom.md5 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.pom.md5 new file mode 100644 index 0000000..7baa690 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.pom.md5 @@ -0,0 +1 @@ +7e1842bc6e8f9cd871c3a1b5abdf8e69 \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.pom.sha1 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.pom.sha1 new file mode 100644 index 0000000..4a44e02 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.pom.sha1 @@ -0,0 +1 @@ +31c8f0910b4f8878b02829081dc7d82fffb56552 \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/maven-metadata.xml b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/maven-metadata.xml new file mode 100644 index 0000000..e44543b --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/maven-metadata.xml @@ -0,0 +1,12 @@ + + + net.sourceforge.openexi + nagasena + + 0000.0002.0052.0 + + 0000.0002.0052.0 + + 20171010062613 + + diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/maven-metadata.xml.md5 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/maven-metadata.xml.md5 new file mode 100644 index 0000000..4f0a04e --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/maven-metadata.xml.md5 @@ -0,0 +1 @@ +952c9386ef2ffc7c0aa99760f0ce7d01 \ No newline at end of file diff --git a/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/maven-metadata.xml.sha1 b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/maven-metadata.xml.sha1 new file mode 100644 index 0000000..5768428 --- /dev/null +++ b/RISE-V2G-Shared/repo/net/sourceforge/openexi/nagasena/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +46f716b6c62675ed9123ff435a642e3beac4c73a \ No newline at end of file diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/CPStates.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/CPStates.java similarity index 96% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/CPStates.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/CPStates.java index 37e4531..f6eb236 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/CPStates.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/CPStates.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.enumerations; +package com.v2gclarity.risev2g.shared.enumerations; public enum CPStates { STATE_A("State A"), diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/GlobalTypes.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/GlobalTypes.java similarity index 96% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/GlobalTypes.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/GlobalTypes.java index d90b327..d03a263 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/GlobalTypes.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/GlobalTypes.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.enumerations; +package com.v2gclarity.risev2g.shared.enumerations; public enum GlobalTypes { PAYLOAD_TYPE, diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/GlobalValues.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/GlobalValues.java similarity index 95% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/GlobalValues.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/GlobalValues.java index 7bfa6ce..6e78162 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/GlobalValues.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/GlobalValues.java @@ -21,15 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.enumerations; +package com.v2gclarity.risev2g.shared.enumerations; import java.util.Arrays; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; public enum GlobalValues { - // Relative file paths to the config files for EV and EVSE + /* File paths to the configuration files for EVCC and SECC. It must be possible to modify them on the EV or charging station, + * which means that they must not be kept inside the JAR (which is read-only). We put those properties files at the same + * level as the JAR. + */ EVCC_CONFIG_PROPERTIES_PATH("./EVCCConfig.properties"), SECC_CONFIG_PROPERTIES_PATH("./SECCConfig.properties"), @@ -48,7 +51,7 @@ public enum GlobalValues { CERTIFICATE_EXPIRES_SOON_PERIOD((short) 21, GlobalTypes.SECURITY), /* - * Relative file path to the EVCC and SECC keystore and truststore. + * File path to the EVCC and SECC keystore and truststore. * Since at least the evccKeystore needs to be modified upon certificate installation / update, the * keystores must not be kept inside the JAR (which is read-only). For easier handling, we put all * keystores at the same level as the JAR. diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/MessageSets.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/MessageSets.java similarity index 96% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/MessageSets.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/MessageSets.java index 99c64a6..b391c31 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/MessageSets.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/MessageSets.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.enumerations; +package com.v2gclarity.risev2g.shared.enumerations; public enum MessageSets { AC_CHARGING_EIM, diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/PKI.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/PKI.java similarity index 96% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/PKI.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/PKI.java index 2184ba0..6e5c107 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/PKI.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/PKI.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.enumerations; +package com.v2gclarity.risev2g.shared.enumerations; public enum PKI { CPS("CPS"), diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/V2GMessages.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/V2GMessages.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/V2GMessages.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/V2GMessages.java index 345fa34..33b3963 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/V2GMessages.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/enumerations/V2GMessages.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.enumerations; +package com.v2gclarity.risev2g.shared.enumerations; public enum V2GMessages { diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXISchemaFactoryExceptionHandler.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXISchemaFactoryExceptionHandler.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXISchemaFactoryExceptionHandler.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXISchemaFactoryExceptionHandler.java index 9c3423e..3d522ac 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXISchemaFactoryExceptionHandler.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXISchemaFactoryExceptionHandler.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.exiCodec; +package com.v2gclarity.risev2g.shared.exiCodec; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficientCodec.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficientCodec.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficientCodec.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficientCodec.java index 8aa2811..375414a 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficientCodec.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficientCodec.java @@ -1,4 +1,4 @@ -package org.v2gclarity.risev2g.shared.exiCodec; +package com.v2gclarity.risev2g.shared.exiCodec; /******************************************************************************* * The MIT License (MIT) @@ -39,8 +39,6 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamResult; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; @@ -53,6 +51,8 @@ import com.siemens.ct.exi.api.sax.EXISource; import com.siemens.ct.exi.exceptions.EXIException; import com.siemens.ct.exi.grammars.Grammars; import com.siemens.ct.exi.helpers.DefaultEXIFactory; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; public final class EXIficientCodec extends ExiCodec { // -- BEGIN: SINGLETON DEFINITION -- diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_AppProtocol.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_AppProtocol.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_AppProtocol.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_AppProtocol.java index 06859a4..2442d2f 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_AppProtocol.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_AppProtocol.java @@ -1,4 +1,4 @@ -package org.v2gclarity.risev2g.shared.exiCodec; +package com.v2gclarity.risev2g.shared.exiCodec; import javax.xml.namespace.QName; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_MsgDef.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_MsgDef.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_MsgDef.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_MsgDef.java index 8adbd56..b15991e 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_MsgDef.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficient_V2G_CI_MsgDef.java @@ -1,4 +1,4 @@ -package org.v2gclarity.risev2g.shared.exiCodec; +package com.v2gclarity.risev2g.shared.exiCodec; import javax.xml.namespace.QName; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficient_xmldsig_core_schema.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficient_xmldsig_core_schema.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficient_xmldsig_core_schema.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficient_xmldsig_core_schema.java index dfb7467..94fc037 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficient_xmldsig_core_schema.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/EXIficient_xmldsig_core_schema.java @@ -1,4 +1,4 @@ -package org.v2gclarity.risev2g.shared.exiCodec; +package com.v2gclarity.risev2g.shared.exiCodec; import javax.xml.namespace.QName; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/ExiCodec.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/ExiCodec.java similarity index 93% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/ExiCodec.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/ExiCodec.java index e9817f7..5e934b2 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/ExiCodec.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/ExiCodec.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.exiCodec; +package com.v2gclarity.risev2g.shared.exiCodec; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -37,12 +37,12 @@ import javax.xml.bind.Unmarshaller; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public abstract class ExiCodec { @@ -57,13 +57,13 @@ public abstract class ExiCodec { public ExiCodec() { // Check if XML representation of sent messages is to be shown (for debug purposes) - if ((boolean) MiscUtils.getPropertyValue("XMLRepresentationOfMessages")) + if ((boolean) MiscUtils.getPropertyValue("exi.messages.showxml")) setXMLMsgRepresentation(true); else setXMLMsgRepresentation(false); // Check if hexadecimal and Base64 representation of sent messages is to be shown (for debug purposes) - if ((boolean) MiscUtils.getPropertyValue("HexAndBase64RepresentationOfMessages")) + if ((boolean) MiscUtils.getPropertyValue("exi.messages.showhex")) setHexAndBase64MsgRepresentation(true); else setHexAndBase64MsgRepresentation(false); diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/OpenEXICodec.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/OpenEXICodec.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/OpenEXICodec.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/OpenEXICodec.java index 1cadb8d..7c8b2a8 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/OpenEXICodec.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/OpenEXICodec.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.exiCodec; +package com.v2gclarity.risev2g.shared.exiCodec; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -36,6 +36,9 @@ import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + import org.openexi.proc.common.EXIOptionsException; import org.openexi.proc.common.GrammarOptions; import org.openexi.proc.grammars.GrammarCache; @@ -46,10 +49,8 @@ import org.openexi.schema.EXISchema; import org.openexi.scomp.EXISchemaFactory; import org.openexi.scomp.EXISchemaFactoryException; import org.openexi.scomp.EXISchemaReader; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; public final class OpenEXICodec extends ExiCodec { // -- BEGIN: SINGLETON DEFINITION -- diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/XSDResolver.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/XSDResolver.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/XSDResolver.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/XSDResolver.java index 3c60368..c650c71 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/XSDResolver.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/exiCodec/XSDResolver.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.exiCodec; +package com.v2gclarity.risev2g.shared.exiCodec; import java.io.IOException; import java.io.InputStream; @@ -32,7 +32,7 @@ import org.apache.xerces.xni.XNIException; import org.apache.xerces.xni.parser.XMLEntityResolver; import org.apache.xerces.xni.parser.XMLInputSource; import org.openexi.scomp.EXISchemaFactory; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; /** * This class is needed to access all linked XSD files via an InputStream. Accessing XSD files diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/ChangeProcessingState.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/ChangeProcessingState.java similarity index 94% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/ChangeProcessingState.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/ChangeProcessingState.java index 993558e..0d5d184 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/ChangeProcessingState.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/ChangeProcessingState.java @@ -21,9 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.messageHandling; +package com.v2gclarity.risev2g.shared.messageHandling; -import org.v2gclarity.risev2g.shared.misc.State; +import com.v2gclarity.risev2g.shared.misc.State; public class ChangeProcessingState extends ReactionToIncomingMessage { diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/MessageHandler.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/MessageHandler.java similarity index 90% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/MessageHandler.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/MessageHandler.java index 5af03df..2055ee1 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/MessageHandler.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/MessageHandler.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.messageHandling; +package com.v2gclarity.risev2g.shared.messageHandling; import java.security.interfaces.ECPrivateKey; import java.util.Arrays; @@ -34,27 +34,27 @@ import javax.xml.bind.ValidationEvent; import javax.xml.bind.ValidationEventHandler; import javax.xml.namespace.QName; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.exiCodec.EXIficientCodec; -import org.v2gclarity.risev2g.shared.exiCodec.ExiCodec; -import org.v2gclarity.risev2g.shared.exiCodec.OpenEXICodec; -import org.v2gclarity.risev2g.shared.misc.V2GCommunicationSession; -import org.v2gclarity.risev2g.shared.misc.V2GTPMessage; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq; -import org.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MessageHeaderType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.NotificationType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureValueType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignedInfoType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import org.apache.logging.log4j.Logger; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.exiCodec.EXIficientCodec; +import com.v2gclarity.risev2g.shared.exiCodec.ExiCodec; +import com.v2gclarity.risev2g.shared.exiCodec.OpenEXICodec; +import com.v2gclarity.risev2g.shared.misc.V2GCommunicationSession; +import com.v2gclarity.risev2g.shared.misc.V2GTPMessage; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq; +import com.v2gclarity.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MessageHeaderType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.NotificationType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureValueType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignedInfoType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public class MessageHandler { @@ -82,7 +82,7 @@ public class MessageHandler { */ public MessageHandler() { // Choose which implementation of an EXI codec to use in the respective properties file - String exiCodecChoice = (String) MiscUtils.getPropertyValue("EXICodec"); + String exiCodecChoice = (String) MiscUtils.getPropertyValue("exi.codec"); if (exiCodecChoice.equals("open_exi")) setExiCodec(OpenEXICodec.getInstance()); else setExiCodec(EXIficientCodec.getInstance()); diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/PauseSession.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/PauseSession.java similarity index 96% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/PauseSession.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/PauseSession.java index 0059f11..57e40d1 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/PauseSession.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/PauseSession.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.messageHandling; +package com.v2gclarity.risev2g.shared.messageHandling; public class PauseSession extends ReactionToIncomingMessage { diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/ReactionToIncomingMessage.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/ReactionToIncomingMessage.java similarity index 96% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/ReactionToIncomingMessage.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/ReactionToIncomingMessage.java index 2f6b61d..2eff17c 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/ReactionToIncomingMessage.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/ReactionToIncomingMessage.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.messageHandling; +package com.v2gclarity.risev2g.shared.messageHandling; public abstract class ReactionToIncomingMessage { diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/SendMessage.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/SendMessage.java similarity index 95% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/SendMessage.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/SendMessage.java index 5c2f446..4818e9f 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/SendMessage.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/SendMessage.java @@ -21,10 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.messageHandling; +package com.v2gclarity.risev2g.shared.messageHandling; -import org.v2gclarity.risev2g.shared.misc.State; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; +import com.v2gclarity.risev2g.shared.misc.State; +import com.v2gclarity.risev2g.shared.misc.TimeRestrictions; /** * There are four possible outcomes of processing an incoming message at the respective state diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/TerminateSession.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/TerminateSession.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/TerminateSession.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/TerminateSession.java index a399249..8ab8ee0 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/TerminateSession.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/messageHandling/TerminateSession.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.messageHandling; +package com.v2gclarity.risev2g.shared.messageHandling; public class TerminateSession extends ReactionToIncomingMessage { diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/State.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/State.java similarity index 92% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/State.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/State.java index 6f2d1d1..b0dbc56 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/State.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/State.java @@ -21,19 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.misc; +package com.v2gclarity.risev2g.shared.misc; import java.security.interfaces.ECPrivateKey; import java.util.HashMap; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.MessageHandler; -import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.SendMessage; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import org.apache.logging.log4j.Logger; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.MessageHandler; +import com.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; +import com.v2gclarity.risev2g.shared.messageHandling.SendMessage; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public abstract class State { diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/TimeRestrictions.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/TimeRestrictions.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/TimeRestrictions.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/TimeRestrictions.java index 7aa3b5d..d9c0db2 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/TimeRestrictions.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/TimeRestrictions.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.misc; +package com.v2gclarity.risev2g.shared.misc; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; /** * All time restrictions are given as millisecond values. diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/V2GCommunicationSession.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/V2GCommunicationSession.java similarity index 86% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/V2GCommunicationSession.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/V2GCommunicationSession.java index f8ee7eb..b4c32f5 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/V2GCommunicationSession.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/V2GCommunicationSession.java @@ -21,26 +21,26 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.misc; +package com.v2gclarity.risev2g.shared.misc; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.Observable; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.messageHandling.MessageHandler; -import org.v2gclarity.risev2g.shared.messageHandling.PauseSession; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; -import org.v2gclarity.risev2g.shared.utils.MiscUtils; -import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionListType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; +import org.apache.logging.log4j.Logger; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.messageHandling.MessageHandler; +import com.v2gclarity.risev2g.shared.messageHandling.PauseSession; +import com.v2gclarity.risev2g.shared.messageHandling.TerminateSession; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; +import com.v2gclarity.risev2g.shared.utils.MiscUtils; +import com.v2gclarity.risev2g.shared.utils.SecurityUtils; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionListType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage; public abstract class V2GCommunicationSession extends Observable { @@ -128,7 +128,7 @@ public abstract class V2GCommunicationSession extends Observable { public PaymentOptionListType getPaymentOptions() { @SuppressWarnings("unchecked") - ArrayList paymentOptions = (ArrayList) (MiscUtils.getPropertyValue("SupportedPaymentOptions")); + ArrayList paymentOptions = (ArrayList) (MiscUtils.getPropertyValue("authentication.modes.supported")); if (paymentOptions == null) { paymentOptions = new ArrayList(); @@ -148,8 +148,8 @@ public abstract class V2GCommunicationSession extends Observable { public ArrayList getSupportedEnergyTransferModes() { @SuppressWarnings("unchecked") ArrayList energyTransferModes = - (MiscUtils.getPropertyValue("SupportedEnergyTransferModes") != null) ? - ((ArrayList) MiscUtils.getPropertyValue("SupportedEnergyTransferModes")) : + (MiscUtils.getPropertyValue("energy.transfermodes.supported") != null) ? + ((ArrayList) MiscUtils.getPropertyValue("energy.transfermodes.supported")) : new ArrayList(); return energyTransferModes; @@ -202,7 +202,7 @@ public abstract class V2GCommunicationSession extends Observable { sessionID = generateSessionIDFromValue(0L); } this.sessionID = sessionID; - MiscUtils.getV2gEntityConfig().setProperty("SessionID", String.valueOf(ByteUtils.toLongFromByteArray(sessionID))); + MiscUtils.getV2gEntityConfig().setProperty("session.id", String.valueOf(ByteUtils.toLongFromByteArray(sessionID))); } public V2GTPMessage getV2gTpMessage() { diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/V2GTPMessage.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/V2GTPMessage.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/V2GTPMessage.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/V2GTPMessage.java index ff6a54b..e6b5f5f 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/V2GTPMessage.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/V2GTPMessage.java @@ -21,14 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.misc; +package com.v2gclarity.risev2g.shared.misc; import java.nio.ByteBuffer; import java.util.Arrays; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.v2gclarity.risev2g.shared.utils.ByteUtils; +import org.apache.logging.log4j.Logger; +import com.v2gclarity.risev2g.shared.utils.ByteUtils; public class V2GTPMessage { diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/ByteUtils.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/ByteUtils.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/ByteUtils.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/ByteUtils.java index 1d780cc..228b9d2 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/ByteUtils.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/ByteUtils.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.utils; +package com.v2gclarity.risev2g.shared.utils; import java.io.IOException; import java.io.InputStream; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/MiscUtils.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/MiscUtils.java similarity index 78% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/MiscUtils.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/MiscUtils.java index 276e8c8..af14275 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/MiscUtils.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/MiscUtils.java @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.utils; +package com.v2gclarity.risev2g.shared.utils; -import java.io.FileInputStream; + import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.net.Inet6Address; @@ -34,13 +35,13 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.Properties; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SupportedEnergyTransferModeType; +import org.apache.logging.log4j.Logger; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.V2GMessages; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SupportedEnergyTransferModeType; public final class MiscUtils { @@ -60,7 +61,7 @@ public final class MiscUtils { * @return The link-local address given as a String */ public static Inet6Address getLinkLocalAddress() { - String networkInterfaceConfig = getPropertyValue("NetworkInterface").toString(); + String networkInterfaceConfig = getPropertyValue("network.interface").toString(); NetworkInterface nif = null; @@ -85,7 +86,7 @@ public final class MiscUtils { } catch (SocketException e) { getLogger().fatal("SocketException while trying to get network interface for configured name " + networkInterfaceConfig + "'", e); - } catch (NullPointerException e2) { + } catch (NullPointerException | NumberFormatException e2) { getLogger().fatal("No network interface for configured network interface index '" + networkInterfaceConfig + "' found"); } @@ -95,7 +96,7 @@ public final class MiscUtils { public static byte[] getMacAddress() { - String networkInterfaceConfig = getPropertyValue("NetworkInterface").toString(); + String networkInterfaceConfig = getPropertyValue("network.interface").toString(); NetworkInterface nif = null; byte[] macAddress = null; @@ -145,20 +146,20 @@ public final class MiscUtils { } switch (propertyName) { - case "NetworkInterface": // EV + EVSE property + case "network.interface": // EV + EVSE property returnValue = propertyValue; break; - case "SessionID": // EV property + case "session.id": // EV property try { returnValue = Long.parseLong(propertyValue); } catch (NumberFormatException e) { getLogger().warn("SessionID '" + propertyValue + "' not supported. " + "Setting default value to 0.", e); - getV2gEntityConfig().setProperty("SessionID", "0"); + getV2gEntityConfig().setProperty("session.id", "0"); returnValue = 0L; } break; - case "SupportedEnergyTransferModes": // EVSE property + case "energy.transfermodes.supported": // EVSE property String energyTransferMode = ""; SupportedEnergyTransferModeType supportedEnergyTransferModeType = new SupportedEnergyTransferModeType(); if (!propertyValue.equals("")) { @@ -174,7 +175,7 @@ public final class MiscUtils { } returnValue = supportedEnergyTransferModeType.getEnergyTransferMode(); break; - case "RequestedEnergyTransferMode": // EV property + case "energy.transfermode.requested": // EV property try { if (!propertyValue.equals("")) returnValue = EnergyTransferModeType.fromValue(propertyValue); else return null; @@ -183,21 +184,21 @@ public final class MiscUtils { return null; } break; - case "TLSSecurity": // EV property (with this code, TLS is always supported on EVSE side) + case "tls": // EV property (with this code, TLS is always supported on EVSE side) if (Boolean.parseBoolean(propertyValue)) returnValue = GlobalValues.V2G_SECURITY_WITH_TLS.getByteValue(); else returnValue = GlobalValues.V2G_SECURITY_WITHOUT_TLS.getByteValue(); break; - case "ContractCertificateUpdateTimespan": // EV property + case "contract.certificate.update.timespan": // EV property try { returnValue = Integer.parseInt(propertyValue); } catch (NumberFormatException e) { getLogger().warn("ContractCertificateUpdateTimespan '" + propertyValue + "' not supported. " + "Setting default value to 14.", e); - getV2gEntityConfig().setProperty("ContractCertificateUpdateTimespan", "14"); + getV2gEntityConfig().setProperty("contract.certificate.update.timespan", "14"); returnValue = 14; } break; - case "RequestedPaymentOption": // EV property + case "authentication.mode": // EV property try { if (!propertyValue.equals("")) returnValue = PaymentOptionType.fromValue(propertyValue); else return null; @@ -206,7 +207,7 @@ public final class MiscUtils { return null; } break; - case "SupportedPaymentOptions": // EVSE property + case "authentication.modes.supported": // EVSE property // The EVCC needs only one selected option, whereas the SECC can offer Contract AND ExternalPayment String option = ""; ArrayList paymentOptionsList = new ArrayList(); @@ -223,25 +224,25 @@ public final class MiscUtils { } returnValue = paymentOptionsList; break; - case "ChargingForFree": // EVSE property + case "charging.free": // EVSE property returnValue = Boolean.parseBoolean(propertyValue); break; - case "PrivateEnvironment": // EVSE property + case "environment.private": // EVSE property returnValue = Boolean.parseBoolean(propertyValue); break; - case "XMLRepresentationOfMessages": // EV + EVSE property + case "exi.messages.showxml": // EV + EVSE property if (Boolean.parseBoolean(propertyValue)) returnValue = true; else returnValue = false; break; - case "HexAndBase64RepresentationOfMessages": // EV + EVSE property + case "exi.messages.showhex": // EV + EVSE property if (Boolean.parseBoolean(propertyValue)) returnValue = true; else returnValue = false; break; - case "SignatureVerificationLog": // EV + EVSE property + case "signature.verification.showlog": // EV + EVSE property if (Boolean.parseBoolean(propertyValue)) returnValue = true; else returnValue = false; break; - case "EXICodec": // EV + EVSE property + case "exi.codec": // EV + EVSE property if (propertyValue.equals("open_exi")) returnValue = "open_exi"; else returnValue = "exificient"; break; @@ -266,18 +267,31 @@ public final class MiscUtils { } + /** + * Instantiates the properties object with the location of the properties file given as an argument. + * The properties file itself must reside outside the JAR file, at the same level as the JAR file itself, + * because it needs to be editable (JAR file is read-only). + * Therefore, the file is not loaded with getResoruceAsStream(), but with a FileInputStream. + * + * @param propertiesFileLocation The location of the properties file + * @return True, if the properties file could be loaded successfully. + */ public static boolean setV2gEntityConfig(String propertiesFileLocation) { Properties properties = new Properties(); - InputStream config = null; try { - config = new FileInputStream("./" + propertiesFileLocation); + FileInputStream config = new FileInputStream(propertiesFileLocation); properties.load(config); v2gEntityConfig = properties; config.close(); return true; - } catch (IOException e) { - getLogger().error(e.getClass().getSimpleName() + " occurred while trying to set config properties file"); + } catch (FileNotFoundException e) { + getLogger().error("Properties file location '" + propertiesFileLocation + "' not found (FileNotFoundException)." + + "Error occurred while trying to set config properties file."); + return false; + } catch (IOException e2) { + getLogger().error("Unable to load properties file at location '" + propertiesFileLocation + "' (IOException)" + + "Error occurred while trying to set config properties file."); return false; } } diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/SecurityUtils.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/SecurityUtils.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/SecurityUtils.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/SecurityUtils.java index 92e0336..708f43f 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/SecurityUtils.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/SecurityUtils.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.utils; +package com.v2gclarity.risev2g.shared.utils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -101,25 +101,25 @@ import javax.xml.bind.JAXBElement; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.v2gclarity.risev2g.shared.enumerations.GlobalValues; -import org.v2gclarity.risev2g.shared.enumerations.PKI; -import org.v2gclarity.risev2g.shared.exiCodec.ExiCodec; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CanonicalizationMethodType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DiffieHellmanPublickeyType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DigestMethodType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ListOfRootCertificateIDsType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ReferenceType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureMethodType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignedInfoType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SubCertificatesType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.TransformType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.TransformsType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.X509IssuerSerialType; +import com.v2gclarity.risev2g.shared.enumerations.GlobalValues; +import com.v2gclarity.risev2g.shared.enumerations.PKI; +import com.v2gclarity.risev2g.shared.exiCodec.ExiCodec; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CanonicalizationMethodType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DiffieHellmanPublickeyType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.DigestMethodType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ListOfRootCertificateIDsType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ReferenceType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureMethodType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignedInfoType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SubCertificatesType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.TransformType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.TransformsType; +import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.X509IssuerSerialType; import java.util.Base64; @@ -130,7 +130,7 @@ public final class SecurityUtils { static Logger logger = LogManager.getLogger(SecurityUtils.class.getSimpleName()); static ExiCodec exiCodec; - static boolean showSignatureVerificationLog = ((boolean) MiscUtils.getPropertyValue("SignatureVerificationLog")); + static boolean showSignatureVerificationLog = ((boolean) MiscUtils.getPropertyValue("signature.verification.showlog")); public static enum ContractCertificateStatus { UPDATE_NEEDED, @@ -148,18 +148,24 @@ public final class SecurityUtils { * Returns the standard JKS keystore which holds the respective credentials (private key and * certificate chain) for the EVCC or SECC (whoever calls this method). * + * The keystore file itself must reside outside the JAR file, at the same level as the JAR file itself, + * because + * a) at least the evccKeystore needs to be editable when installing the contract certificate (JAR file is read-only), and + * b) it is very likely that private keys and certificate chains might be stored separately in a secure hardware module. + * Therefore, the file is not loaded with getResourceAsStream(), but with a FileInputStream. + * * @param keyStorePath The relative path and file name of the keystore * @param keyStorePassword The password which protects the keystore * @return The respective keystore */ public static KeyStore getKeyStore(String keyStorePath, String keyStorePassword) { - FileInputStream fis = null; + FileInputStream keyStore; + try { - fis = new FileInputStream(keyStorePath); - return getKeyStore(fis, keyStorePassword, "jks"); + keyStore = new FileInputStream(keyStorePath); + return getKeyStore(keyStore, keyStorePassword, "jks"); } catch (FileNotFoundException e) { - getLogger().error("FileNotFoundException occurred while trying to access keystore at location '" + - keyStorePath + "'"); + getLogger().error("Keystore file location '" + keyStorePath + "' not found (FileNotFoundException)."); return null; } } @@ -168,18 +174,24 @@ public final class SecurityUtils { * Returns the standard JKS truststore which holds the respective trusted certificates for the EVCC * or SECC (whoever calls this method). * + * The truststore file itself must reside outside the JAR file, at the same level as the JAR file itself, + * because + * a) at least the evccKeystore needs to be editable when installing the contract certificate (JAR file is read-only), and + * b) it is very likely that private keys and certificate chains might be stored separately in a secure hardware module. + * Therefore, the file is not loaded with getResourceAsStream(), but with a FileInputStream. + * * @param trustStorePath The relative path and file name of the truststore * @param trustStorePassword The password which protects the truststore * @return The respective truststore */ public static KeyStore getTrustStore(String trustStorePath, String trustStorePassword) { - FileInputStream fis = null; + FileInputStream trustStore; + try { - fis = new FileInputStream(trustStorePath); - return getKeyStore(fis, trustStorePassword, "jks"); + trustStore = new FileInputStream(trustStorePath); + return getKeyStore(trustStore, trustStorePassword, "jks"); } catch (FileNotFoundException e) { - getLogger().error("FileNotFoundException occurred while trying to access keystore at location '" + - trustStorePath + "'"); + getLogger().error("Truststore file location '" + trustStorePath + "' not found (FileNotFoundException)."); return null; } } @@ -194,6 +206,7 @@ public final class SecurityUtils { */ public static KeyStore getPKCS12KeyStore(String pkcs12Path, String password) { FileInputStream fis = null; + try { fis = new FileInputStream(pkcs12Path); return getKeyStore(fis, password, "pkcs12"); @@ -527,7 +540,7 @@ public final class SecurityUtils { } } catch (KeyStoreException | NullPointerException e) { getLogger().error(e.getClass().getSimpleName() + " occurred while trying to verify trust " + - " status of certificate with distinguished name '" + + "status of certificate with distinguished name '" + certificate.getSubjectX500Principal().getName() + "' with truststore at " + "location '" + trustStoreFilename + "'", e); } diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/SleepUtils.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/SleepUtils.java similarity index 90% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/SleepUtils.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/SleepUtils.java index bd26374..5dedf73 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/SleepUtils.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/utils/SleepUtils.java @@ -1,4 +1,4 @@ -package org.v2gclarity.risev2g.shared.utils; +package com.v2gclarity.risev2g.shared.utils; import java.util.concurrent.TimeUnit; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryReq.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryReq.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryReq.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryReq.java index 1c71be6..5a7e277 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryReq.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryReq.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.v2gMessages; +package com.v2gclarity.risev2g.shared.v2gMessages; import java.util.Arrays; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryRes.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryRes.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryRes.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryRes.java index a62a612..d0634a5 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryRes.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/SECCDiscoveryRes.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. *******************************************************************************/ -package org.v2gclarity.risev2g.shared.v2gMessages; +package com.v2gclarity.risev2g.shared.v2gMessages; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/AppProtocolType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/AppProtocolType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/AppProtocolType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/AppProtocolType.java index ac482e1..0d7aa2f 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/AppProtocolType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/AppProtocolType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol; +package com.v2gclarity.risev2g.shared.v2gMessages.appProtocol; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ObjectFactory.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ObjectFactory.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ObjectFactory.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ObjectFactory.java index 58c657c..196982e 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ObjectFactory.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ObjectFactory.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol; +package com.v2gclarity.risev2g.shared.v2gMessages.appProtocol; import javax.xml.bind.annotation.XmlRegistry; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ResponseCodeType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ResponseCodeType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ResponseCodeType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ResponseCodeType.java index 555aaa6..39806b8 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ResponseCodeType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ResponseCodeType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol; +package com.v2gclarity.risev2g.shared.v2gMessages.appProtocol; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolReq.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolReq.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolReq.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolReq.java index b1a959c..5d718cf 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolReq.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolReq.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol; +package com.v2gclarity.risev2g.shared.v2gMessages.appProtocol; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolRes.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolRes.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolRes.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolRes.java index 51d4a5c..bd7329b 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolRes.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolRes.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol; +package com.v2gclarity.risev2g.shared.v2gMessages.appProtocol; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/package-info.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/package-info.java similarity index 96% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/package-info.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/package-info.java index a0ef66e..7001ffa 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/package-info.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/appProtocol/package-info.java @@ -29,4 +29,4 @@ // @javax.xml.bind.annotation.XmlSchema(namespace = "urn:iso:15118:2:2010:AppProtocol") -package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol; +package com.v2gclarity.risev2g.shared.v2gMessages.appProtocol; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVChargeParameterType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVChargeParameterType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVChargeParameterType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVChargeParameterType.java index ea59f1f..2ffc242 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVChargeParameterType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVChargeParameterType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEChargeParameterType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEChargeParameterType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEChargeParameterType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEChargeParameterType.java index 0e48ba5..d35d005 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEChargeParameterType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEChargeParameterType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEStatusType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEStatusType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEStatusType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEStatusType.java index 6607574..939058c 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEStatusType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ACEVSEStatusType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationReqType.java index 56945ad..e4c967f 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationResType.java index b6f301d..bea04ae 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/AuthorizationResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyBaseType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyBaseType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyBaseType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyBaseType.java index 498c39b..6477820 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyBaseType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyBaseType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyType.java index a919f72..938f8fe 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/BodyType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckReqType.java index e5e6071..2362a61 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckResType.java index 74454ad..c0f7614 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CableCheckResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CanonicalizationMethodType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CanonicalizationMethodType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CanonicalizationMethodType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CanonicalizationMethodType.java index f013992..52326aa 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CanonicalizationMethodType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CanonicalizationMethodType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateChainType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateChainType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateChainType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateChainType.java index 2d77363..1a47740 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateChainType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateChainType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationReqType.java index 0dc2eb6..b1d61ad 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationResType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationResType.java index d2cd846..5ee10a1 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateInstallationResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateReqType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateReqType.java index 76245a4..e41c657 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateResType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateResType.java index 4382130..d32ad5b 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CertificateUpdateResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryReqType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryReqType.java index b7fe13e..3bdc1ff 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryResType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryResType.java index e466ae7..9033533 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeParameterDiscoveryResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeProgressType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeProgressType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeProgressType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeProgressType.java index 9ca0276..af6ae8a 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeProgressType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeProgressType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeServiceType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeServiceType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeServiceType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeServiceType.java index 056a3db..f30d9e8 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeServiceType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargeServiceType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingProfileType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingProfileType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingProfileType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingProfileType.java index 2f65d07..c854d5b 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingProfileType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingProfileType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingSessionType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingSessionType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingSessionType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingSessionType.java index 07a131d..f269139 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingSessionType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingSessionType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusReqType.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusReqType.java index ab93e71..c1b810d 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusResType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusResType.java index 292f30c..58441c4 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ChargingStatusResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ConsumptionCostType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ConsumptionCostType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ConsumptionCostType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ConsumptionCostType.java index 006ffa1..cb03cd0 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ConsumptionCostType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ConsumptionCostType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ContractSignatureEncryptedPrivateKeyType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ContractSignatureEncryptedPrivateKeyType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ContractSignatureEncryptedPrivateKeyType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ContractSignatureEncryptedPrivateKeyType.java index 24145a4..0262438 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ContractSignatureEncryptedPrivateKeyType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ContractSignatureEncryptedPrivateKeyType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostKindType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostKindType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostKindType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostKindType.java index 2ea9df7..db1be95 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostKindType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostKindType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostType.java index 0051619..1decd76 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CostType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandReqType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandReqType.java index bd49cf7..0f4c227 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandResType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandResType.java index c5298ce..61270bd 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/CurrentDemandResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVChargeParameterType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVChargeParameterType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVChargeParameterType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVChargeParameterType.java index 0c05f6a..9fd7163 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVChargeParameterType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVChargeParameterType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVErrorCodeType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVErrorCodeType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVErrorCodeType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVErrorCodeType.java index 8d5cd9e..1503553 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVErrorCodeType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVErrorCodeType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVPowerDeliveryParameterType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVPowerDeliveryParameterType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVPowerDeliveryParameterType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVPowerDeliveryParameterType.java index fd37899..808a8a0 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVPowerDeliveryParameterType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVPowerDeliveryParameterType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEChargeParameterType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEChargeParameterType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEChargeParameterType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEChargeParameterType.java index 84c6d81..8bfffba 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEChargeParameterType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEChargeParameterType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusCodeType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusCodeType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusCodeType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusCodeType.java index a884c5a..234cd9c 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusCodeType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusCodeType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusType.java index 5c37c39..ef7314e 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVSEStatusType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVStatusType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVStatusType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVStatusType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVStatusType.java index 2266883..c12d5e3 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVStatusType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DCEVStatusType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DSAKeyValueType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DSAKeyValueType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DSAKeyValueType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DSAKeyValueType.java index 5a9625c..5388c48 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DSAKeyValueType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DSAKeyValueType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DiffieHellmanPublickeyType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DiffieHellmanPublickeyType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DiffieHellmanPublickeyType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DiffieHellmanPublickeyType.java index 2545107..532e9d3 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DiffieHellmanPublickeyType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DiffieHellmanPublickeyType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DigestMethodType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DigestMethodType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DigestMethodType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DigestMethodType.java index 2dc9553..b5d9ff1 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/DigestMethodType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/DigestMethodType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EMAIDType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EMAIDType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EMAIDType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EMAIDType.java index d8c13d3..1bac0cb 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EMAIDType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EMAIDType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVChargeParameterType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVChargeParameterType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVChargeParameterType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVChargeParameterType.java index 2533360..0e2c6de 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVChargeParameterType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVChargeParameterType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVPowerDeliveryParameterType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVPowerDeliveryParameterType.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVPowerDeliveryParameterType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVPowerDeliveryParameterType.java index 33102db..4449902 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVPowerDeliveryParameterType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVPowerDeliveryParameterType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEChargeParameterType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEChargeParameterType.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEChargeParameterType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEChargeParameterType.java index 84eea9f..0aa4483 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEChargeParameterType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEChargeParameterType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSENotificationType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSENotificationType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSENotificationType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSENotificationType.java index b98e626..ecc30fb 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSENotificationType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSENotificationType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEProcessingType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEProcessingType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEProcessingType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEProcessingType.java index 8fa4664..097c9f8 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEProcessingType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEProcessingType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEStatusType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEStatusType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEStatusType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEStatusType.java index 6a16013..4c50ddf 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEStatusType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVSEStatusType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVStatusType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVStatusType.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVStatusType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVStatusType.java index 503b83d..1b1b39c 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVStatusType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EVStatusType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EnergyTransferModeType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EnergyTransferModeType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EnergyTransferModeType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EnergyTransferModeType.java index 85c7ae3..77dbd41 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EnergyTransferModeType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EnergyTransferModeType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EntryType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EntryType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EntryType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EntryType.java index 83d3153..cdbe15e 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/EntryType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/EntryType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/FaultCodeType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/FaultCodeType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/FaultCodeType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/FaultCodeType.java index 22aaf8a..d28265f 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/FaultCodeType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/FaultCodeType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/IntervalType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/IntervalType.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/IntervalType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/IntervalType.java index 93b4ee2..7f7139c 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/IntervalType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/IntervalType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/IsolationLevelType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/IsolationLevelType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/IsolationLevelType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/IsolationLevelType.java index 4fcf29d..1ad45d2 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/IsolationLevelType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/IsolationLevelType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyInfoType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyInfoType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyInfoType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyInfoType.java index b1badf5..530fc6c 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyInfoType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyInfoType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyValueType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyValueType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyValueType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyValueType.java index c99a0a3..61822d5 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyValueType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/KeyValueType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ListOfRootCertificateIDsType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ListOfRootCertificateIDsType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ListOfRootCertificateIDsType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ListOfRootCertificateIDsType.java index ea8ce00..2610e78 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ListOfRootCertificateIDsType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ListOfRootCertificateIDsType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ManifestType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ManifestType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ManifestType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ManifestType.java index e8c3e83..ed519a4 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ManifestType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ManifestType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MessageHeaderType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MessageHeaderType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MessageHeaderType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MessageHeaderType.java index 8a80668..da7979f 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MessageHeaderType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MessageHeaderType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeterInfoType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeterInfoType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeterInfoType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeterInfoType.java index 1e43ccb..8ed524c 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeterInfoType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeterInfoType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.math.BigInteger; import javax.xml.bind.annotation.XmlAccessType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptReqType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptReqType.java index 4f6ee5b..9603565 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptResType.java index 67a854e..c649407 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/MeteringReceiptResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/NotificationType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/NotificationType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/NotificationType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/NotificationType.java index 1b568c7..1ec30a2 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/NotificationType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/NotificationType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectFactory.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectFactory.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectFactory.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectFactory.java index 7541948..b8589c1 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectFactory.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectFactory.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.math.BigInteger; import javax.xml.bind.JAXBElement; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectType.java index ca222ce..48c984b 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ObjectType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PGPDataType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PGPDataType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PGPDataType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PGPDataType.java index 5b987dc..b70f34a 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PGPDataType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PGPDataType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleEntryType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleEntryType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleEntryType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleEntryType.java index 671d043..8f5403e 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleEntryType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleEntryType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleType.java index cffda50..f41a47b 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PMaxScheduleType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterSetType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterSetType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterSetType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterSetType.java index 3a43dd0..6fd8c31 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterSetType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterSetType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterType.java index c9b8864..113f8ce 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ParameterType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsReqType.java index 0249671..bf981cc 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsResType.java index b540f5d..2ca7880 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentDetailsResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionListType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionListType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionListType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionListType.java index 2a87213..6fdef39 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionListType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionListType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionType.java index d02b21e..49a9c4c 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentOptionType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionReqType.java index 1db2a54..1ae5f66 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionResType.java index 4aa177a..eeb9217 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PaymentServiceSelectionResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PhysicalValueType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PhysicalValueType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PhysicalValueType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PhysicalValueType.java index ba0d5b9..ec1dc27 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PhysicalValueType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PhysicalValueType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryReqType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryReqType.java index c2ebbdb..d2426f8 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryResType.java index e6c9224..d94deb2 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PowerDeliveryResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeReqType.java index 50bc20a..b1f14c7 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeResType.java index 020637e..bd57d96 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/PreChargeResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ProfileEntryType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ProfileEntryType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ProfileEntryType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ProfileEntryType.java index c08c9af..9830c93 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ProfileEntryType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ProfileEntryType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/RSAKeyValueType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/RSAKeyValueType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/RSAKeyValueType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/RSAKeyValueType.java index 12d0c4b..e4deb6b 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/RSAKeyValueType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/RSAKeyValueType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ReferenceType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ReferenceType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ReferenceType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ReferenceType.java index 887bc4e..b35d63d 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ReferenceType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ReferenceType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/RelativeTimeIntervalType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/RelativeTimeIntervalType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/RelativeTimeIntervalType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/RelativeTimeIntervalType.java index 20c35fc..ad69b43 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/RelativeTimeIntervalType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/RelativeTimeIntervalType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ResponseCodeType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ResponseCodeType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ResponseCodeType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ResponseCodeType.java index e72cf72..e0f1f9c 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ResponseCodeType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ResponseCodeType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/RetrievalMethodType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/RetrievalMethodType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/RetrievalMethodType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/RetrievalMethodType.java index 3fabdd4..d3aba51 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/RetrievalMethodType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/RetrievalMethodType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleListType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleListType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleListType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleListType.java index 03eec91..7e107aa 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleListType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleListType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleTupleType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleTupleType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleTupleType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleTupleType.java index 0419dc8..0e1bb5b 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleTupleType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SAScheduleTupleType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SASchedulesType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SASchedulesType.java similarity index 97% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SASchedulesType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SASchedulesType.java index 9b4b841..ba1c662 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SASchedulesType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SASchedulesType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SPKIDataType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SPKIDataType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SPKIDataType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SPKIDataType.java index 88f35f5..aafd352 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SPKIDataType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SPKIDataType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffEntryType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffEntryType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffEntryType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffEntryType.java index 774bdc5..1d4d08d 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffEntryType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffEntryType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffType.java index 54234c5..3bf3640 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SalesTariffType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceListType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceListType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceListType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceListType.java index 895a709..8c67672 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceListType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceListType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceType.java index 456ef1c..4ab6037 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SelectedServiceType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceCategoryType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceCategoryType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceCategoryType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceCategoryType.java index 80e8498..43f7076 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceCategoryType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceCategoryType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailReqType.java index bcf2178..349889f 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailResType.java index 08de414..4cecc76 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDetailResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryReqType.java index 48a7411..fa7279c 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryResType.java index 9528ff2..b1d9c35 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceDiscoveryResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceListType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceListType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceListType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceListType.java index ef1f4ec..7384ceb 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceListType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceListType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceParameterListType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceParameterListType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceParameterListType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceParameterListType.java index ae07801..844f014 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceParameterListType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceParameterListType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceType.java index 0036f7e..7d3f9c5 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ServiceType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupReqType.java index d66e01c..27672bf 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupResType.java index 60901e4..fa93c60 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionSetupResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopReqType.java index 398a909..bc91391 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopResType.java index 1e67124..083124b 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SessionStopResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureMethodType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureMethodType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureMethodType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureMethodType.java index 39a8c51..8a6a71a 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureMethodType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureMethodType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.math.BigInteger; import java.util.ArrayList; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertiesType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertiesType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertiesType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertiesType.java index 53561b5..955f5fd 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertiesType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertiesType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertyType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertyType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertyType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertyType.java index 11f6882..1467dc8 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertyType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignaturePropertyType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureType.java index ea6d828..5bfd3d4 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureValueType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureValueType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureValueType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureValueType.java index b17da53..27d70cb 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureValueType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignatureValueType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignedInfoType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignedInfoType.java similarity index 99% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignedInfoType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignedInfoType.java index 3151872..6df3fcc 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignedInfoType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SignedInfoType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SubCertificatesType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SubCertificatesType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SubCertificatesType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SubCertificatesType.java index 704a493..0de0015 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SubCertificatesType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SubCertificatesType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SupportedEnergyTransferModeType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SupportedEnergyTransferModeType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SupportedEnergyTransferModeType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SupportedEnergyTransferModeType.java index bd624f8..5ecb4cc 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/SupportedEnergyTransferModeType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/SupportedEnergyTransferModeType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformType.java index 3e66db2..809743e 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformsType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformsType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformsType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformsType.java index 4aec3c0..5915a55 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformsType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/TransformsType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/UnitSymbolType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/UnitSymbolType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/UnitSymbolType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/UnitSymbolType.java index 2841937..3bf596d 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/UnitSymbolType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/UnitSymbolType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/V2GMessage.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/V2GMessage.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/V2GMessage.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/V2GMessage.java index 03c8dc9..c161b70 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/V2GMessage.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/V2GMessage.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ValueType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ValueType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ValueType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ValueType.java index bbf23fd..c3789aa 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/ValueType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/ValueType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionReqType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionReqType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionReqType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionReqType.java index 427dfb9..9a363ad 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionReqType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionReqType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionResType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionResType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionResType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionResType.java index 73b2c14..2e0e077 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionResType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/WeldingDetectionResType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509DataType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509DataType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509DataType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509DataType.java index c58147b..9170f5b 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509DataType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509DataType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.util.ArrayList; import java.util.List; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509IssuerSerialType.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509IssuerSerialType.java similarity index 98% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509IssuerSerialType.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509IssuerSerialType.java index 6c57a10..7389af9 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509IssuerSerialType.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/X509IssuerSerialType.java @@ -29,7 +29,7 @@ // -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; import java.math.BigInteger; import javax.xml.bind.annotation.XmlAccessType; diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/package-info.java b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/package-info.java similarity index 96% rename from RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/package-info.java rename to RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/package-info.java index eb88224..4db01c0 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/msgDef/package-info.java +++ b/RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/v2gMessages/msgDef/package-info.java @@ -29,4 +29,4 @@ // @javax.xml.bind.annotation.XmlSchema(namespace = "urn:iso:15118:2:2013:MsgDataTypes", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.v2gclarity.risev2g.shared.v2gMessages.msgDef; +package com.v2gclarity.risev2g.shared.v2gMessages.msgDef; diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 2190ba1..0000000 --- a/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - 4.0.0 - - org.v2gclarity.risev2g - parent - pom - 1.0.0-SNAPSHOT - risev2g.parent - - - RISE-V2G-Shared - RISE-V2G-EVCC - RISE-V2G-SECC - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-eclipse-plugin - - 1.8 - 1.8 - - - - - - - - - - junit - junit - 3.8.1 - test - - - \ No newline at end of file