From 0ee208a38ef097089672d527378a90fcb3a9f7a2 Mon Sep 17 00:00:00 2001
From: dseurotech <davide.salvador@eurotech.com>
Date: Tue, 23 Jul 2024 10:53:17 +0200
Subject: [PATCH] :bug: defining the persistence unit in the right place

Signed-off-by: dseurotech <davide.salvador@eurotech.com>
---
 .../main/resources/META-INF/persistence.xml   | 17 +++++++++
 commons/src/main/resources/persistence.xml    | 36 -------------------
 ...tionServiceConfigurationManagerModule.java |  2 +-
 3 files changed, 18 insertions(+), 37 deletions(-)
 delete mode 100644 commons/src/main/resources/persistence.xml

diff --git a/commons/src/main/resources/META-INF/persistence.xml b/commons/src/main/resources/META-INF/persistence.xml
index 812fb433d4f..63487d5e689 100644
--- a/commons/src/main/resources/META-INF/persistence.xml
+++ b/commons/src/main/resources/META-INF/persistence.xml
@@ -40,4 +40,21 @@
             <property name="eclipselink.logging.logger" value="org.eclipse.persistence.logging.slf4j.SLF4JLogger"/>
         </properties>
     </persistence-unit>
+    <persistence-unit name="kapua-service-config" transaction-type="RESOURCE_LOCAL">
+
+        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+
+        <class>org.eclipse.kapua.commons.configuration.ServiceConfigImpl</class>
+
+        <!-- Base classes and External classes -->
+        <class>org.eclipse.kapua.commons.model.id.KapuaEid</class>
+        <class>org.eclipse.kapua.commons.model.AbstractKapuaEntity</class>
+        <class>org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity</class>
+        <class>org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity</class>
+
+        <properties>
+            <property name="javax.persistence.lock.timeout" value="1000"/>
+            <property name="eclipselink.logging.logger" value="org.eclipse.persistence.logging.slf4j.SLF4JLogger"/>
+        </properties>
+    </persistence-unit>
 </persistence>
diff --git a/commons/src/main/resources/persistence.xml b/commons/src/main/resources/persistence.xml
deleted file mode 100644
index 14497986862..00000000000
--- a/commons/src/main/resources/persistence.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
-
-    This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License 2.0
-    which is available at https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
-    Contributors:
-        Eurotech - initial API and implementation
-        Red Hat Inc
- -->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
-             version="2.0">
-    <persistence-unit name="kapua-service-config" transaction-type="RESOURCE_LOCAL">
-
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-
-        <class>org.eclipse.kapua.commons.configuration.ServiceConfigImpl</class>
-
-        <!-- Base classes and External classes -->
-        <class>org.eclipse.kapua.commons.model.id.KapuaEid</class>
-        <class>org.eclipse.kapua.commons.model.AbstractKapuaEntity</class>
-        <class>org.eclipse.kapua.commons.model.AbstractKapuaNamedEntity</class>
-        <class>org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity</class>
-
-        <properties>
-            <property name="javax.persistence.lock.timeout" value="1000"/>
-            <property name="eclipselink.logging.logger" value="org.eclipse.persistence.logging.slf4j.SLF4JLogger"/>
-        </properties>
-    </persistence-unit>
-</persistence>
diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceConnectionServiceConfigurationManagerModule.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceConnectionServiceConfigurationManagerModule.java
index 57e6cf4815e..76634373fbb 100644
--- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceConnectionServiceConfigurationManagerModule.java
+++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceConnectionServiceConfigurationManagerModule.java
@@ -59,7 +59,7 @@ ServiceConfigurationManager deviceConnectionServiceConfigurationManager(
             XmlUtil xmlUtil) {
         return new ServiceConfigurationManagerCachingWrapper(
                 new DeviceConnectionServiceConfigurationManager(
-                        txManagerFactory.create("kapua-datastore"),
+                        txManagerFactory.create("kapua-service-config"),
                         new CachingServiceConfigRepository(
                                 new ServiceConfigImplJpaRepository(jpaRepoConfig),
                                 entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")