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 <[email protected]> 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")
