svn commit: r834706 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java

[db...@apache.org]

Author: dblevins
Date: Tue Nov 10 23:20:40 2009
New Revision: 834706

URL: http://svn.apache.org/viewvc?rev=834706&view=rev
Log:
OPENEJB-1107: Updated builtin exclude list
Added com.ibm.ws., jboss-, and more

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=834706&r1=834705&r2=834706&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java Tue Nov 10 23:20:40 2009
@@ -176,40 +176,59 @@
             urlSet = urlSet.exclude(".*/avalon-framework(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/axis2-jaxws-api(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/backport-util-concurrent(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/bcprov-jdk15(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/catalina(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/cglib-(nodep-)?[\\d.]+.jar(!/)?");
-            urlSet = urlSet.exclude(".*/commons-(logging|logging-api|cli|pool|lang|collections|dbcp|dbcp-all)(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/com\\.ibm\\.ws\\.[^/]*.jar(!/)?");
+            urlSet = urlSet.exclude(".*/commons-(logging|logging-api|cli|pool|lang|collections|dbcp|dbcp-all)(-[\\d.r-]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/cxf-bundle(-[\\d.]+)?(incubator)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/derby(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/ejb31-api-experimental(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/geronimo-(connector|transaction)(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/geronimo-[^/]+_spec(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/geronimo-javamail_([\\d.]+)_mail(-[\\d.]+)?.jar(!/)?");
-            urlSet = urlSet.exclude(".*/hibernate-(entitymanager-)?[\\d.]+ga.jar(!/)?");
-            urlSet = urlSet.exclude(".*/howl-[\\d.-]+.jar(!/)?");
+            urlSet = urlSet.exclude(".*/hibernate-(entitymanager|annotations)?(-[\\d.]+(ga)?)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/howl(-[\\d.-]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/hsqldb(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/idb(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/idea_rt.jar(!/)?");
             urlSet = urlSet.exclude(".*/javaee-api-[\\d.-]+.jar(!/)?");
+            urlSet = urlSet.exclude(".*/javassist[^/]*.jar(!/)?");
             urlSet = urlSet.exclude(".*/jaxb-(impl|api)(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/jboss-[^/]*.jar(!/)?");
+            urlSet = urlSet.exclude(".*/jbossall-[^/]*.jar(!/)?");
+            urlSet = urlSet.exclude(".*/jbosscx-[^/]*.jar(!/)?");
+            urlSet = urlSet.exclude(".*/jbossjts-?[^/]*.jar(!/)?");
+            urlSet = urlSet.exclude(".*/jbosssx-[^/]*.jar(!/)?");
             urlSet = urlSet.exclude(".*/jmdns(-[\\d.]+)?(-RC\\d)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/juli(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/junit(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/log4j(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/logkit(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/mail(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/neethi(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/org\\.eclipse\\.persistence\\.[^/]*.jar(!/)?");
+            urlSet = urlSet.exclude(".*/org\\.junit_.[^/]*.jar(!/)?");
             urlSet = urlSet.exclude(".*/openjpa-(jdbc|kernel|lib|persistence|persistence-jdbc)(-5)?(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/openjpa(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/opensaml(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/quartz(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/saaj-impl(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/serp(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/servlet-api(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/slf4j-api(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/slf4j-jdk14(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/stax-api(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/swizzle-stream(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/sxc-(jaxb|runtime)(-[\\d.]+)?(-SNAPSHOT)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/wsdl4j(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/wss4j(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/wstx-asl(-[\\d.]+)?.jar(!/)?");
-            urlSet = urlSet.exclude(".*/xbean-(reflect|naming|finder)(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/xbean-(reflect|naming|finder)-(shaded-)?[\\d.]+.jar(!/)?");
             urlSet = urlSet.exclude(".*/xmlParserAPIs(-[\\d.]+)?.jar(!/)?");
             urlSet = urlSet.exclude(".*/xmlunit(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/xmlsec(-[\\d.]+)?.jar(!/)?");
+            urlSet = urlSet.exclude(".*/XmlSchema(-[\\d.]+)?.jar(!/)?");
             UrlSet prefiltered = urlSet;
             urlSet = urlSet.exclude(exclude);
             urlSet = urlSet.include(includes);