Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4055 Includes all jars by default

Browse Source
This commit is contained in:
Lukasz Lenart
2014-08-07 07:42:58 +02:00
parent f1861adff4
commit dfb2bd3dbe
1 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+1 -8
View File
@@ -93,7 +93,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
private String[] actionPackages; private String[] actionPackages;
private String[] excludePackages; private String[] excludePackages;
private String[] packageLocators; private String[] packageLocators;
private String[] includeJars; private String[] includeJars = new String[] { ".*?\\.jar(!/|/)?" };
private String packageLocatorsBasePackage; private String packageLocatorsBasePackage;
private boolean disableActionScanning = false; private boolean disableActionScanning = false;
private boolean disablePackageLocatorsScanning = false; private boolean disablePackageLocatorsScanning = false;
@@ -458,10 +458,6 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
urlSet = urlSet.excludePaths(System.getProperty("sun.boot.class.path", "")); urlSet = urlSet.excludePaths(System.getProperty("sun.boot.class.path", ""));
urlSet = urlSet.exclude(".*/JavaVM.framework/.*"); urlSet = urlSet.exclude(".*/JavaVM.framework/.*");
if (includeJars == null) {
urlSet = urlSet.exclude(".*?\\.jar(!/|/)?");
} else {
//jar urls regexes were specified
List<URL> rawIncludedUrls = urlSet.getUrls(); List<URL> rawIncludedUrls = urlSet.getUrls();
Set<URL> includeUrls = new HashSet<URL>(); Set<URL> includeUrls = new HashSet<URL>();
boolean[] patternUsed = new boolean[includeJars.length]; boolean[] patternUsed = new boolean[includeJars.length];
@@ -493,9 +489,6 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
return new UrlSet(includeUrls); return new UrlSet(includeUrls);
} }
return urlSet;
}
/** /**
* Note that we can't include the test for {@link #actionSuffix} here * Note that we can't include the test for {@link #actionSuffix} here
* because a class is included if its name ends in {@link #actionSuffix} OR * because a class is included if its name ends in {@link #actionSuffix} OR