Repository: tomee Updated Branches: refs/heads/master e5455cb2e -> 26ee53e20
adding +cassandra-driver-core, jnr and netty in our exclusions and resorting exclusions in ContainerClassesFilter to make the maintenance easier Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/26ee53e2 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/26ee53e2 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/26ee53e2 Branch: refs/heads/master Commit: 26ee53e20a356e1cc251c40459050bf085cf0c99 Parents: e5455cb Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Tue Sep 6 11:13:08 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Tue Sep 6 11:13:08 2016 +0200 ---------------------------------------------------------------------- .../openejb/util/ContainerClassesFilter.java | 90 +++++++++++++------- .../src/main/resources/default.exclusions | 3 + 2 files changed, 60 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/26ee53e2/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java index c6901dd..0a3b126 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java @@ -40,54 +40,78 @@ public class ContainerClassesFilter implements Filter { skipped = skippedStr == null ? EMPTY_ARRAY : skippedStr.split(" *, *"); final Set<String> excluded = new HashSet<>(); + excluded.add("com.codehale.metrics"); + excluded.add("com.ctc.wstx"); + excluded.add("com.datastax.driver.core"); + excluded.add("com.google.common"); + excluded.add("com.google.thirdparty"); + excluded.add("com.ibm.wsdl"); + excluded.add("com.kenai.jffi"); + excluded.add("com.kenai.jnr"); + excluded.add("com.sun.istack"); + excluded.add("com.sun.xml.bind"); + excluded.add("com.sun.xml.messaging.saaj"); + excluded.add("com.sun.xml.txw2"); + excluded.add("io.netty"); excluded.add("javax"); - excluded.add("org.apache.myfaces"); + excluded.add("jnr"); + excluded.add("junit"); + excluded.add("net.sf.ehcache"); + excluded.add("net.shibboleth.utilities.java.support"); + excluded.add("org.apache.activemq"); excluded.add("org.apache.bval"); + excluded.add("org.apache.commons.beanutils"); + excluded.add("org.apache.commons.cli"); + excluded.add("org.apache.commons.codec"); + excluded.add("org.apache.commons.collections"); + excluded.add("org.apache.commons.dbcp2"); + excluded.add("org.apache.commons.digester"); + excluded.add("org.apache.commons.io"); + excluded.add("org.apache.commons.lang"); + excluded.add("org.apache.commons.lang3"); + excluded.add("org.apache.commons.logging"); + excluded.add("org.apache.commons.pool2"); excluded.add("org.apache.cxf"); - excluded.add("org.apache.oro"); - excluded.add("org.apache.ws"); + excluded.add("org.apache.geronimo.javamail"); + excluded.add("org.apache.geronimo.mail"); + excluded.add("org.apache.geronimo.osgi"); + excluded.add("org.apache.http"); excluded.add("org.apache.jcp"); - excluded.add("org.apache.openejb"); - excluded.add("org.apache.tomee"); - excluded.add("org.apache.tomcat"); - excluded.add("org.apache.juli"); excluded.add("org.apache.johnzon"); - excluded.add("org.apache.activemq"); + excluded.add("org.apache.juli"); + excluded.add("org.apache.myfaces"); excluded.add("org.apache.neethi"); - excluded.add("org.apache.xml"); + excluded.add("org.apache.openejb"); + excluded.add("org.apache.oro"); + excluded.add("org.apache.tomcat"); + excluded.add("org.apache.tomee"); excluded.add("org.apache.velocity"); + excluded.add("org.apache.ws"); excluded.add("org.apache.wss4j"); - excluded.add("org.apache.commons.logging"); - excluded.add("org.apache.commons.dbcp2"); - excluded.add("org.apache.commons.pool2"); - excluded.add("org.metatype.sxc"); - excluded.add("org.openejb"); - excluded.add("org.slf4j"); + excluded.add("org.apache.xml"); + excluded.add("org.apache.xml.resolver"); + excluded.add("org.bouncycastle"); + excluded.add("org.codehaus.stax2"); + excluded.add("org.cryptacular"); excluded.add("org.fusesource.hawtbuf"); - excluded.add("org.objectweb.howl"); + excluded.add("org.hamcrest"); + excluded.add("org.jasypt"); + excluded.add("org.jboss.marshalling"); excluded.add("org.joda.time"); - excluded.add("org.codehaus.stax2"); + excluded.add("org.junit"); excluded.add("org.jvnet.mimepull"); - excluded.add("org.jasypt"); - excluded.add("org.hamcrest"); + excluded.add("org.metatype.sxc"); + excluded.add("org.objectweb.asm"); + excluded.add("org.objectweb.howl"); + excluded.add("org.openejb"); + excluded.add("org.opensaml"); + excluded.add("org.slf4j"); excluded.add("org.swizzle"); - excluded.add("com.ctc.wstx"); - excluded.add("com.ibm.wsdl"); - excluded.add("net.sf.ehcache"); - excluded.add("junit"); - excluded.add("org.junit"); - excluded.add("serp"); excluded.add("org.terracotta.context"); + excluded.add("org.terracotta.entity"); excluded.add("org.terracotta.modules.ehcache"); excluded.add("org.terracotta.statistics"); - excluded.add("org.terracotta.entity"); - excluded.add("org.opensaml"); - excluded.add("org.cryptacular"); - excluded.add("org.bouncycastle"); - excluded.add("org.apache.http"); - excluded.add("net.shibboleth.utilities.java.support"); - excluded.add("com.google.common"); - excluded.add("com.google.thirdparty"); + excluded.add("serp"); final Set<String> included = new HashSet<>(); included.add("org.apache.myfaces.cdi"); http://git-wip-us.apache.org/repos/asf/tomee/blob/26ee53e2/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 b2dd209..08090c0 100644 --- a/container/openejb-core/src/main/resources/default.exclusions +++ b/container/openejb-core/src/main/resources/default.exclusions @@ -36,6 +36,7 @@ bootstrap.jar bval-core bval-jsr c3p0- +cassandra-driver-core catalina- catalina.jar cglib- @@ -74,6 +75,7 @@ FastInfoset jce.jar jfr.jar jfxrt.jar +jnr- johnzon- fusemq-leveldb- geronimo- @@ -154,6 +156,7 @@ myfaces-impl mysql-connector-java- neethi- nekohtml- +netty- openejb-api openejb-client openejb-core
