Repository: tomee Updated Branches: refs/heads/master 70f09ddb3 -> 1485c13bb
cxf now uses last asm so updating exclude + enhancing a bit tld scanning and default exclusions Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1485c13b Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1485c13b Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1485c13b Branch: refs/heads/master Commit: 1485c13bb2468fdab456636e206e7b23f3f78e66 Parents: 70f09dd Author: Romain Manni-Bucau <[email protected]> Authored: Tue Jun 16 15:59:44 2015 +0200 Committer: Romain Manni-Bucau <[email protected]> Committed: Tue Jun 16 15:59:44 2015 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/openejb/config/AnnotationDeployer.java | 2 +- .../src/main/java/org/apache/openejb/config/TldScanner.java | 5 ++++- container/openejb-core/src/main/resources/default.exclusions | 4 ++++ server/openejb-cxf/pom.xml | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/1485c13b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java index 711c35a..a06f68b 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java @@ -1743,7 +1743,7 @@ public class AnnotationDeployer implements DynamicDeployer { } } { - final File file = new File(toFile, "classes/beans.xml"); + final File file = new File(toFile, "META-INF/beans.xml"); if (file.exists()) { try { return file.toURI().toURL(); http://git-wip-us.apache.org/repos/asf/tomee/blob/1485c13b/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java ---------------------------------------------------------------------- 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 a2b404d..11da933 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 @@ -320,7 +320,10 @@ public class TldScanner { try { urlSet = URLs.cullSystemJars(urlSet); - urlSet = applyBuiltinExcludes(urlSet, Filters.tokens("openejb-jstl-1.2", "myfaces-impl", "javax.faces-2.", "spring-security-taglibs", "spring-webmvc")); + urlSet = applyBuiltinExcludes( + urlSet, + Filters.tokens("openejb-jstl-1.2", "javax.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); } http://git-wip-us.apache.org/repos/asf/tomee/blob/1485c13b/container/openejb-core/src/main/resources/default.exclusions ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/resources/default.exclusions b/container/openejb-core/src/main/resources/default.exclusions index 8022110..07cbd97 100644 --- a/container/openejb-core/src/main/resources/default.exclusions +++ b/container/openejb-core/src/main/resources/default.exclusions @@ -26,6 +26,7 @@ arquillian-test-api arquillian-test-impl-base arquillian-test-spi arquillian-tomee- +asm- avalon-framework- axis- axis2- @@ -49,12 +50,14 @@ commons-digester- commons-discovery- commons-httpclient- commons-io- +commons-jcs-core- commons-lang- commons-lang3- commons-logging- commons-logging-api- commons-net- commons-pool- +cryptacular- cssparser- cxf- deploy.jar @@ -104,6 +107,7 @@ jasper.jar jasper-el.jar jasypt- java-atk-wrapper +java-support- javaee- javaee-api javassist- http://git-wip-us.apache.org/repos/asf/tomee/blob/1485c13b/server/openejb-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml index 19227eb..831d923 100644 --- a/server/openejb-cxf/pom.xml +++ b/server/openejb-cxf/pom.xml @@ -118,7 +118,7 @@ <version>${cxf.version}</version> <exclusions> <exclusion> - <groupId>asm</groupId> + <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> </exclusion> <exclusion>
