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

[db...@apache.org]

Author: dblevins
Date: Mon Sep 17 10:37:34 2007
New Revision: 576539

URL: http://svn.apache.org/viewvc?rev=576539&view=rev
Log:
Adjusted the regex for blocking out system apps so it wasn't so hungry

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=576539&r1=576538&r2=576539&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 Mon Sep 17 10:37:34 2007
@@ -198,7 +198,7 @@
             urlSet = urlSet.include(includes);
 
             if (filterSystemApps){
-                urlSet = urlSet.exclude(".*/openejb-.*");
+                urlSet = urlSet.exclude(".*/openejb-[^/]+(.(jar|ear|war)(!/)?|/target/classes/?)");
             }
 
             List<URL> urls = urlSet.getUrls();
@@ -222,12 +222,23 @@
             long end = System.currentTimeMillis();
             long time = end - begin;
 
+            UrlSet unchecked = new UrlSet();
             if (!filterDescriptors){
-                UrlSet unchecked = prefiltered.exclude(urlSet);
+                unchecked = prefiltered.exclude(urlSet);
                 if (filterSystemApps){
-                    unchecked = unchecked.exclude(".*/openejb-.*");
+                    urlSet = urlSet.exclude(".*/openejb-[^/]+(.(jar|ear|war)(!/)?|/target/classes/?)");
                 }
                 processUrls(unchecked.getUrls(), classLoader, false, base, jarList);
+            }
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("URLs after filtering: "+urlSet.getUrls().size() + unchecked.getUrls().size());
+                for (URL url : urlSet.getUrls()) {
+                    logger.debug("Annotations path: " + url);
+                }
+                for (URL url : unchecked.getUrls()) {
+                    logger.debug("Descriptors path: " + url);
+                }
             }
 
             if (urls.size() == 0) return;