You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2020/06/13 23:23:50 UTC
[tomee-patch-plugin] branch master updated (bff48fc -> dad7e8d)
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git.
from bff48fc Fully functional jar-patching and good log output
new 1ffab8d Update specific annotation values that reference javax
new cca6e19 Update variable references
new 6581227 Update field references that slipped through
new f5a0181 Fix module references
new bae2640 Replace javax.servlet, javax.faces and javax.el references in text file contents
new 08ea813 javax.jms, javax.persistence and javax.resource in text files
new cbd0e43 Replace the majority of applicable javax packages in text files Sans javax.enterprise, javax.annotation, javax.transaction
new 723c1d1 Replace javax\.faces found in javascript files
new b6450f5 Do not modify certain files
new 36cb5fe Modifications for OpenWebBeans
new dad7e8d Fix serlvet type and references to javax.transaction
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tomee-patch-core/pom.xml | 5 ++
.../tomee/patch/core/AnnotationTransformer.java | 16 ++++++
.../apache/tomee/patch/core/ClassTransformer.java | 13 ++++-
.../apache/tomee/patch/core/MethodTransformer.java | 14 ++++-
.../apache/tomee/patch/core/ModuleTransformer.java | 26 ++++++++++
.../java/org/apache/tomee/patch/core/Replace.java} | 26 +++++-----
.../apache/tomee/patch/core/Transformation.java | 59 +++++++++++++++++++++-
7 files changed, 143 insertions(+), 16 deletions(-)
copy tomee-patch-core/src/{test/java/org/apache/tomee/patch/core/SignatureTransformerTest.java => main/java/org/apache/tomee/patch/core/Replace.java} (65%)
[tomee-patch-plugin] 01/11: Update specific annotation values that
reference javax
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit 1ffab8d69d1638d63c059d0549cc2be40368b6a3
Author: David Blevins <da...@gmail.com>
AuthorDate: Fri Jun 12 19:44:00 2020 -0700
Update specific annotation values that reference javax
---
.../tomee/patch/core/AnnotationTransformer.java | 16 +++++++++++++++
.../{AnnotationTransformer.java => Replace.java} | 23 +++++++++++-----------
2 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/AnnotationTransformer.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/AnnotationTransformer.java
index 5269b93..c9ba8c4 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/AnnotationTransformer.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/AnnotationTransformer.java
@@ -34,4 +34,20 @@ public class AnnotationTransformer extends AnnotationVisitor {
return new AnnotationTransformer(this.api, super.visitArray(name));
}
+ @Override
+ public void visit(final String name, final Object value) {
+ if (!(value instanceof String)) {
+ super.visit(name, value);
+ return;
+ }
+
+ final String updated = new Replace((String) value)
+ .prefix("{javax.validation.", "{jakarta.validation.")
+ .prefix("javax.persistence.", "jakarta.persistence.")
+ .prefix("javax.xml.ws.", "jakarta.xml.ws.")
+ .get();
+
+ super.visit(name, updated);
+ }
+
}
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/AnnotationTransformer.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Replace.java
similarity index 59%
copy from tomee-patch-core/src/main/java/org/apache/tomee/patch/core/AnnotationTransformer.java
copy to tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Replace.java
index 5269b93..352190d 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/AnnotationTransformer.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Replace.java
@@ -16,22 +16,21 @@
*/
package org.apache.tomee.patch.core;
-import org.objectweb.asm.AnnotationVisitor;
+public class Replace {
+ private String text;
-public class AnnotationTransformer extends AnnotationVisitor {
-
- public AnnotationTransformer(final int api, final AnnotationVisitor annotationVisitor) {
- super(api, annotationVisitor);
+ public Replace(final String text) {
+ this.text = text;
}
- @Override
- public AnnotationVisitor visitAnnotation(final String name, final String descriptor) {
- return new AnnotationTransformer(this.api, super.visitAnnotation(name, descriptor));
+ public Replace prefix(final String from, final String to) {
+ if (text.startsWith(from)) {
+ text = text.replace(from, to);
+ }
+ return this;
}
- @Override
- public AnnotationVisitor visitArray(final String name) {
- return new AnnotationTransformer(this.api, super.visitArray(name));
+ public String get() {
+ return text;
}
-
}
[tomee-patch-plugin] 11/11: Fix serlvet type and references to
javax.transaction
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit dad7e8d342b528b32d1f0f19ba56f7b9cd93dc96
Author: David Blevins <da...@gmail.com>
AuthorDate: Sat Jun 13 13:50:56 2020 -0700
Fix serlvet type and references to javax.transaction
---
.../src/main/java/org/apache/tomee/patch/core/Transformation.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
index cc31b39..8da04f9 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
@@ -140,6 +140,7 @@ public class Transformation {
if (path.endsWith("META-INF/DEPENDENCIES")) return true;
if (path.endsWith("META-INF/dependencies.xml")) return true;
if (path.endsWith("changelog.html")) return true;
+ if (path.endsWith("RELEASE-NOTES.txt")) return true;
if (path.endsWith("pom.xml")) return true;
return false;
}
@@ -154,6 +155,11 @@ public class Transformation {
}
inputStream = StreamBuilder.create(inputStream)
+ .replace("javax.jsp", "jakarta.servlet.jsp")
+ .replace("serlvet", "servlet")
+ .replace("javax.transaction.TransactionManager", "jakarta.transaction.TransactionManager")
+ .replace("javax.transaction.Transaction", "jakarta.transaction.Transaction")
+ .replace("javax.annotation.Resource", "jakarta.annotation.Resource")
.replace("javax.activation", "jakarta.activation")
.replace("javax.batch", "jakarta.batch")
.replace("javax.decorator", "jakarta.decorator")
[tomee-patch-plugin] 06/11: javax.jms,
javax.persistence and javax.resource in text files
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit 08ea8134a984553a691280b95849785ced462b7a
Author: David Blevins <da...@gmail.com>
AuthorDate: Fri Jun 12 21:24:03 2020 -0700
javax.jms, javax.persistence and javax.resource in text files
---
.../src/main/java/org/apache/tomee/patch/core/Transformation.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
index be617bc..277afd3 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
@@ -139,6 +139,9 @@ public class Transformation {
.replace("javax.el.ELResolver", "jakarta.el.ELResolver")
.replace("javax.servlet.", "jakarta.servlet.")
.replace("javax.faces.", "jakarta.faces.")
+ .replace("javax.jms.", "jakarta.jms.")
+ .replace("javax.persistence.", "jakarta.persistence.")
+ .replace("javax.resource.", "jakarta.resource.")
.get();
IO.copy(inputStream, outputStream);
}
[tomee-patch-plugin] 08/11: Replace javax\.faces found in
javascript files
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit 723c1d1d09b20b701d1bab4b7d5c1ea16b948c61
Author: David Blevins <da...@gmail.com>
AuthorDate: Sat Jun 13 09:15:01 2020 -0700
Replace javax\.faces found in javascript files
---
.../src/main/java/org/apache/tomee/patch/core/Transformation.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
index ae930a5..1aa761f 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
@@ -161,6 +161,7 @@ public class Transformation {
.replace("javax.xml.bind", "jakarta.xml.bind")
.replace("javax.xml.soap", "jakarta.xml.soap")
.replace("javax.xml.ws", "jakarta.xml.ws")
+ .replace("javax\\.faces", "jakarta\\.faces") // in some javascript files
.get();
IO.copy(inputStream, outputStream);
}
[tomee-patch-plugin] 05/11: Replace javax.servlet,
javax.faces and javax.el references in text file contents
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit bae2640d6a7f103bf17bfdebadb826700dbbaae0
Author: David Blevins <da...@gmail.com>
AuthorDate: Fri Jun 12 21:11:38 2020 -0700
Replace javax.servlet, javax.faces and javax.el references in text file contents
---
tomee-patch-core/pom.xml | 5 +++++
.../java/org/apache/tomee/patch/core/Transformation.java | 12 +++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/tomee-patch-core/pom.xml b/tomee-patch-core/pom.xml
index 9ab050c..5a12ccb 100644
--- a/tomee-patch-core/pom.xml
+++ b/tomee-patch-core/pom.xml
@@ -72,6 +72,11 @@
<version>1.3.13</version>
</dependency>
<dependency>
+ <groupId>org.tomitribe</groupId>
+ <artifactId>swizzle</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>org.tomitribe.jkta</groupId>
<artifactId>jkta</artifactId>
<version>0.10</version>
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
index 09faa88..be617bc 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
@@ -19,6 +19,7 @@ package org.apache.tomee.patch.core;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Opcodes;
+import org.tomitribe.swizzle.stream.StreamBuilder;
import org.tomitribe.util.IO;
import java.io.File;
@@ -102,7 +103,7 @@ public class Transformation {
} else if (isZip(path)) {
scanJar(path, zipInputStream, zipOutputStream);
} else {
- IO.copy(zipInputStream, zipOutputStream);
+ scanResource(zipInputStream, zipOutputStream);
}
} finally {
zipOutputStream.closeEntry();
@@ -133,6 +134,15 @@ public class Transformation {
}
}
+ private void scanResource(InputStream inputStream, final OutputStream outputStream) throws IOException {
+ inputStream = StreamBuilder.create(inputStream)
+ .replace("javax.el.ELResolver", "jakarta.el.ELResolver")
+ .replace("javax.servlet.", "jakarta.servlet.")
+ .replace("javax.faces.", "jakarta.faces.")
+ .get();
+ IO.copy(inputStream, outputStream);
+ }
+
private static void copyAttributes(final ZipEntry oldEntry, final ZipEntry newEntry) {
Copy.copy(oldEntry, newEntry)
.att(ZipEntry::getTime, ZipEntry::setTime)
[tomee-patch-plugin] 09/11: Do not modify certain files
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit b6450f5ab615c5b11850acb9b0588d0f12b34bbc
Author: David Blevins <da...@gmail.com>
AuthorDate: Sat Jun 13 11:27:49 2020 -0700
Do not modify certain files
---
.../main/java/org/apache/tomee/patch/core/Transformation.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
index 1aa761f..ec3c47d 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
@@ -102,6 +102,8 @@ public class Transformation {
scanClass(zipInputStream, zipOutputStream);
} else if (isZip(path)) {
scanJar(path, zipInputStream, zipOutputStream);
+ } else if (copyUnmodified(path)){
+ IO.copy(zipInputStream, zipOutputStream);
} else {
scanResource(zipInputStream, zipOutputStream);
}
@@ -134,6 +136,13 @@ public class Transformation {
}
}
+ private boolean copyUnmodified(final String path) {
+ if (path.endsWith("META-INF/DEPENDENCIES")) return true;
+ if (path.endsWith("META-INF/dependencies.xml")) return true;
+ if (path.endsWith("pom.xml")) return true;
+ return false;
+ }
+
private void scanResource(InputStream inputStream, final OutputStream outputStream) throws IOException {
inputStream = StreamBuilder.create(inputStream)
.replace("javax.activation", "jakarta.activation")
[tomee-patch-plugin] 10/11: Modifications for OpenWebBeans
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit 36cb5fe11010f0f3051abbb95b30cf2897ca16aa
Author: David Blevins <da...@gmail.com>
AuthorDate: Sat Jun 13 12:26:36 2020 -0700
Modifications for OpenWebBeans
---
.../org/apache/tomee/patch/core/MethodTransformer.java | 1 +
.../java/org/apache/tomee/patch/core/Transformation.java | 15 ++++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/MethodTransformer.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/MethodTransformer.java
index c72aacd..d031a05 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/MethodTransformer.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/MethodTransformer.java
@@ -91,6 +91,7 @@ public class MethodTransformer extends MethodVisitor {
.replace("javax.persistence.", "jakarta.persistence.")
.replace("javax.transaction.TransactionManager", "jakarta.transaction.TransactionManager")
.replace("javax.transaction.global.timeout", "jakarta.transaction.global.timeout")
+ .replace("org.apache.webbeans.proxy.mapping.javax.enterprise", "org.apache.webbeans.proxy.mapping.jakarta.enterprise")
.replace("javax.xml.ws.", "jakarta.xml.ws.")
.replace("Ljavax/persistence", "Ljakarta/persistence")
.get();
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
index ec3c47d..cc31b39 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
@@ -102,10 +102,10 @@ public class Transformation {
scanClass(zipInputStream, zipOutputStream);
} else if (isZip(path)) {
scanJar(path, zipInputStream, zipOutputStream);
- } else if (copyUnmodified(path)){
+ } else if (copyUnmodified(path)) {
IO.copy(zipInputStream, zipOutputStream);
} else {
- scanResource(zipInputStream, zipOutputStream);
+ scanResource(path, zipInputStream, zipOutputStream);
}
} finally {
zipOutputStream.closeEntry();
@@ -139,11 +139,20 @@ public class Transformation {
private boolean copyUnmodified(final String path) {
if (path.endsWith("META-INF/DEPENDENCIES")) return true;
if (path.endsWith("META-INF/dependencies.xml")) return true;
+ if (path.endsWith("changelog.html")) return true;
if (path.endsWith("pom.xml")) return true;
return false;
}
- private void scanResource(InputStream inputStream, final OutputStream outputStream) throws IOException {
+ private void scanResource(final String path, InputStream inputStream, final OutputStream outputStream) throws IOException {
+ if (path.endsWith("openwebbeans.properties")) {
+ inputStream = StreamBuilder.create(inputStream)
+ .replace("org.apache.webbeans.proxy.mapping.javax.enterprise", "org.apache.webbeans.proxy.mapping.jakarta.enterprise")
+ .replace("\n /javax, \\\n", "\n /javax, \\\n /jakarta, \\\n")
+ .replace("javax.enterprise.inject.allowProxying.classes", "jakarta.enterprise.inject.allowProxying.classes")
+ .get();
+ }
+
inputStream = StreamBuilder.create(inputStream)
.replace("javax.activation", "jakarta.activation")
.replace("javax.batch", "jakarta.batch")
[tomee-patch-plugin] 02/11: Update variable references
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit cca6e19e2c307477e96436381fb992516373fce9
Author: David Blevins <da...@gmail.com>
AuthorDate: Fri Jun 12 20:10:53 2020 -0700
Update variable references
---
.../java/org/apache/tomee/patch/core/MethodTransformer.java | 13 +++++++++++--
.../src/main/java/org/apache/tomee/patch/core/Replace.java | 4 ++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/MethodTransformer.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/MethodTransformer.java
index 8666b34..c72aacd 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/MethodTransformer.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/MethodTransformer.java
@@ -75,7 +75,7 @@ public class MethodTransformer extends MethodVisitor {
}
@Override
- public void visitLdcInsn(final Object cst) {
+ public void visitLdcInsn(Object cst) {
if (cst instanceof Integer) {
// ...
} else if (cst instanceof Float) {
@@ -85,7 +85,16 @@ public class MethodTransformer extends MethodVisitor {
} else if (cst instanceof Double) {
// ...
} else if (cst instanceof String) {
- // ...
+ cst = new Replace((String) cst)
+ .replace("javax.faces", "jakarta.faces")
+ .replace("javax_faces", "jakarta_faces")
+ .replace("javax.persistence.", "jakarta.persistence.")
+ .replace("javax.transaction.TransactionManager", "jakarta.transaction.TransactionManager")
+ .replace("javax.transaction.global.timeout", "jakarta.transaction.global.timeout")
+ .replace("javax.xml.ws.", "jakarta.xml.ws.")
+ .replace("Ljavax/persistence", "Ljakarta/persistence")
+ .get();
+
} else if (cst instanceof Type) {
// ...
} else if (cst instanceof Handle) {
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Replace.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Replace.java
index 352190d..ab7a350 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Replace.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Replace.java
@@ -29,6 +29,10 @@ public class Replace {
}
return this;
}
+ public Replace replace(final String from, final String to) {
+ text = text.replace(from, to);
+ return this;
+ }
public String get() {
return text;
[tomee-patch-plugin] 07/11: Replace the majority of applicable
javax packages in text files Sans javax.enterprise, javax.annotation,
javax.transaction
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit cbd0e437d42e998444afa87ecf66efed6e97a4a2
Author: David Blevins <da...@gmail.com>
AuthorDate: Sat Jun 13 08:57:12 2020 -0700
Replace the majority of applicable javax packages in text files
Sans javax.enterprise, javax.annotation, javax.transaction
---
.../apache/tomee/patch/core/Transformation.java | 31 +++++++++++++++++-----
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
index 277afd3..ae930a5 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/Transformation.java
@@ -136,12 +136,31 @@ public class Transformation {
private void scanResource(InputStream inputStream, final OutputStream outputStream) throws IOException {
inputStream = StreamBuilder.create(inputStream)
- .replace("javax.el.ELResolver", "jakarta.el.ELResolver")
- .replace("javax.servlet.", "jakarta.servlet.")
- .replace("javax.faces.", "jakarta.faces.")
- .replace("javax.jms.", "jakarta.jms.")
- .replace("javax.persistence.", "jakarta.persistence.")
- .replace("javax.resource.", "jakarta.resource.")
+ .replace("javax.activation", "jakarta.activation")
+ .replace("javax.batch", "jakarta.batch")
+ .replace("javax.decorator", "jakarta.decorator")
+ .replace("javax.ejb", "jakarta.ejb")
+ .replace("javax.el", "jakarta.el")
+ .replace("javax.enterprise.concurrent", "jakarta.enterprise.concurrent")
+ .replace("javax.faces", "jakarta.faces")
+ .replace("javax.inject", "jakarta.inject")
+ .replace("javax.interceptor", "jakarta.interceptor")
+ .replace("javax.jms", "jakarta.jms")
+ .replace("javax.json", "jakarta.json")
+ .replace("javax.jws", "jakarta.jws")
+ .replace("javax.mail", "jakarta.mail")
+ .replace("javax.persistence", "jakarta.persistence")
+ .replace("javax.resource", "jakarta.resource")
+ .replace("javax.security.auth.message", "jakarta.security.auth.message")
+ .replace("javax.security.enterprise", "jakarta.security.enterprise")
+ .replace("javax.security.jacc", "jakarta.security.jacc")
+ .replace("javax.servlet", "jakarta.servlet")
+ .replace("javax.validation", "jakarta.validation")
+ .replace("javax.websocket", "jakarta.websocket")
+ .replace("javax.ws.rs", "jakarta.ws.rs")
+ .replace("javax.xml.bind", "jakarta.xml.bind")
+ .replace("javax.xml.soap", "jakarta.xml.soap")
+ .replace("javax.xml.ws", "jakarta.xml.ws")
.get();
IO.copy(inputStream, outputStream);
}
[tomee-patch-plugin] 03/11: Update field references that slipped
through
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit 6581227c4ddf3f2ba0d159e847674d1934935bdf
Author: David Blevins <da...@gmail.com>
AuthorDate: Fri Jun 12 20:26:30 2020 -0700
Update field references that slipped through
---
.../java/org/apache/tomee/patch/core/ClassTransformer.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/ClassTransformer.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/ClassTransformer.java
index 64de18a..ab1b775 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/ClassTransformer.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/ClassTransformer.java
@@ -39,7 +39,16 @@ public class ClassTransformer extends ClassVisitor {
}
@Override
- public FieldVisitor visitField(final int access, final String name, final String descriptor, final String signature, final Object value) {
+ public FieldVisitor visitField(final int access, final String name, final String descriptor, final String signature, Object value) {
+
+ if (value instanceof String) {
+ value = new Replace((String) value)
+ .replace("javax.faces", "jakarta.faces")
+ .replace("javax_faces", "jakarta_faces")
+ .replace("javax.persistence.", "jakarta.persistence.")
+ .get();
+ }
+
return new FieldTransformer(this.api, super.visitField(access, name, descriptor, signature, value));
}
@@ -57,4 +66,6 @@ public class ClassTransformer extends ClassVisitor {
public AnnotationVisitor visitTypeAnnotation(final int typeRef, final TypePath typePath, final String descriptor, final boolean visible) {
return new AnnotationTransformer(this.api, super.visitTypeAnnotation(typeRef, typePath, descriptor, visible));
}
+
+
}
[tomee-patch-plugin] 04/11: Fix module references
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-patch-plugin.git
commit f5a01815f0c39786b37c85c6f09590a50c13e154
Author: David Blevins <da...@gmail.com>
AuthorDate: Fri Jun 12 20:41:15 2020 -0700
Fix module references
---
.../apache/tomee/patch/core/ModuleTransformer.java | 26 ++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/ModuleTransformer.java b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/ModuleTransformer.java
index d295d28..67e0853 100644
--- a/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/ModuleTransformer.java
+++ b/tomee-patch-core/src/main/java/org/apache/tomee/patch/core/ModuleTransformer.java
@@ -23,4 +23,30 @@ public class ModuleTransformer extends ModuleVisitor {
public ModuleTransformer(final int api, final ModuleVisitor moduleVisitor) {
super(api, moduleVisitor);
}
+
+ @Override
+ public void visitExport(String packaze, final int access, final String... modules) {
+ packaze = new Replace(packaze)
+ .replace("javax/xml/bind", "jakarta/xml/bind")
+ .get();
+ super.visitExport(packaze, access, modules);
+ }
+
+ @Override
+ public void visitProvide(String service, final String... providers) {
+ service = new Replace(service)
+ .replace("javax/xml/bind", "jakarta/xml/bind")
+ .replace("javax/xml/soap", "jakarta/xml/soap")
+ .get();
+ super.visitProvide(service, providers);
+ }
+
+ @Override
+ public void visitUse(String service) {
+ service = new Replace(service)
+ .replace("javax/xml/bind", "jakarta/xml/bind")
+ .replace("javax/xml/soap", "jakarta/xml/soap")
+ .get();
+ super.visitUse(service);
+ }
}