Author: markt
Date: Fri Jun 14 07:43:23 2013
New Revision: 1492980
URL: http://svn.apache.org/r1492980
Log:
Add getter/setter for JarScanFilter to JarScanner
Enable JarScanFilter to be configured via a context.xml file (and
server.xml)
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
tomcat/trunk/java/org/apache/tomcat/JarScanner.java
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=1492980&r1=1492979&r2=1492980&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Fri Jun
14 07:43:23 2013
@@ -228,6 +228,14 @@ public class ContextRuleSet extends Rule
"setJarScanner",
"org.apache.tomcat.JarScanner");
+ digester.addObjectCreate(prefix + "Context/JarScanner/JarScanFilter",
+
"org.apache.tomcat.util.scan.StandardJarScanFilter",
+ "className");
+ digester.addSetProperties(prefix + "Context/JarScanner/JarScanFilter");
+ digester.addSetNext(prefix + "Context/JarScanner/JarScanFilter",
+ "setJarScanFilter",
+ "org.apache.tomcat.JarScanFilter");
+
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/JarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/JarScanner.java?rev=1492980&r1=1492979&r2=1492980&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/JarScanner.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/JarScanner.java Fri Jun 14 07:43:23 2013
@@ -39,4 +39,7 @@ public interface JarScanner {
public void scan(JarScanType scanType, ServletContext context,
JarScannerCallback callback);
+ public JarScanFilter getJarScanFilter();
+
+ public void setJarScanFilter(JarScanFilter jarScanFilter);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1492980&r1=1492979&r2=1492980&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Fri
Jun 14 07:43:23 2013
@@ -111,9 +111,11 @@ public class StandardJarScanner implemen
* Controls the filtering of the results from the scan for JARs
*/
private JarScanFilter jarScanFilter = new StandardJarScanFilter();
+ @Override
public JarScanFilter getJarScanFilter() {
return jarScanFilter;
}
+ @Override
public void setJarScanFilter(JarScanFilter jarScanFilter) {
this.jarScanFilter = jarScanFilter;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
