From 64234907c6e766bc14283ce5fef59e073276ffe2 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Tue, 30 Dec 2014 09:23:23 +0100
Subject: [PATCH] WW-4055 Reverts commit dfb2bd3

---
 .../PackageBasedActionConfigBuilder.java      | 56 +++++++++++--------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
index 811df83e7..d1ad0c028 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
@@ -94,7 +94,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
     private String[] actionPackages;
     private String[] excludePackages;
     private String[] packageLocators;
-    private String[] includeJars = new String[] { ".*?\\.jar(!/|/)?" };
+    private String[] includeJars;
     private String packageLocatorsBasePackage;
     private boolean disableActionScanning = false;
     private boolean disablePackageLocatorsScanning = false;
@@ -475,35 +475,43 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
         urlSet = urlSet.excludePaths(System.getProperty("sun.boot.class.path", ""));
         urlSet = urlSet.exclude(".*/JavaVM.framework/.*");
 
-        List<URL> rawIncludedUrls = urlSet.getUrls();
-        Set<URL> includeUrls = new HashSet<URL>();
-        boolean[] patternUsed = new boolean[includeJars.length];
+        if (includeJars == null) {
+            urlSet = urlSet.exclude(".*?\\.jar(!/|/)?");
+        } else {
+            LOG.debug("jar urls regexes were specified: #0", Arrays.asList(includeJars));
 
-        for (URL url : rawIncludedUrls) {
-            if (fileProtocols.contains(url.getProtocol())) {
-                //it is a jar file, make sure it macthes at least a url regex
-                for (int i = 0; i < includeJars.length; i++) {
-                    String includeJar = includeJars[i];
-                    if (Pattern.matches(includeJar, url.toExternalForm())) {
-                        includeUrls.add(url);
-                        patternUsed[i] = true;
-                        break;
+            List<URL> rawIncludedUrls = urlSet.getUrls();
+            Set<URL> includeUrls = new HashSet<URL>();
+            boolean[] patternUsed = new boolean[includeJars.length];
+
+            for (URL url : rawIncludedUrls) {
+                if (fileProtocols.contains(url.getProtocol())) {
+                    //it is a jar file, make sure it macthes at least a url regex
+                    for (int i = 0; i < includeJars.length; i++) {
+                        String includeJar = includeJars[i];
+                        if (Pattern.matches(includeJar, url.toExternalForm())) {
+                            includeUrls.add(url);
+                            patternUsed[i] = true;
+                            break;
+                        }
+                    }
+                } else {
+                    LOG.debug("It is not a jar [#0]", url);
+                    includeUrls.add(url);
+                }
+            }
+
+            if (LOG.isWarnEnabled()) {
+                for (int i = 0; i < patternUsed.length; i++) {
+                    if (!patternUsed[i]) {
+                        LOG.warn("The includeJars pattern [#0] did not match any jars in the classpath", includeJars[i]);
                     }
                 }
-            } else {
-                //it is not a jar
-                includeUrls.add(url);
             }
+            return new UrlSet(includeUrls);
         }
 
-        if (LOG.isWarnEnabled()) {
-            for (int i = 0; i < patternUsed.length; i++) {
-                if (!patternUsed[i]) {
-                    LOG.warn("The includeJars pattern [#0] did not match any jars in the classpath", includeJars[i]);
-                }
-            }
-        }
-        return new UrlSet(includeUrls);
+        return urlSet;
     }
 
     /**