Author: dblevins
Date: Tue Nov 10 22:54:31 2009
New Revision: 834700
URL: http://svn.apache.org/viewvc?rev=834700&view=rev
Log:
Made the "-1.2" part of "foo-1.2.jar" files optional so "foo.jar" is also
filtered.
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=834700&r1=834699&r2=834700&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 22:54:31 2009
@@ -168,48 +168,48 @@
urlSet = urlSet.excludeJavaHome();
urlSet =
urlSet.excludePaths(System.getProperty("sun.boot.class.path", ""));
urlSet = urlSet.exclude(".*/JavaVM.framework/.*");
- urlSet = urlSet.exclude(".*/activation-[\\d.]+.jar(!/)?");
- urlSet =
urlSet.exclude(".*/activeio-core-[\\d.]+(-incubator)?.jar(!/)?");
- urlSet = urlSet.exclude(".*/activemq-(core|ra)-[\\d.]+.jar(!/)?");
+ urlSet = urlSet.exclude(".*/activation(-[\\d.]+)?.jar(!/)?");
+ urlSet =
urlSet.exclude(".*/activeio-core(-[\\d.]+)?(-incubator)?.jar(!/)?");
+ urlSet =
urlSet.exclude(".*/activemq-(core|ra)(-[\\d.]+)?.jar(!/)?");
urlSet =
urlSet.exclude(".*/annotations-api-6.[01].[\\d.]+.jar(!/)?");
urlSet =
urlSet.exclude(".*/asm-(all|commons|util|tree)?[\\d.]+.jar(!/)?");
- 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(".*/catalina-[\\d.]+.jar(!/)?");
+ 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(".*/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(".*/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(".*/commons-(logging|logging-api|cli|pool|lang|collections|dbcp|dbcp-all)(-[\\d.]+)?.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(".*/hsqldb-[\\d.]+.jar(!/)?");
- urlSet = urlSet.exclude(".*/idb-[\\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(".*/jaxb-(impl|api)-[\\d.]+.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(".*/openjpa-(jdbc|kernel|lib|persistence|persistence-jdbc)(-5)?-[\\d.]+.jar(!/)?");
- urlSet = urlSet.exclude(".*/openjpa-[\\d.]+.jar(!/)?");
- urlSet = urlSet.exclude(".*/serp-[\\d.]+.jar(!/)?");
- urlSet = urlSet.exclude(".*/servlet-api-[\\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(".*/wstx-asl-[\\d.]+.jar(!/)?");
- urlSet =
urlSet.exclude(".*/xbean-(reflect|naming|finder)-[\\d.]+.jar(!/)?");
- urlSet = urlSet.exclude(".*/xmlParserAPIs-[\\d.]+.jar(!/)?");
- urlSet = urlSet.exclude(".*/xmlunit-[\\d.]+.jar(!/)?");
+ urlSet = urlSet.exclude(".*/jaxb-(impl|api)(-[\\d.]+)?.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(".*/openjpa-(jdbc|kernel|lib|persistence|persistence-jdbc)(-5)?(-[\\d.]+)?.jar(!/)?");
+ urlSet = urlSet.exclude(".*/openjpa(-[\\d.]+)?.jar(!/)?");
+ urlSet = urlSet.exclude(".*/serp(-[\\d.]+)?.jar(!/)?");
+ urlSet = urlSet.exclude(".*/servlet-api(-[\\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(".*/wstx-asl(-[\\d.]+)?.jar(!/)?");
+ urlSet =
urlSet.exclude(".*/xbean-(reflect|naming|finder)(-[\\d.]+)?.jar(!/)?");
+ urlSet = urlSet.exclude(".*/xmlParserAPIs(-[\\d.]+)?.jar(!/)?");
+ urlSet = urlSet.exclude(".*/xmlunit(-[\\d.]+)?.jar(!/)?");
UrlSet prefiltered = urlSet;
urlSet = urlSet.exclude(exclude);
urlSet = urlSet.include(includes);
