Google Git
Sign in
third-party-mirror/glassfish/faab450b1c2228a092b4944dcb403836b2095a01^!/.
commit
faab450b1c2228a092b4944dcb403836b2095a01
[log]
author
Gaurav Gupta <gaurav.gupta@payara.fish>
Tue May 05 11:58:46 2020 +0530
committer
Gaurav Gupta <gaurav.gupta@payara.fish>
Tue May 05 11:58:46 2020 +0530
tree
62a560dc4ed0fae706c5e43fb539f729469b05d0
parent
f9b6228e8f2712f1d24049aa881079d5d38b9def [diff]
 Jakarta Batch API namespace transition

Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>

diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java
index bebd0cb..9cde923 100644
--- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java
+++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommand.java

@@ -23,8 +23,8 @@
 import org.glassfish.batch.spi.impl.BatchRuntimeHelper;
 import org.glassfish.batch.spi.impl.GlassFishBatchSecurityHelper;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
 import jakarta.inject.Inject;
 import java.util.*;
 import java.util.logging.Level;

diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutions.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutions.java
index 3ca31b8..69407fa 100644
--- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutions.java
+++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutions.java

@@ -27,9 +27,9 @@
 import org.glassfish.hk2.api.PerLookup;
 import org.jvnet.hk2.annotations.Service;
 
-import javax.batch.operations.*;
-import javax.batch.runtime.JobExecution;
-import javax.batch.runtime.JobInstance;
+import jakarta.batch.operations.*;
+import jakarta.batch.runtime.JobExecution;
+import jakarta.batch.runtime.JobInstance;
 import java.util.*;
 import java.util.logging.Level;
 

diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobSteps.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobSteps.java
index db5bd2e..df3764d 100644
--- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobSteps.java
+++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobSteps.java

@@ -27,12 +27,12 @@
 import org.glassfish.hk2.api.PerLookup;
 import org.jvnet.hk2.annotations.Service;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.operations.JobSecurityException;
-import javax.batch.operations.NoSuchJobExecutionException;
-import javax.batch.runtime.JobExecution;
-import javax.batch.runtime.Metric;
-import javax.batch.runtime.StepExecution;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.operations.JobSecurityException;
+import jakarta.batch.operations.NoSuchJobExecutionException;
+import jakarta.batch.runtime.JobExecution;
+import jakarta.batch.runtime.Metric;
+import jakarta.batch.runtime.StepExecution;
 import java.util.*;
 import java.util.logging.Level;
 

diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobs.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobs.java
index b2973dc..18a3d7b 100644
--- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobs.java
+++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobs.java

@@ -27,9 +27,9 @@
 import org.glassfish.hk2.api.PerLookup;
 import org.jvnet.hk2.annotations.Service;
 
-import javax.batch.operations.*;
-import javax.batch.runtime.JobExecution;
-import javax.batch.runtime.JobInstance;
+import jakarta.batch.operations.*;
+import jakarta.batch.runtime.JobExecution;
+import jakarta.batch.runtime.JobInstance;
 import java.util.*;
 import java.util.logging.Level;
 

diff --git a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java
index 157382a..4bfe708 100644
--- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java
+++ b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java

@@ -34,8 +34,8 @@
 import org.glassfish.internal.deployment.Deployment;
 import org.jvnet.hk2.annotations.Service;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import javax.naming.InitialContext;

diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
index ecca458..fb51bbb 100755
--- a/appserver/core/api-exporter-fragment/pom.xml
+++ b/appserver/core/api-exporter-fragment/pom.xml

@@ -75,14 +75,14 @@
 jakarta.annotation; \
 jakarta.annotation.security; \
 jakarta.annotation.sql; \
-javax.batch.api; \
-javax.batch.api.chunk; \
-javax.batch.api.chunk.listener; \
-javax.batch.api.listener; \
-javax.batch.api.partition; \
-javax.batch.operations; \
-javax.batch.runtime; \
-javax.batch.runtime.context; \
+jakarta.batch.api; \
+jakarta.batch.api.chunk; \
+jakarta.batch.api.chunk.listener; \
+jakarta.batch.api.listener; \
+jakarta.batch.api.partition; \
+jakarta.batch.operations; \
+jakarta.batch.runtime; \
+jakarta.batch.runtime.context; \
 javax.crypto; \
 javax.crypto.interfaces; \
 javax.crypto.spec; \

diff --git a/appserver/pom.xml b/appserver/pom.xml
index 6545b78..eb1d0a1 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml

@@ -99,9 +99,9 @@
         <yasson.version>2.0.0-M1</yasson.version>
         <concurrent-api.version>2.0.0-RC1</concurrent-api.version>
         <concurrent.version>2.0.0-RC1</concurrent.version>
