inteligr8/annotations-platform-module
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix jakarta/javax split issues

Browse Source
This commit is contained in:
Brian Long 2024-11-14 11:16:51 -05:00
parent a07079f17d
commit 6e7b5311f1
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jakarta/pom.xml
View File

@ -16,6 +16,7 @@
<properties> <properties>
<alfresco.platform.version>23.2.1</alfresco.platform.version> <alfresco.platform.version>23.2.1</alfresco.platform.version>
<alfresco.platform.war.version>23.2.0.60</alfresco.platform.war.version> <alfresco.platform.war.version>23.2.0.60</alfresco.platform.war.version>
<tomcat-rad.version>10-2.1</tomcat-rad.version>
</properties> </properties>
<dependencies> <dependencies>
@ -29,6 +30,11 @@
<artifactId>jakarta.transaction-api</artifactId> <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

12
jakarta/src/main/java/com/inteligr8/alfresco/annotations/util/JtaTransactionalAnnotationAdapter.java → jakarta/src/main/java/com/inteligr8/alfresco/annotations/util/JakartaTransactionalAnnotationAdapter.java
View File

@ -1,21 +1,21 @@
package com.inteligr8.alfresco.annotations.util; package com.inteligr8.alfresco.annotations.util;
import jakarta.transaction.Transactional;
import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation; 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"; public static final String JTA_INTERFACE_NAME = "jakarta.transaction.Transactional";
private final Transactional txl; private final Transactional txl;
public static JtaTransactionalAnnotationAdapter cast(Object obj) { public static JakartaTransactionalAnnotationAdapter cast(Object obj) {
return new JtaTransactionalAnnotationAdapter((Transactional) obj); return new JakartaTransactionalAnnotationAdapter((Transactional) obj);
} }
public JtaTransactionalAnnotationAdapter(Transactional txl) { public JakartaTransactionalAnnotationAdapter(Transactional txl) {
this.txl = txl; this.txl = txl;
} }

3
jakarta/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-platform-module/module.properties → jakarta/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-jakarta-platform-module/module.properties
View File

@ -1,7 +1,8 @@
module.id=${project.groupId}.${project.artifactId} module.id=${project.groupId}.${project.artifactId}
module.alias=${project.groupId}.annotations-platform-module
module.title=${project.name} module.title=${project.name}
module.description=${project.description} module.description=${project.description}
module.version=${project.version} module.version=${module.version}
module.repo.version.min=6.0 module.repo.version.min=6.0
#module.repo.version.max= #module.repo.version.max=

8
javax/src/main/java/com/inteligr8/alfresco/annotations/util/JtaTransactionalAnnotationAdapter.java → javax/src/main/java/com/inteligr8/alfresco/annotations/util/JavaxTransactionalAnnotationAdapter.java
View File

@ -5,17 +5,17 @@ import javax.transaction.Transactional;
import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation; 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"; public static final String JTA_INTERFACE_NAME = "javax.transaction.Transactional";
private final Transactional txl; private final Transactional txl;
public static JtaTransactionalAnnotationAdapter cast(Object obj) { public static JavaxTransactionalAnnotationAdapter cast(Object obj) {
return new JtaTransactionalAnnotationAdapter((Transactional) obj); return new JavaxTransactionalAnnotationAdapter((Transactional) obj);
} }
public JtaTransactionalAnnotationAdapter(Transactional txl) { public JavaxTransactionalAnnotationAdapter(Transactional txl) {
this.txl = txl; this.txl = txl;
} }

3
javax/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-platform-module/module.properties → javax/src/main/resources/alfresco/module/com_inteligr8_alfresco_annotations-javax-platform-module/module.properties
View File

@ -1,7 +1,8 @@
module.id=${project.groupId}.${project.artifactId} module.id=${project.groupId}.${project.artifactId}
module.alias=${project.groupId}.annotations-platform-module
module.title=${project.name} module.title=${project.name}
module.description=${project.description} module.description=${project.description}
module.version=${project.version} module.version=${module.version}
module.repo.version.min=6.0 module.repo.version.min=6.0
#module.repo.version.max= #module.repo.version.max=