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-2947 added LOG.warn()'s for includeJars patterns that fail to match any jars

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@731124 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeromy Evans
2009-01-03 23:15:34 +00:00
parent f11b40aa46
commit 92ab09649e
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+12 -3
View File
@@ -150,8 +150,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
}
/**
* @param exlcudeJars Comma separated list of regular expressions of jars to be included.
* Ignored if "struts.convention.action.disableJarScanning" is true
* @param includeJars Comma separated list of regular expressions of jars to be included.
*/
@Inject(value = "struts.convention.action.includeJars", required = false)
public void setIncludeJars(String includeJars) {
@@ -336,13 +335,16 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
//TODO: add this functionality to UrlSet in xwork for next release
List<URL> rawIncludedUrls = urlSet.getUrls();
Set<URL> includeUrls = new HashSet<URL>();
boolean[] patternUsed = new boolean[includeJars.length];
for (URL url : rawIncludedUrls) {
if ("jar".equalsIgnoreCase(url.getProtocol())) {
//it is a jar file, make sure it macthes at least a url regex
for (String includeJar : includeJars) {
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;
}
}
@@ -352,6 +354,13 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
}
}
if (LOG.isWarnEnabled()) {
for (int i = 0; i < patternUsed.length; i++) {
if (!patternUsed[i]) {
LOG.warn("The includeJars pattern \""+includeJars[i]+"\" did not match any jars in the classpath");
}
}
}
return new UrlSet(includeUrls);
}