-        <jakarta.batch-api.version>1.0.2</jakarta.batch-api.version>
-        <com.ibm.jbatch.container.version>1.0.2</com.ibm.jbatch.container.version>
-        <com.ibm.jbatch.spi.version>1.0.2</com.ibm.jbatch.spi.version>
+        <jakarta.batch-api.version>2.0.0-M1</jakarta.batch-api.version>
+        <com.ibm.jbatch.container.version>2.0.0-M1</com.ibm.jbatch.container.version>
+        <com.ibm.jbatch.spi.version>2.0.0-M1</com.ibm.jbatch.spi.version>
         <jboss.classfilewriter.version>1.2.1.Final</jboss.classfilewriter.version>
         <easymock.version>3.5</easymock.version>
 	<maven-rar-plugin.version>2.4</maven-rar-plugin.version>
@@ -273,7 +273,7 @@
                             <jarType>api</jarType>
                             <specVersion>1.0</specVersion>
                             <specImplVersion>${jakarta.batch-api.version}</specImplVersion>
-                            <apiPackage>javax.batch</apiPackage>
+                            <apiPackage>jakarta.batch</apiPackage>
                         </spec>
                         <spec>
                             <artifact>

diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java
index c2f989a..f4308b0 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemProcessor.java

@@ -19,7 +19,7 @@
 
 @jakarta.inject.Named("SimpleItemProcessor")
 public class SimpleItemProcessor
