You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/05 20:27:49 UTC
svn commit: r1240782 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Author: rmannibucau
Date: Sun Feb 5 19:27:48 2012
New Revision: 1240782
URL: http://svn.apache.org/viewvc?rev=1240782&view=rev
Log:
managing include
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=1240782&r1=1240781&r2=1240782&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java Sun Feb 5 19:27:48 2012
@@ -190,8 +190,8 @@ public class DeploymentsResolver impleme
try {
UrlSet urlSet = new UrlSet(classLoader);
+ final UrlSet includes = urlSet.matching(include);
- //final UrlSet includes = urlSet.matching(include);
urlSet = urlSet.exclude(ClassLoader.getSystemClassLoader().getParent());
urlSet = urlSet.excludeJavaExtDirs();
urlSet = urlSet.excludeJavaEndorsedDirs();
@@ -217,6 +217,7 @@ public class DeploymentsResolver impleme
urlSet = urlSet.exclude(".*/openejb-[^/]+(.(jar|ear|war)(!/)?|/target/(test-)?classes/?)");
}
}
+ urlSet = urlSet.include(includes);
final List<URL> urls = new ArrayList<URL>();
final boolean isWindows = System.getProperty("os.name", "unknown").toLowerCase().startsWith("windows");