Author: dblevins
Date: Tue Jan 26 20:41:37 2010
New Revision: 903405
URL: http://svn.apache.org/viewvc?rev=903405&view=rev
Log:
Refactored the excludes to another method -- cosmetic change only
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=903405&r1=903404&r2=903405&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 Jan 26 20:41:37 2010
@@ -29,6 +29,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -178,67 +179,9 @@
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(".*/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(".*/bcprov-jdk15(-[\\d.]+)?.jar(!/)?");
- urlSet = urlSet.exclude(".*/catalina(-[\\d.]+)?.jar(!/)?");
- urlSet = urlSet.exclude(".*/cglib-(nodep-)?[\\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|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)-(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 = applyBuiltinExcludes(urlSet);
+
UrlSet prefiltered = urlSet;
urlSet = urlSet.exclude(exclude);
urlSet = urlSet.include(includes);
@@ -320,6 +263,71 @@
}
+ private static UrlSet applyBuiltinExcludes(UrlSet urlSet) throws
MalformedURLException {
+ 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(".*/bcprov-jdk15(-[\\d.]+)?.jar(!/)?");
+ urlSet = urlSet.exclude(".*/catalina(-[\\d.]+)?.jar(!/)?");
+ urlSet = urlSet.exclude(".*/cglib-(nodep-)?[\\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|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)-(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(!/)?");
+ return urlSet;
+ }
+
private static void processUrls(List<URL> urls, ClassLoader classLoader,
Set<RequireDescriptors> requireDescriptors, FileUtils base, List<String>
jarList) {
for (URL url : urls) {
Deployments deployment;