-    implements javax.batch.api.chunk.ItemProcessor {
+    implements jakarta.batch.api.chunk.ItemProcessor {
 
 //    @Inject
 //    IdGenerator idGen;

diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java
index d78d1c5..702b718 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemReader.java

@@ -18,7 +18,7 @@
 
 @jakarta.inject.Named("SimpleItemReader")
 public class SimpleItemReader
-    implements javax.batch.api.chunk.ItemReader {
+    implements jakarta.batch.api.chunk.ItemReader {
 
     private int index = 0;
     

diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java
index b5bdfa3..4fb5edd 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SimpleItemWriter.java

@@ -18,7 +18,7 @@
 import java.util.List;
 @jakarta.inject.Named("SimpleItemWriter")
 public class SimpleItemWriter
-    implements javax.batch.api.chunk.ItemWriter {
+    implements jakarta.batch.api.chunk.ItemWriter {
     
     @Override
     public void open(Serializable e) throws Exception {

diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
index 7c7b0e6..a1e09e7 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java

@@ -16,9 +16,9 @@
 
 import jakarta.annotation.PostConstruct;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.JobExecution;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.JobExecution;
 import jakarta.ejb.Stateless;
 import jakarta.ejb.EJB;
 import jakarta.ejb.TransactionManagement;

diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
index 1b3f215..959a3ac 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java

@@ -24,10 +24,10 @@
 import jakarta.inject.Inject;
 import jakarta.annotation.PostConstruct;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.JobExecution;
-import javax.batch.runtime.JobInstance;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.JobExecution;
+import jakarta.batch.runtime.JobInstance;
 import com.ibm.jbatch.spi.TaggedJobExecution;
 
 import jakarta.ejb.Stateless;

diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
index 3793407..4d5789d 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java

@@ -19,7 +19,7 @@
 
 @jakarta.inject.Named("SimpleItemProcessor")
 public class SimpleItemProcessor
-    implements javax.batch.api.chunk.ItemProcessor {
+    implements jakarta.batch.api.chunk.ItemProcessor {
 
 //    @Inject
 //    IdGenerator idGen;

diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
index dc00205..cc17c2f 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java

@@ -18,7 +18,7 @@
 
 @jakarta.inject.Named("SimpleItemReader")
 public class SimpleItemReader
-    implements javax.batch.api.chunk.ItemReader {
+    implements jakarta.batch.api.chunk.ItemReader {
 
     private int index = 0;
     

diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
index 46d6093..508f9a6 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java

@@ -18,7 +18,7 @@
 import java.util.List;
 @jakarta.inject.Named("SimpleItemWriter")
 public class SimpleItemWriter
-    implements javax.batch.api.chunk.ItemWriter {
+    implements jakarta.batch.api.chunk.ItemWriter {
     
     @Override
     public void open(Serializable e) throws Exception {

diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java
index 72782a5d..2bf5a38 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/JobSubmitterServlet.java

@@ -22,14 +22,14 @@
 import java.util.Map;
 import java.util.Properties;
 import jakarta.annotation.Resource;
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.JobExecution;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.JobExecution;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.batch.runtime.context.BatchContext;
+import jakarta.batch.runtime.context.BatchContext;
 import javax.enterprise.concurrent.ManagedExecutorService;
 import jakarta.inject.Inject;
 

diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java
index 169b603..248df8f 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemProcessor.java

@@ -19,7 +19,7 @@
 
 @jakarta.inject.Named//("com.oracle.javaee7.samples.batch.simple.SimpleItemProcessor")
 public class SimpleItemProcessor
-    implements javax.batch.api.ItemProcessor<String, String> {
+    implements jakarta.batch.api.ItemProcessor<String, String> {
 
 //    @Inject
 //    IdGenerator idGen;

diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java
index 9a59afd..f42b504 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemReader.java

@@ -18,7 +18,7 @@
 
 @jakarta.inject.Named("SimpleItemReader")
 public class SimpleItemReader
-    extends javax.batch.api.AbstractItemReader<String> {
+    extends jakarta.batch.api.AbstractItemReader<String> {
 
     private int index = 0;
     

diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java
index 3fcf2f4..122c8e0 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SimpleItemWriter.java

@@ -18,7 +18,7 @@
 import java.util.List;
 @jakarta.inject.Named("SimpleItemWriter")
 public class SimpleItemWriter
-    extends javax.batch.api.AbstractItemWriter<String> {
+    extends jakarta.batch.api.AbstractItemWriter<String> {
     
     @Override
     public void open(Externalizable e) throws Exception {

diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
index 9196caa..57d0830 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java

@@ -16,8 +16,8 @@
 
 import jakarta.annotation.PostConstruct;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
 import jakarta.ejb.Stateless;
 import jakarta.ejb.EJB;
 

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java
index 5d77be5..2150d36 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SimpleBatchlet.java

@@ -19,7 +19,7 @@
 
 @jakarta.inject.Named
 public class SimpleBatchlet
-    implements javax.batch.api.Batchlet {
+    implements jakarta.batch.api.Batchlet {
 
     @Override
     public String process() throws Exception {

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
index 282536a..f78633c 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java

@@ -16,9 +16,9 @@
 
 import jakarta.annotation.PostConstruct;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.JobExecution;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.JobExecution;
 import jakarta.ejb.Stateless;
 import jakarta.ejb.EJB;
 

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
index 1b3f215..959a3ac 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java

@@ -24,10 +24,10 @@
 import jakarta.inject.Inject;
 import jakarta.annotation.PostConstruct;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.JobExecution;
-import javax.batch.runtime.JobInstance;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.JobExecution;
+import jakarta.batch.runtime.JobInstance;
 import com.ibm.jbatch.spi.TaggedJobExecution;
 
 import jakarta.ejb.Stateless;

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
index fdb5336..f40bab6 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemProcessor.java

@@ -19,7 +19,7 @@
 
 @jakarta.inject.Named("SimpleItemProcessor")
 public class SimpleItemProcessor
-    implements javax.batch.api.chunk.ItemProcessor {
+    implements jakarta.batch.api.chunk.ItemProcessor {
 
     @Inject
     IdGenerator idGen;

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
index dc00205..cc17c2f 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemReader.java

@@ -18,7 +18,7 @@
 
 @jakarta.inject.Named("SimpleItemReader")
 public class SimpleItemReader
-    implements javax.batch.api.chunk.ItemReader {
+    implements jakarta.batch.api.chunk.ItemReader {
 
     private int index = 0;
     

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
index 2043df5..15c5e9e 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/SimpleItemWriter.java

@@ -18,7 +18,7 @@
 import java.util.List;
 @jakarta.inject.Named("SimpleItemWriter")
 public class SimpleItemWriter
-    implements javax.batch.api.chunk.ItemWriter {
+    implements jakarta.batch.api.chunk.ItemWriter {
     
     @Override
     public void open(Serializable e) throws Exception {

diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java
index a8b9b6c..21f42b5 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemProcessor.java

@@ -19,7 +19,7 @@
 
 @jakarta.inject.Named//("com.oracle.javaee7.samples.batch.simple.SimpleItemProcessor")
 public class SimpleItemProcessor
-    implements javax.batch.api.ItemProcessor<String, String> {
+    implements jakarta.batch.api.ItemProcessor<String, String> {
 
 //    @Inject
 //    IdGenerator idGen;

diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java
index 2b27f0e..6a4e688 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemReader.java

@@ -18,7 +18,7 @@
 
 @jakarta.inject.Named("SimpleItemReader")
 public class SimpleItemReader
-    extends javax.batch.api.AbstractItemReader<String> {
+    extends jakarta.batch.api.AbstractItemReader<String> {
 
     private int index = 0;
     

diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java
index 04afc61..ef14792 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SimpleItemWriter.java

@@ -18,7 +18,7 @@
 import java.util.List;
 @jakarta.inject.Named("SimpleItemWriter")
 public class SimpleItemWriter
-    extends javax.batch.api.AbstractItemWriter<String> {
+    extends jakarta.batch.api.AbstractItemWriter<String> {
     
     @Override
     public void open(Externalizable e) throws Exception {

diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
index 415b313..b96ce96 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java

@@ -16,9 +16,9 @@
 
 import jakarta.annotation.PostConstruct;
 
-import javax.batch.operations.JobOperator;
-import javax.batch.runtime.BatchRuntime;
-import javax.batch.runtime.JobExecution;
+import jakarta.batch.operations.JobOperator;
+import jakarta.batch.runtime.BatchRuntime;
+import jakarta.batch.runtime.JobExecution;
 import jakarta.ejb.Stateless;
 import jakarta.ejb.EJB;