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/09 15:04:55 UTC
svn commit: r1242330 - in
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config:
DeploymentsResolver.java NewLoaderLogic.java
Author: rmannibucau
Date: Thu Feb 9 14:04:55 2012
New Revision: 1242330
URL: http://svn.apache.org/viewvc?rev=1242330&view=rev
Log:
fixing inclusion
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.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=1242330&r1=1242329&r2=1242330&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 Thu Feb 9 14:04:55 2012
@@ -23,6 +23,7 @@ import org.apache.openejb.loader.Options
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.Logger;
import org.apache.xbean.finder.UrlSet;
+import org.apache.xbean.finder.filter.Filter;
import org.apache.xbean.finder.filter.Filters;
import org.apache.xbean.finder.filter.IncludeExcludeFilter;
@@ -202,15 +203,17 @@ public class DeploymentsResolver impleme
// so that we can choose not to filter modules with descriptors on the full list
final UrlSet prefiltered = urlSet;
+ final Filter includeFilter = Filters.patterns(include);
+
// we should exclude system apps before and apply user properties after
if (!".*".equals(include) && !"".equals(exclude)) { // if we are using default this will not do anything
- final IncludeExcludeFilter filter = new IncludeExcludeFilter(Filters.patterns(include), Filters.patterns(exclude));
+ final IncludeExcludeFilter filter = new IncludeExcludeFilter(includeFilter, Filters.patterns(exclude));
// filter using user parameters
urlSet = urlSet.filter(filter);
}
if (prefiltered.size() == urlSet.size()) {
- urlSet = NewLoaderLogic.applyBuiltinExcludes(urlSet);
+ urlSet = NewLoaderLogic.applyBuiltinExcludes(urlSet, includeFilter);
if (filterSystemApps) {
urlSet = urlSet.exclude(".*/openejb-[^/]+(.(jar|ear|war)(!/)?|/target/(test-)?classes/?)");
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java?rev=1242330&r1=1242329&r2=1242330&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java Thu Feb 9 14:04:55 2012
@@ -151,6 +151,10 @@ public class NewLoaderLogic {
}
public static UrlSet applyBuiltinExcludes(final UrlSet urlSet) throws MalformedURLException {
+ return applyBuiltinExcludes(urlSet, null);
+ }
+
+ public static UrlSet applyBuiltinExcludes(final UrlSet urlSet, final Filter includeFilter) throws MalformedURLException {
final Filter filter = Filters.prefixes(getExclusions());
//filter = Filters.optimize(filter, new PatternFilter(".*/openejb-.*"));
@@ -161,7 +165,7 @@ public class NewLoaderLogic {
final File file = URLs.toFile(url);
final String name = filter(file).getName();
- if (filter.accept(name)) {
+ if (filter.accept(name) && (includeFilter == null || !includeFilter.accept(name))) {
iterator.remove();
}
}