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:52 UTC
[tomee-patch-plugin] 02/11: Update variable references
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;