Commit 6e7b5311 authored by Brian Long's avatar Brian Long
Browse files

fix jakarta/javax split issues

parent a07079f1

jakarta/pom.xml

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
	<properties>

		<alfresco.platform.version>23.2.1</alfresco.platform.version>

		<alfresco.platform.war.version>23.2.0.60</alfresco.platform.war.version>

		<tomcat-rad.version>10-2.1</tomcat-rad.version>

	</properties>



	<dependencies>
@@ -29,6 +30,11 @@ 
			<artifactId>jakarta.transaction-api</artifactId>

			<scope>provided</scope>

		</dependency>

		<dependency>

			<groupId>jakarta.servlet</groupId>

			<artifactId>jakarta.servlet-api</artifactId>

			<scope>provided</scope>

		</dependency>

	</dependencies>



	<build>

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

+6 −6
Original line number Diff line number Diff line 
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;

	}

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

+2 −1
Original line number Diff line number Diff line 
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=

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

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

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

+2 −1
Original line number Diff line number Diff line 
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=