Changed package structure from org.eclipse.risev2g to org.v2gclarity.risev2g

.gitignore

@@ -6,6 +6,7 @@
 *.key
 *.pfx
 *.bin
+*.der
 *.class
 **/bin
 */bin

RISE-V2G-EVCC/pom.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.eclipse.risev2g</groupId>
+		<groupId>org.v2gclarity.risev2g</groupId>
 		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
@@ -15,7 +15,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.eclipse.risev2g</groupId>
+			<groupId>org.v2gclarity.risev2g</groupId>
 			<artifactId>shared</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
@@ -39,7 +39,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
-							<mainClass>org.eclipse.risev2g.evcc.main.StartEVCC</mainClass>
+							<mainClass>org.v2gclarity.risev2g.evcc.main.StartEVCC</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/evController/DummyEVController.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/DummyEVController.java

@@ -21,32 +21,33 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.evController;
+package org.v2gclarity.risev2g.evcc.evController;
 
 import java.util.List;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.CPStates;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingProfileType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVErrorCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PMaxScheduleEntryType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PMaxScheduleType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ProfileEntryType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.RelativeTimeIntervalType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.UnitSymbolType;
+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.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;
 
 public class DummyEVController implements IACEVController, IDCEVController {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/evController/IACEVController.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.evController;
+package org.v2gclarity.risev2g.evcc.evController;
 
 import javax.xml.bind.JAXBElement;
 
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
 
 public interface IACEVController extends IEVController {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/evController/IDCEVController.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/evController/IDCEVController.java

@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.evController;
+package org.v2gclarity.risev2g.evcc.evController;
 
 import javax.xml.bind.JAXBElement;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
+
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVChargeParameterType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVStatusType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
 
 public interface IDCEVController extends IEVController {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/evController/IEVController.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.evController;
+package org.v2gclarity.risev2g.evcc.evController;
 
-import org.eclipse.risev2g.shared.enumerations.CPStates;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingProfileType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
+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;
 
 public interface IEVController {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/main/StartEVCC.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/main/StartEVCC.java

@@ -21,12 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.main;
+package org.v2gclarity.risev2g.evcc.main;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionHandlerEVCC;
-import org.eclipse.risev2g.evcc.transportLayer.UDPClient;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
+import org.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionHandlerEVCC;
+import org.v2gclarity.risev2g.evcc.transportLayer.UDPClient;
+import org.v2gclarity.risev2g.shared.enumerations.GlobalValues;
+import org.v2gclarity.risev2g.shared.utils.MiscUtils;
 
 public class StartEVCC {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/session/V2GCommunicationSessionEVCC.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.session;
+package org.v2gclarity.risev2g.evcc.session;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
 
-import org.eclipse.risev2g.evcc.evController.DummyEVController;
-import org.eclipse.risev2g.evcc.evController.IEVController;
-import org.eclipse.risev2g.evcc.states.WaitForAuthorizationRes;
-import org.eclipse.risev2g.evcc.states.WaitForCableCheckRes;
-import org.eclipse.risev2g.evcc.states.WaitForCertificateInstallationRes;
-import org.eclipse.risev2g.evcc.states.WaitForCertificateUpdateRes;
-import org.eclipse.risev2g.evcc.states.WaitForChargeParameterDiscoveryRes;
-import org.eclipse.risev2g.evcc.states.WaitForChargingStatusRes;
-import org.eclipse.risev2g.evcc.states.WaitForCurrentDemandRes;
-import org.eclipse.risev2g.evcc.states.WaitForMeteringReceiptRes;
-import org.eclipse.risev2g.evcc.states.WaitForPaymentDetailsRes;
-import org.eclipse.risev2g.evcc.states.WaitForPaymentServiceSelectionRes;
-import org.eclipse.risev2g.evcc.states.WaitForPowerDeliveryRes;
-import org.eclipse.risev2g.evcc.states.WaitForPreChargeRes;
-import org.eclipse.risev2g.evcc.states.WaitForServiceDetailRes;
-import org.eclipse.risev2g.evcc.states.WaitForServiceDiscoveryRes;
-import org.eclipse.risev2g.evcc.states.WaitForSessionSetupRes;
-import org.eclipse.risev2g.evcc.states.WaitForSessionStopRes;
-import org.eclipse.risev2g.evcc.states.WaitForSupportedAppProtocolRes;
-import org.eclipse.risev2g.evcc.states.WaitForWeldingDetectionRes;
-import org.eclipse.risev2g.evcc.transportLayer.StatefulTransportLayerClient;
-import org.eclipse.risev2g.evcc.transportLayer.TCPClient;
-import org.eclipse.risev2g.evcc.transportLayer.TLSClient;
-import org.eclipse.risev2g.shared.enumerations.CPStates;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ChangeProcessingState;
-import org.eclipse.risev2g.shared.messageHandling.PauseSession;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.SendMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.misc.V2GCommunicationSession;
-import org.eclipse.risev2g.shared.misc.V2GTPMessage;
-import org.eclipse.risev2g.shared.utils.SecurityUtils.ContractCertificateStatus;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.AppProtocolType;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingProfileType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SelectedServiceListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SelectedServiceType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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;
 
 // The state machine
 public class V2GCommunicationSessionEVCC extends V2GCommunicationSession implements Observer {

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/session/V2GCommunicationSessionHandlerEVCC.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.session;
+package org.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.eclipse.risev2g.evcc.transportLayer.StatefulTransportLayerClient;
-import org.eclipse.risev2g.evcc.transportLayer.TCPClient;
-import org.eclipse.risev2g.evcc.transportLayer.TLSClient;
-import org.eclipse.risev2g.evcc.transportLayer.UDPClient;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.MessageHandler;
-import org.eclipse.risev2g.shared.messageHandling.PauseSession;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.misc.TimeRestrictions;
-import org.eclipse.risev2g.shared.misc.V2GTPMessage;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
-import org.eclipse.risev2g.shared.v2gMessages.SECCDiscoveryReq;
-import org.eclipse.risev2g.shared.v2gMessages.SECCDiscoveryRes;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.AppProtocolType;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq;
+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;
 
 
 public class V2GCommunicationSessionHandlerEVCC implements Observer {

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/ClientState.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/ClientState.java

@@ -21,58 +21,59 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
 import java.security.KeyStore;
 import java.util.Arrays;
 import java.util.ListIterator;
-import org.eclipse.risev2g.evcc.evController.IACEVController;
-import org.eclipse.risev2g.evcc.evController.IDCEVController;
-import org.eclipse.risev2g.evcc.evController.DummyEVController;
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.CPStates;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.misc.State;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.AuthorizationResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.BodyBaseType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CableCheckReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CableCheckResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeProgressType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingProfileType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingSessionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CurrentDemandReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EMAIDType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MessageHeaderType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentDetailsReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PowerDeliveryReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PreChargeResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDetailReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionSetupResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionStopReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionStopResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType;
+
+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.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;
 
 /**
  * Some request messages are to be sent from different states which makes it more convenient (having

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForAuthorizationRes.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForAuthorizationRes.java

@@ -21,19 +21,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.AuthorizationResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.AuthorizationResType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public class WaitForAuthorizationRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForCableCheckRes.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCableCheckRes.java

@@ -21,17 +21,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.evController.IDCEVController;
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CableCheckResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PreChargeReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.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;
 
 public class WaitForCableCheckRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForCertificateInstallationRes.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCertificateInstallationRes.java

@@ -21,20 +21,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
 import java.security.interfaces.ECPrivateKey;
 import java.util.HashMap;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.CertificateInstallationResType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public class WaitForCertificateInstallationRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForCertificateUpdateRes.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForCertificateUpdateRes.java

@@ -21,20 +21,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
 import java.security.interfaces.ECPrivateKey;
 import java.util.HashMap;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.CertificateUpdateResType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public class WaitForCertificateUpdateRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForChargeParameterDiscoveryRes.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForChargeParameterDiscoveryRes.java

@@ -21,29 +21,29 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
 import java.security.cert.X509Certificate;
 import java.util.HashMap;
 import java.util.List;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.CPStates;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVSEChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeProgressType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.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;
 
 public class WaitForChargeParameterDiscoveryRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForChargingStatusRes.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForChargingStatusRes.java

@@ -21,19 +21,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.evController.IACEVController;
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeProgressType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeteringReceiptReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.ChargingStatusResType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptReqType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public class WaitForChargingStatusRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForCurrentDemandRes.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeProgressType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeteringReceiptReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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;
 
 public class WaitForCurrentDemandRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForMeteringReceiptRes.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeProgressType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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;
 
 public class WaitForMeteringReceiptRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForPaymentDetailsRes.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPaymentDetailsRes.java

@@ -21,19 +21,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
 import java.util.Base64;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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;
 
 public class WaitForPaymentDetailsRes extends ClientState {
 	

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForPaymentServiceSelectionRes.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPaymentServiceSelectionRes.java

@@ -21,20 +21,21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
 import java.security.KeyStore;
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.utils.SecurityUtils.ContractCertificateStatus;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateInstallationReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateUpdateReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType;
+
+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;
 
 public class WaitForPaymentServiceSelectionRes extends ClientState {
 	

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForPowerDeliveryRes.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.evController.IDCEVController;
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.CPStates;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingSessionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.WeldingDetectionReqType;
+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;
 
 public class WaitForPowerDeliveryRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForPreChargeRes.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForPreChargeRes.java

@@ -21,15 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeProgressType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PreChargeResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.ChargeProgressType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeResType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public class WaitForPreChargeRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForServiceDetailRes.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDetailReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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;
 
 public class WaitForServiceDetailRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForServiceDiscoveryRes.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.evcc.transportLayer.TLSClient;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.utils.SecurityUtils.ContractCertificateStatus;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SelectedServiceType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceCategoryType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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;
 
 public class WaitForServiceDiscoveryRes extends ClientState {
 	

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForSessionSetupRes.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionSetupResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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;
 
 public class WaitForSessionSetupRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForSessionStopRes.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionStopResType;
+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;
 
 public class WaitForSessionStopRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForSupportedAppProtocolRes.java → RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/WaitForSupportedAppProtocolRes.java

@@ -21,18 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.misc.TimeRestrictions;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.AppProtocolType;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionSetupReqType;
+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;
 
 public class WaitForSupportedAppProtocolRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/states/WaitForWeldingDetectionRes.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.states;
+package org.v2gclarity.risev2g.evcc.states;
 
-import org.eclipse.risev2g.evcc.session.V2GCommunicationSessionEVCC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingSessionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType;
+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;
 
 public class WaitForWeldingDetectionRes extends ClientState {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/transportLayer/StatefulTransportLayerClient.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.transportLayer;
+package org.v2gclarity.risev2g.evcc.transportLayer;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,12 +29,13 @@ import java.io.OutputStream;
 import java.net.Inet6Address;
 import java.util.Arrays;
 import java.util.Observable;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.misc.V2GTPMessage;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
+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;
 
 public abstract class StatefulTransportLayerClient  extends Observable implements Runnable {
 

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/transportLayer/TCPClient.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.transportLayer;
+package org.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.eclipse.risev2g.shared.misc.V2GTPMessage;
+import org.v2gclarity.risev2g.shared.misc.V2GTPMessage;
 
 public class TCPClient extends StatefulTransportLayerClient {
 	

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/transportLayer/TLSClient.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.transportLayer;
+package org.v2gclarity.risev2g.evcc.transportLayer;
 
 import java.io.IOException;
 import java.net.Inet6Address;
@@ -29,13 +29,15 @@ import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
+
 import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.misc.TimeRestrictions;
-import org.eclipse.risev2g.shared.misc.V2GTPMessage;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
+
+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;
 
 public class TLSClient extends StatefulTransportLayerClient {
 	

RISE-V2G-EVCC/src/main/java/org/eclipse/risev2g/evcc/transportLayer/UDPClient.java → RISE-V2G-EVCC/src/main/java/org/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.eclipse.risev2g.evcc.transportLayer;
+package org.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.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.misc.TimeRestrictions;
-import org.eclipse.risev2g.shared.misc.V2GTPMessage;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
+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;
 
 /**
  * The UDP client is handling the SECCDiscovery messages only. The standard does not

RISE-V2G-SECC/pom.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.eclipse.risev2g</groupId>
+		<groupId>org.v2gclarity.risev2g</groupId>
 		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
@@ -14,7 +14,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.eclipse.risev2g</groupId>
+			<groupId>org.v2gclarity.risev2g</groupId>
 			<artifactId>shared</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
@@ -28,7 +28,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
-							<mainClass>org.eclipse.risev2g.secc.main.StartSECC</mainClass>
+							<mainClass>org.v2gclarity.risev2g.secc.main.StartSECC</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/backend/DummyBackendInterface.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.backend;
+package org.v2gclarity.risev2g.secc.backend;
 
 import java.security.KeyStore;
 import java.security.interfaces.ECPrivateKey;
@@ -32,19 +32,19 @@ import javax.xml.namespace.QName;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateChainType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PMaxScheduleEntryType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PMaxScheduleType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.RelativeTimeIntervalType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SalesTariffEntryType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SalesTariffType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.UnitSymbolType;
+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.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 java.io.IOException;
 import java.nio.file.FileSystems;

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/backend/IBackendInterface.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/IBackendInterface.java

@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.backend;
+package org.v2gclarity.risev2g.secc.backend;
 
 import java.security.interfaces.ECPrivateKey;
 import java.util.HashMap;
 
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateChainType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleListType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType;
 
 public interface IBackendInterface {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/evseController/DummyACEVSEController.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.evseController;
+package org.v2gclarity.risev2g.secc.evseController;
 
 import java.math.BigInteger;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVSEChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeterInfoType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.UnitSymbolType;
+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;
 
 public class DummyACEVSEController implements IACEVSEController {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/evseController/DummyDCEVSEController.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.evseController;
+package org.v2gclarity.risev2g.secc.evseController;
 
 import java.math.BigInteger;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.IsolationLevelType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeterInfoType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.UnitSymbolType;
+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;
 
 public class DummyDCEVSEController implements IDCEVSEController {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/evseController/IACEVSEController.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.evseController;
+package org.v2gclarity.risev2g.secc.evseController;
 
 import javax.xml.bind.JAXBElement;
 
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVSEChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEChargeParameterType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
 
 public interface IACEVSEController extends IEVSEController {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/evseController/IDCEVSEController.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/evseController/IDCEVSEController.java

@@ -21,14 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.evseController;
+package org.v2gclarity.risev2g.secc.evseController;
 
 import javax.xml.bind.JAXBElement;
 
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
+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.PhysicalValueType;
 
 public interface IDCEVSEController extends IEVSEController {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/evseController/IEVSEController.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.evseController;
+package org.v2gclarity.risev2g.secc.evseController;
 
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeterInfoType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType;
 
 
 public interface IEVSEController {

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/main/StartSECC.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.main;
+package org.v2gclarity.risev2g.secc.main;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionHandlerSECC;
-import org.eclipse.risev2g.secc.transportLayer.TCPServer;
-import org.eclipse.risev2g.secc.transportLayer.TLSServer;
-import org.eclipse.risev2g.secc.transportLayer.UDPServer;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
+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;
 
 public class StartSECC {
 	

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/session/V2GCommunicationSessionHandlerSECC.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.session;
+package org.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.eclipse.risev2g.secc.transportLayer.ConnectionHandler;
-import org.eclipse.risev2g.secc.transportLayer.TCPServer;
-import org.eclipse.risev2g.secc.transportLayer.TLSServer;
-import org.eclipse.risev2g.secc.transportLayer.UDPServer;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.messageHandling.MessageHandler;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.misc.V2GTPMessage;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
-import org.eclipse.risev2g.shared.v2gMessages.SECCDiscoveryReq;
-import org.eclipse.risev2g.shared.v2gMessages.SECCDiscoveryRes;
+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;
 
 public class V2GCommunicationSessionHandlerSECC implements Observer {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/session/V2GCommunicationSessionSECC.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.session;
+package org.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.eclipse.risev2g.secc.backend.DummyBackendInterface;
-import org.eclipse.risev2g.secc.backend.IBackendInterface;
-import org.eclipse.risev2g.secc.evseController.DummyACEVSEController;
-import org.eclipse.risev2g.secc.evseController.DummyDCEVSEController;
-import org.eclipse.risev2g.secc.evseController.IACEVSEController;
-import org.eclipse.risev2g.secc.evseController.IDCEVSEController;
-import org.eclipse.risev2g.secc.evseController.IEVSEController;
-import org.eclipse.risev2g.secc.states.ForkState;
-import org.eclipse.risev2g.secc.states.WaitForAuthorizationReq;
-import org.eclipse.risev2g.secc.states.WaitForCableCheckReq;
-import org.eclipse.risev2g.secc.states.WaitForCertificateInstallationReq;
-import org.eclipse.risev2g.secc.states.WaitForCertificateUpdateReq;
-import org.eclipse.risev2g.secc.states.WaitForChargeParameterDiscoveryReq;
-import org.eclipse.risev2g.secc.states.WaitForChargingStatusReq;
-import org.eclipse.risev2g.secc.states.WaitForCurrentDemandReq;
-import org.eclipse.risev2g.secc.states.WaitForMeteringReceiptReq;
-import org.eclipse.risev2g.secc.states.WaitForPaymentDetailsReq;
-import org.eclipse.risev2g.secc.states.WaitForPaymentServiceSelectionReq;
-import org.eclipse.risev2g.secc.states.WaitForPowerDeliveryReq;
-import org.eclipse.risev2g.secc.states.WaitForPreChargeReq;
-import org.eclipse.risev2g.secc.states.WaitForServiceDetailReq;
-import org.eclipse.risev2g.secc.states.WaitForServiceDiscoveryReq;
-import org.eclipse.risev2g.secc.states.WaitForSessionSetupReq;
-import org.eclipse.risev2g.secc.states.WaitForSessionStopReq;
-import org.eclipse.risev2g.secc.states.WaitForSupportedAppProtocolReq;
-import org.eclipse.risev2g.secc.states.WaitForWeldingDetectionReq;
-import org.eclipse.risev2g.secc.transportLayer.ConnectionHandler;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ChangeProcessingState;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.SendMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.misc.V2GCommunicationSession;
-import org.eclipse.risev2g.shared.misc.V2GTPMessage;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateChainType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MessageHeaderType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeterInfoType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PMaxScheduleType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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;
 
 public class V2GCommunicationSessionSECC extends V2GCommunicationSession implements Observer {
 	

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/ForkState.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/ForkState.java

@@ -21,18 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ChangeProcessingState;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.misc.State;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.V2GMessage;
 
 public class ForkState extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/ServerState.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/ServerState.java

@@ -21,34 +21,34 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.SendMessage;
-import org.eclipse.risev2g.shared.misc.State;
-import org.eclipse.risev2g.shared.misc.TimeRestrictions;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.AuthorizationResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.BodyBaseType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CableCheckResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PreChargeResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionSetupResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionStopResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType;
+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.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.CurrentDemandResType;
+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.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.V2GMessage;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType;
 
 public abstract class ServerState extends State {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForAuthorizationReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForAuthorizationReq.java

@@ -21,22 +21,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
 import java.util.Arrays;
 import java.util.HashMap;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.AuthorizationResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.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;
 
 public class WaitForAuthorizationReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForCableCheckReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCableCheckReq.java

@@ -21,17 +21,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.evseController.IDCEVSEController;
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CableCheckReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CableCheckResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.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.V2GMessage;
 
 public class WaitForCableCheckReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForCertificateInstallationReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCertificateInstallationReq.java

@@ -21,25 +21,25 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
 import java.security.KeyPair;
 import java.security.interfaces.ECPublicKey;
 import java.util.HashMap;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateChainType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateInstallationReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateInstallationResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DiffieHellmanPublickeyType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EMAIDType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.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.DiffieHellmanPublickeyType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public class WaitForCertificateInstallationReq extends ServerState  {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForCertificateUpdateReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCertificateUpdateReq.java

@@ -21,26 +21,26 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
 import java.security.KeyPair;
 import java.security.interfaces.ECPublicKey;
 import java.util.HashMap;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateChainType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateUpdateReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateUpdateResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DiffieHellmanPublickeyType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EMAIDType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.ReactionToIncomingMessage;
+import org.v2gclarity.risev2g.shared.utils.SecurityUtils;
+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.DiffieHellmanPublickeyType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignatureType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public class WaitForCertificateUpdateReq extends ServerState  {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java

@@ -21,29 +21,29 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
 import java.util.ArrayList;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 
-import org.eclipse.risev2g.secc.evseController.IACEVSEController;
-import org.eclipse.risev2g.secc.evseController.IDCEVSEController;
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.misc.TimeRestrictions;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVChargeParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSEProcessingType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.messageHandling.TerminateSession;
+import org.v2gclarity.risev2g.shared.misc.TimeRestrictions;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType;
+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;
 
 public class WaitForChargeParameterDiscoveryReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForChargingStatusReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java

@@ -21,16 +21,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.evseController.IACEVSEController;
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingStatusReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingStatusResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeterInfoType;
+import org.v2gclarity.risev2g.secc.evseController.IACEVSEController;
+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.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;
 
 public class WaitForChargingStatusReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForCurrentDemandReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForCurrentDemandReq.java

@@ -21,18 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.evseController.IDCEVSEController;
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CurrentDemandReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.UnitSymbolType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.CurrentDemandReqType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PhysicalValueType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.UnitSymbolType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public class WaitForCurrentDemandReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForMeteringReceiptReq.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -29,19 +29,19 @@ import java.util.HashMap;
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeterInfoType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeteringReceiptReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.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;
 
 public class WaitForMeteringReceiptReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForPaymentDetailsReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPaymentDetailsReq.java

@@ -21,20 +21,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
 import java.security.cert.X509Certificate;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentDetailsReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentDetailsResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.ReactionToIncomingMessage;
+import org.v2gclarity.risev2g.shared.utils.ByteUtils;
+import org.v2gclarity.risev2g.shared.utils.SecurityUtils;
+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;
 
 public class WaitForPaymentDetailsReq extends ServerState {
 	

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForPaymentServiceSelectionReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPaymentServiceSelectionReq.java

@@ -21,18 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentServiceSelectionResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SelectedServiceType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.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;
 
 public class WaitForPaymentServiceSelectionReq extends ServerState {
 	

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForPowerDeliveryReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPowerDeliveryReq.java

@@ -21,25 +21,25 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeProgressType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargingProfileType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DCEVSEStatusType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PowerDeliveryReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.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.PowerDeliveryReqType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PowerDeliveryResType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleTupleType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public class WaitForPowerDeliveryReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForPreChargeReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForPreChargeReq.java

@@ -21,16 +21,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.evseController.IDCEVSEController;
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PreChargeReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PreChargeResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.EVSENotificationType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeReqType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PreChargeResType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public class WaitForPreChargeReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForServiceDetailReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForServiceDetailReq.java

@@ -21,19 +21,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ParameterSetType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ParameterType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDetailReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDetailResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceParameterListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.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;
 
 public class WaitForServiceDetailReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForServiceDiscoveryReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForServiceDiscoveryReq.java

@@ -21,19 +21,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ChargeServiceType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceCategoryType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceDiscoveryResType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ServiceType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SupportedEnergyTransferModeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.ChargeServiceType;
+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;
 
 public class WaitForServiceDiscoveryReq extends ServerState {
 	

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForSessionSetupReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSessionSetupReq.java

@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionSetupReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionSetupResType;
+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.SessionSetupReqType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionSetupResType;
 
 public class WaitForSessionSetupReq extends ServerState {
 	

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForSessionStopReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForSessionStopReq.java

@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionStopReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SessionStopResType;
+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.SessionStopReqType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SessionStopResType;
 
 public class WaitForSessionStopReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForSupportedAppProtocolReq.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ChangeProcessingState;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.SECCDiscoveryReq;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.AppProtocolType;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.ResponseCodeType;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.BodyBaseType;
+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;
 
 public class WaitForSupportedAppProtocolReq extends ServerState {
 	

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/states/WaitForWeldingDetectionReq.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForWeldingDetectionReq.java

@@ -21,16 +21,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.states;
+package org.v2gclarity.risev2g.secc.states;
 
-import org.eclipse.risev2g.secc.evseController.IDCEVSEController;
-import org.eclipse.risev2g.secc.session.V2GCommunicationSessionSECC;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EVSENotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.WeldingDetectionReqType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType;
+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.EVSENotificationType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionReqType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.WeldingDetectionResType;
 
 public class WaitForWeldingDetectionReq extends ServerState {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/transportLayer/ConnectionHandler.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.transportLayer;
+package org.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.eclipse.risev2g.shared.misc.TimeRestrictions;
-import org.eclipse.risev2g.shared.misc.V2GTPMessage;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
+import org.v2gclarity.risev2g.shared.misc.TimeRestrictions;
+import org.v2gclarity.risev2g.shared.misc.V2GTPMessage;
+import org.v2gclarity.risev2g.shared.utils.ByteUtils;
 
 public class ConnectionHandler extends Observable implements Runnable {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/transportLayer/StatefulTransportLayerServer.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.transportLayer;
+package org.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.eclipse.risev2g.shared.utils.MiscUtils;
+import org.v2gclarity.risev2g.shared.utils.MiscUtils;
 
 public abstract class StatefulTransportLayerServer extends Observable implements Runnable {
 	

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/transportLayer/TCPServer.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.transportLayer;
+package org.v2gclarity.risev2g.secc.transportLayer;
 
 import java.io.IOException;
 import java.net.ServerSocket;

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/transportLayer/TLSServer.java → RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TLSServer.java

@@ -21,15 +21,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.secc.transportLayer;
+package org.v2gclarity.risev2g.secc.transportLayer;
 
 import java.io.IOException;
 import java.net.SocketException;
+
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocket;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
+
+import org.v2gclarity.risev2g.shared.enumerations.GlobalValues;
+import org.v2gclarity.risev2g.shared.utils.SecurityUtils;
 
 public final class TLSServer extends StatefulTransportLayerServer {
 

RISE-V2G-SECC/src/main/java/org/eclipse/risev2g/secc/transportLayer/UDPServer.java → RISE-V2G-SECC/src/main/java/org/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.eclipse.risev2g.secc.transportLayer;
+package org.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.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.misc.V2GTPMessage;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
+import org.v2gclarity.risev2g.shared.enumerations.GlobalValues;
+import org.v2gclarity.risev2g.shared.misc.V2GTPMessage;
+import org.v2gclarity.risev2g.shared.utils.MiscUtils;
 
 /**
  * The UDP server is handling the SECCDiscovery messages only. The standard does not

RISE-V2G-Shared/pom.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.eclipse.risev2g</groupId>
+		<groupId>org.v2gclarity.risev2g</groupId>
 		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/enumerations/CPStates.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.enumerations;
+package org.v2gclarity.risev2g.shared.enumerations;
 
 public enum CPStates {
 	STATE_A("State A"),

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/enumerations/GlobalTypes.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.enumerations;
+package org.v2gclarity.risev2g.shared.enumerations;
 
 public enum GlobalTypes {
 	PAYLOAD_TYPE,

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/enumerations/GlobalValues.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/enumerations/GlobalValues.java

@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.shared.enumerations;
+package org.v2gclarity.risev2g.shared.enumerations;
 
 import java.util.Arrays;
 
-import org.eclipse.risev2g.shared.utils.ByteUtils;
+import org.v2gclarity.risev2g.shared.utils.ByteUtils;
 
 
 public enum GlobalValues {

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/enumerations/MessageSets.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.enumerations;
+package org.v2gclarity.risev2g.shared.enumerations;
 
 public enum MessageSets {
 	AC_CHARGING_EIM,

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/enumerations/V2GMessages.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.enumerations;
+package org.v2gclarity.risev2g.shared.enumerations;
 
 
 public enum V2GMessages {

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/exiCodec/EXISchemaFactoryExceptionHandler.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.exiCodec;
+package org.v2gclarity.risev2g.shared.exiCodec;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/exiCodec/EXIficientCodec.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/EXIficientCodec.java

@@ -1,4 +1,4 @@
-package org.eclipse.risev2g.shared.exiCodec;
+package org.v2gclarity.risev2g.shared.exiCodec;
 
 /*******************************************************************************
  * The MIT License (MIT)
@@ -39,11 +39,12 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
+import org.v2gclarity.risev2g.shared.enumerations.GlobalValues;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
+
 import com.siemens.ct.exi.EXIFactory;
 import com.siemens.ct.exi.GrammarFactory;
 import com.siemens.ct.exi.api.sax.EXIResult;

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/exiCodec/ExiCodec.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.exiCodec;
+package org.v2gclarity.risev2g.shared.exiCodec;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -39,12 +39,12 @@ import javax.xml.bind.ValidationEventHandler;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolReq;
-import org.eclipse.risev2g.shared.v2gMessages.appProtocol.SupportedAppProtocolRes;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignedInfoType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+import org.v2gclarity.risev2g.shared.enumerations.GlobalValues;
+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.SignedInfoType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public abstract class ExiCodec {
 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/exiCodec/OpenEXICodec.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/OpenEXICodec.java

@@ -21,19 +21,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.shared.exiCodec;
+package org.v2gclarity.risev2g.shared.exiCodec;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
+
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.sax.SAXTransformerFactory;
 import javax.xml.transform.sax.TransformerHandler;
 import javax.xml.transform.stream.StreamResult;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
+
 import org.openexi.proc.common.EXIOptionsException;
 import org.openexi.proc.common.GrammarOptions;
 import org.openexi.proc.grammars.GrammarCache;
@@ -44,6 +45,7 @@ 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.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/exiCodec/XSDResolver.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/exiCodec/XSDResolver.java

@@ -21,17 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.shared.exiCodec;
+package org.v2gclarity.risev2g.shared.exiCodec;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
+
 import org.apache.xerces.xni.XMLResourceIdentifier;
 import org.apache.xerces.xni.XNIException;
 import org.apache.xerces.xni.parser.XMLEntityResolver;
 import org.apache.xerces.xni.parser.XMLInputSource;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
 import org.openexi.scomp.EXISchemaFactory;
+import org.v2gclarity.risev2g.shared.enumerations.GlobalValues;
 
 /**
  * This class is needed to access all linked XSD files via an InputStream. Accessing XSD files

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/messageHandling/ChangeProcessingState.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.messageHandling;
+package org.v2gclarity.risev2g.shared.messageHandling;
 
-import org.eclipse.risev2g.shared.misc.State;
+import org.v2gclarity.risev2g.shared.misc.State;
 
 public class ChangeProcessingState extends ReactionToIncomingMessage {
 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/messageHandling/MessageHandler.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.messageHandling;
+package org.v2gclarity.risev2g.shared.messageHandling;
 
 import java.security.interfaces.ECPrivateKey;
 import java.util.Arrays;
@@ -31,23 +31,23 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.exiCodec.EXIficientCodec;
-import org.eclipse.risev2g.shared.exiCodec.ExiCodec;
-import org.eclipse.risev2g.shared.exiCodec.OpenEXICodec;
-import org.eclipse.risev2g.shared.misc.V2GCommunicationSession;
-import org.eclipse.risev2g.shared.misc.V2GTPMessage;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.BodyBaseType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.BodyType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.MessageHeaderType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.NotificationType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureValueType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignedInfoType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.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;
 
 
 public class MessageHandler {

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/messageHandling/PauseSession.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.messageHandling;
+package org.v2gclarity.risev2g.shared.messageHandling;
 
 public class PauseSession extends ReactionToIncomingMessage {
 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/messageHandling/ReactionToIncomingMessage.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.messageHandling;
+package org.v2gclarity.risev2g.shared.messageHandling;
 
 public abstract class ReactionToIncomingMessage {
 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/messageHandling/SendMessage.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.messageHandling;
+package org.v2gclarity.risev2g.shared.messageHandling;
 
-import org.eclipse.risev2g.shared.misc.State;
-import org.eclipse.risev2g.shared.misc.TimeRestrictions;
+import org.v2gclarity.risev2g.shared.misc.State;
+import org.v2gclarity.risev2g.shared.misc.TimeRestrictions;
 
 /**
  * There are four possible outcomes of processing an incoming message at the respective state

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/messageHandling/TerminateSession.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.messageHandling;
+package org.v2gclarity.risev2g.shared.messageHandling;
 
 public class TerminateSession extends ReactionToIncomingMessage {
 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/misc/State.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/State.java

@@ -21,20 +21,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.shared.misc;
+package org.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.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.MessageHandler;
-import org.eclipse.risev2g.shared.messageHandling.ReactionToIncomingMessage;
-import org.eclipse.risev2g.shared.messageHandling.SendMessage;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.BodyBaseType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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.utils.MiscUtils;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.V2GMessage;
 
 public abstract class State {
 	

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/misc/TimeRestrictions.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.misc;
+package org.v2gclarity.risev2g.shared.misc;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
+import org.v2gclarity.risev2g.shared.enumerations.V2GMessages;
 
 /**
  * All time restrictions are given as millisecond values. 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/misc/V2GCommunicationSession.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/V2GCommunicationSession.java

@@ -21,25 +21,26 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.shared.misc;
+package org.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.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.messageHandling.MessageHandler;
-import org.eclipse.risev2g.shared.messageHandling.PauseSession;
-import org.eclipse.risev2g.shared.messageHandling.TerminateSession;
-import org.eclipse.risev2g.shared.utils.ByteUtils;
-import org.eclipse.risev2g.shared.utils.MiscUtils;
-import org.eclipse.risev2g.shared.utils.SecurityUtils;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionListType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.V2GMessage;
+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;
 
 public abstract class V2GCommunicationSession extends Observable {
 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/misc/V2GTPMessage.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/misc/V2GTPMessage.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.shared.misc;
+package org.v2gclarity.risev2g.shared.misc;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/ByteUtils.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.utils;
+package org.v2gclarity.risev2g.shared.utils;
 
 import java.io.IOException;
 import java.io.InputStream;

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/MiscUtils.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/utils/MiscUtils.java

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  *******************************************************************************/
-package org.eclipse.risev2g.shared.utils;
+package org.v2gclarity.risev2g.shared.utils;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -39,13 +39,13 @@ import javax.xml.namespace.QName;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.enumerations.V2GMessages;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.BodyBaseType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignedInfoType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SupportedEnergyTransferModeType;
+import org.v2gclarity.risev2g.shared.enumerations.GlobalValues;
+import org.v2gclarity.risev2g.shared.enumerations.V2GMessages;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SignedInfoType;
+import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SupportedEnergyTransferModeType;
 
 
 public final class MiscUtils {

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/utils/SecurityUtils.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.utils;
+package org.v2gclarity.risev2g.shared.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -101,23 +101,23 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.eclipse.risev2g.shared.enumerations.GlobalValues;
-import org.eclipse.risev2g.shared.exiCodec.ExiCodec;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CanonicalizationMethodType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.CertificateChainType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ContractSignatureEncryptedPrivateKeyType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DiffieHellmanPublickeyType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.DigestMethodType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.EMAIDType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ListOfRootCertificateIDsType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.ReferenceType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureMethodType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignatureType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SignedInfoType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.SubCertificatesType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.TransformType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.TransformsType;
-import org.eclipse.risev2g.shared.v2gMessages.msgDef.X509IssuerSerialType;
+import org.v2gclarity.risev2g.shared.enumerations.GlobalValues;
+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.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 java.util.Base64;
 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/v2gMessages/SECCDiscoveryReq.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.v2gMessages;
+package org.v2gclarity.risev2g.shared.v2gMessages;
 
 import java.util.Arrays;
 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/v2gMessages/SECCDiscoveryRes.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.v2gMessages;
+package org.v2gclarity.risev2g.shared.v2gMessages;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/v2gMessages/appProtocol/AppProtocolType.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/AppProtocolType.java

@@ -29,7 +29,7 @@
 //
 
 
-package org.eclipse.risev2g.shared.v2gMessages.appProtocol;
+package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/v2gMessages/appProtocol/ObjectFactory.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ObjectFactory.java

@@ -29,7 +29,7 @@
 //
 
 
-package org.eclipse.risev2g.shared.v2gMessages.appProtocol;
+package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol;
 
 import javax.xml.bind.annotation.XmlRegistry;
 

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/v2gMessages/appProtocol/ResponseCodeType.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/ResponseCodeType.java

@@ -29,7 +29,7 @@
 //
 
 
-package org.eclipse.risev2g.shared.v2gMessages.appProtocol;
+package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolReq.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolReq.java

@@ -29,7 +29,7 @@
 //
 
 
-package org.eclipse.risev2g.shared.v2gMessages.appProtocol;
+package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol;
 
 import java.util.ArrayList;
 import java.util.List;

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolRes.java → RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/v2gMessages/appProtocol/SupportedAppProtocolRes.java

@@ -29,7 +29,7 @@
 //
 
 
-package org.eclipse.risev2g.shared.v2gMessages.appProtocol;
+package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

RISE-V2G-Shared/src/main/java/org/eclipse/risev2g/shared/v2gMessages/appProtocol/package-info.java → RISE-V2G-Shared/src/main/java/org/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.eclipse.risev2g.shared.v2gMessages.appProtocol;
+package org.v2gclarity.risev2g.shared.v2gMessages.appProtocol;