From 6e7b5311f1fe2f40167c160ca25d03e48e2e1b42 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Thu, 14 Nov 2024 11:16:51 -0500 Subject: [PATCH] fix jakarta/javax split issues --- jakarta/pom.xml | 6 ++++++ ...va => JakartaTransactionalAnnotationAdapter.java} | 12 ++++++------ .../module.properties | 3 ++- ...java => JavaxTransactionalAnnotationAdapter.java} | 8 ++++---- .../module.properties | 3 ++- 5 files changed, 20 insertions(+), 12 deletions(-) rename jakarta/src/main/java/com/inteligr8/alfresco/annotations/util/{JtaTransactionalAnnotationAdapter.java => JakartaTransactionalAnnotationAdapter.java} (81%) rename jakarta/src/main/resources/alfresco/module/{com_inteligr8_alfresco_annotations-platform-module => com_inteligr8_alfresco_annotations-jakarta-platform-module}/module.properties (72%) rename javax/src/main/java/com/inteligr8/alfresco/annotations/util/{JtaTransactionalAnnotationAdapter.java => JavaxTransactionalAnnotationAdapter.java} (81%) rename javax/src/main/resources/alfresco/module/{com_inteligr8_alfresco_annotations-platform-module => com_inteligr8_alfresco_annotations-javax-platform-module}/module.properties (72%) diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 6897c05..47bdcd2 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -16,6 +16,7 @@ 23.2.1 23.2.0.60 + 10-2.1 @@ -29,6 +30,11 @@ jakarta.transaction-api provided + + jakarta.servlet + jakarta.servlet-api + provided + diff --git a/jakarta/src/main/java/com/inteligr8/alfresco/annotations/util/JtaTransactionalAnnotationAdapter.java b/jakarta/src/main/java/com/inteligr8/alfresco/annotations/util/JakartaTransactionalAnnotationAdapter.java similarity index 81% rename from jakarta/src/main/java/com/inteligr8/alfresco/annotations/util/JtaTransactionalAnnotationAdapter.java rename to jakarta/src/main/java/com/inteligr8/alfresco/annotations/util/JakartaTransactionalAnnotationAdapter.java index e635dea..ac26454 100644 --- a/jakarta/src/main/java/com/inteligr8/alfresco/annotations/util/JtaTransactionalAnnotationAdapter.java +++ b/jakarta/src/main/java/com/inteligr8/alfresco/annotations/util/JakartaTransactionalAnnotationAdapter.java @@ -1,21 +1,21 @@ package com.inteligr8.alfresco.annotations.util; -import jakarta.transaction.Transactional; - import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; -public class JtaTransactionalAnnotationAdapter implements TransactionalAnnotationAdapter { +import jakarta.transaction.Transactional; + +public class JakartaTransactionalAnnotationAdapter implements JtaTransactionalAnnotationAdapter { public static final String JTA_INTERFACE_NAME = "jakarta.transaction.Transactional"; private final Transactional txl; - public static JtaTransactionalAnnotationAdapter cast(Object obj) { - return new JtaTransactionalAnnotationAdapter((Transactional) obj); + public static JakartaTransactionalAnnotationAdapter cast(Object obj) { + return new JakartaTransactionalAnnotationAdapter((Transactional) obj); } - public JtaTransactionalAnnotationAdapter(Transactional txl) { + public JakartaTransactionalAnnotationAdapter(Transactional txl) { this.txl = txl; } diff --git a/jakarta/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-platform-module/module.properties b/jakarta/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-jakarta-platform-module/module.properties similarity index 72% rename from jakarta/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-platform-module/module.properties rename to jakarta/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-jakarta-platform-module/module.properties index f821eae..3d75ee0 100644 --- a/jakarta/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-platform-module/module.properties +++ b/jakarta/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-jakarta-platform-module/module.properties @@ -1,7 +1,8 @@ module.id=${project.groupId}.${project.artifactId} +module.alias=${project.groupId}.annotations-platform-module module.title=${project.name} module.description=${project.description} -module.version=${project.version} +module.version=${module.version} module.repo.version.min=6.0 #module.repo.version.max= diff --git a/javax/src/main/java/com/inteligr8/alfresco/annotations/util/JtaTransactionalAnnotationAdapter.java b/javax/src/main/java/com/inteligr8/alfresco/annotations/util/JavaxTransactionalAnnotationAdapter.java similarity index 81% rename from javax/src/main/java/com/inteligr8/alfresco/annotations/util/JtaTransactionalAnnotationAdapter.java rename to javax/src/main/java/com/inteligr8/alfresco/annotations/util/JavaxTransactionalAnnotationAdapter.java index 3665021..31a0e4b 100644 --- a/javax/src/main/java/com/inteligr8/alfresco/annotations/util/JtaTransactionalAnnotationAdapter.java +++ b/javax/src/main/java/com/inteligr8/alfresco/annotations/util/JavaxTransactionalAnnotationAdapter.java @@ -5,17 +5,17 @@ import javax.transaction.Transactional; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; -public class JtaTransactionalAnnotationAdapter implements TransactionalAnnotationAdapter { +public class JavaxTransactionalAnnotationAdapter implements JtaTransactionalAnnotationAdapter { public static final String JTA_INTERFACE_NAME = "javax.transaction.Transactional"; private final Transactional txl; - public static JtaTransactionalAnnotationAdapter cast(Object obj) { - return new JtaTransactionalAnnotationAdapter((Transactional) obj); + public static JavaxTransactionalAnnotationAdapter cast(Object obj) { + return new JavaxTransactionalAnnotationAdapter((Transactional) obj); } - public JtaTransactionalAnnotationAdapter(Transactional txl) { + public JavaxTransactionalAnnotationAdapter(Transactional txl) { this.txl = txl; } diff --git a/javax/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-platform-module/module.properties b/javax/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-javax-platform-module/module.properties similarity index 72% rename from javax/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-platform-module/module.properties rename to javax/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-javax-platform-module/module.properties index f821eae..3d75ee0 100644 --- a/javax/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-platform-module/module.properties +++ b/javax/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-javax-platform-module/module.properties @@ -1,7 +1,8 @@ module.id=${project.groupId}.${project.artifactId} +module.alias=${project.groupId}.annotations-platform-module module.title=${project.name} module.description=${project.description} -module.version=${project.version} +module.version=${module.version} module.repo.version.min=6.0 #module.repo.version.max=