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

[jl...@apache.org]

Author: jlmonteiro
Date: Wed Jan 12 13:41:39 2011
New Revision: 1058137

URL: http://svn.apache.org/viewvc?rev=1058137&view=rev
Log:
Include/exclude patterns does not necessary apply to modules containing descriptors.

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=1058137&r1=1058136&r2=1058137&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 Wed Jan 12 13:41:39 2011
@@ -199,13 +199,16 @@ public class DeploymentsResolver impleme
                 urlSet = applyBuiltinExcludes(urlSet);
             }
 
+            // save the prefiltered list of jars before excluding system apps
+            // so that we can choose not to filter modules with descriptors on the full list
+            UrlSet prefiltered = urlSet;
+
             // we should exclude system apps before and apply user properties after
             if (filterSystemApps){
                 urlSet = urlSet.exclude(".*/openejb-[^/]+(.(jar|ear|war)(!/)?|/target/(test-)?classes/?)");
             }
 
             // filter using user parameters
-            UrlSet prefiltered = urlSet;
             urlSet = urlSet.exclude(exclude);
             urlSet = urlSet.include(includes);