You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2021/01/13 13:38:30 UTC
[tomee] branch master updated (10121a5 -> f3f8d37)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 10121a5 Merge pull request #748 from cesarhernandezgt/master-2021
new 00f4282 Classloader changes for shaded taglibs
new d437159 Merge remote-tracking branch 'apache/master'
new f3f8d37 Update Tomcat to 9.0.41
The 3 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:
.../src/main/java/org/apache/openejb/config/ReadDescriptors.java | 2 +-
.../src/main/java/org/apache/openejb/config/TldScanner.java | 2 +-
.../org/apache/openejb/persistence/PersistenceUnitInfoImpl.java | 9 ++++++++-
.../org/apache/openejb/util/classloader/URLClassLoaderFirst.java | 9 ++++++++-
container/openejb-core/src/main/resources/default.exclusions | 1 +
pom.xml | 2 +-
6 files changed, 20 insertions(+), 5 deletions(-)
[tomee] 03/03: Update Tomcat to 9.0.41
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f3f8d37076e951c806e14a135a1fcca7b7d5f054
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Jan 13 13:38:03 2021 +0000
Update Tomcat to 9.0.41
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6af11b5..8bb2598 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
<version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
- <tomcat.version>9.0.40</tomcat.version>
+ <tomcat.version>9.0.41</tomcat.version>
<cxf.version>3.3.8</cxf.version>
<ehcache.version>2.10.3</ehcache.version>
[tomee] 01/03: Classloader changes for shaded taglibs
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 00f4282b90f523ac6574f7bc9f24648c168b47bb
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Jan 13 10:21:58 2021 +0000
Classloader changes for shaded taglibs
---
.../src/main/java/org/apache/openejb/config/ReadDescriptors.java | 2 +-
.../src/main/java/org/apache/openejb/config/TldScanner.java | 2 +-
.../org/apache/openejb/persistence/PersistenceUnitInfoImpl.java | 9 ++++++++-
.../org/apache/openejb/util/classloader/URLClassLoaderFirst.java | 9 ++++++++-
container/openejb-core/src/main/resources/default.exclusions | 1 +
5 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
index 89e1634..0ed48a9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
@@ -848,7 +848,7 @@ public class ReadDescriptors implements DynamicDeployer {
public static TldTaglib readTldTaglib(final URL url) throws OpenEJBException {
// TOMEE-164 Optimization on reading built-in tld files
- if (url.getPath().contains("jstl-1.2.jar") || (url.getPath().contains("taglibs-standard-") && url.getPath().contains(".jar!"))) {
+ if (url.getPath().contains("jstl-1.2.jar") || ((url.getPath().contains("taglibs-standard-") || url.getPath().contains("taglibs-shade-") && url.getPath().contains(".jar!")))) {
return SKIP_TAGLIB;
}
if (url.getPath().contains("myfaces-impl")) { // we should return SKIP_TAGLIB too
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
index 71dafbf..677c21e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
@@ -327,7 +327,7 @@ public class TldScanner {
urlSet = URLs.cullSystemJars(urlSet);
urlSet = applyBuiltinExcludes(
urlSet,
- Filters.tokens("taglibs-standard-impl", "taglibs-standard-jstlel", "javax.faces-2.", "jakarta.faces-2", "spring-security-taglibs", "spring-webmvc"),
+ Filters.tokens("taglibs-shade", "taglibs-standard-impl", "taglibs-standard-jstlel", "javax.faces-2.", "jakarta.faces-2", "spring-security-taglibs", "spring-webmvc"),
Filters.prefixes("commons-jcs-", "myfaces-", "tomcat-websocket.jar")); // myfaces is hardcoded in tomee
} catch (final IOException e) {
DeploymentLoader.LOGGER.warning("Error scanning class loader for JSP tag libraries", e);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
index b65c4d0..84fbf65 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
@@ -382,11 +382,18 @@ public class PersistenceUnitInfoImpl implements PersistenceUnitInfo {
// not the shouldSkip() method from UrlClassLoaderFirst since we skip more here
// we just need JPA stuff so all the tricks we have for the server part are useless
@SuppressWarnings("RedundantIfStatement")
- public static boolean isServerClass(final String name) {
+ public static boolean isServerClass(final String input) {
+
+ String name = input;
+
if (name == null) {
return false;
}
+ if (name.startsWith("openejb.shade.")) {
+ name = name.substring("openejb.shade.".length());
+ }
+
for (final String prefix : URLClassLoaderFirst.FORCED_SKIP) {
if (name.startsWith(prefix)) {
return true;
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
index 938b7e8..c5a5348 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
@@ -204,7 +204,10 @@ public class URLClassLoaderFirst extends URLClassLoader {
//
// /!\ please check org.apache.openejb.persistence.PersistenceUnitInfoImpl.isServerClass() too
// when updating this method
- public static boolean shouldSkip(final String name) {
+ public static boolean shouldSkip(final String input) {
+
+ String name = input;
+
if (name == null) { // can happen with rest servlet definition or errors
return false;
}
@@ -220,6 +223,10 @@ public class URLClassLoaderFirst extends URLClassLoader {
}
}
+ if (name.startsWith("openejb.shade.")) {
+ name = name.substring("openejb.shade.".length());
+ }
+
if (name.startsWith("java.")) {
return true;
}
diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions
index d4f0aa9..0cefc89 100644
--- a/container/openejb-core/src/main/resources/default.exclusions
+++ b/container/openejb-core/src/main/resources/default.exclusions
@@ -255,6 +255,7 @@ surefire-
swizzle-
sxc-
taglibs-standard-
+taglibs-shade-
testng-
tomcat-annotations
tomcat-api
[tomee] 02/03: Merge remote-tracking branch 'apache/master'
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit d437159a7989d463f0342cfc03ff02b0a2540eb3
Merge: 00f4282 10121a5
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Jan 13 13:33:58 2021 +0000
Merge remote-tracking branch 'apache/master'
boms/tomee-microprofile/pom.xml | 24 ++++++++++++------------
boms/tomee-plume/pom.xml | 24 ++++++++++++------------
boms/tomee-plus/pom.xml | 24 ++++++++++++------------
boms/tomee-webprofile/pom.xml | 13 ++++++++++++-
pom.xml | 1 +
5 files changed, 49 insertions(+), 37 deletions(-)