You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2014/02/23 23:07:20 UTC
svn commit: r1571106 -
/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java
Author: rmannibucau
Date: Sun Feb 23 22:07:20 2014
New Revision: 1571106
URL: http://svn.apache.org/r1571106
Log:
it is late...missed the first if so putting the code in the right place to get the exclusion used
Modified:
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java?rev=1571106&r1=1571105&r2=1571106&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/configuration/predicate/PredicateEvaluator.java Sun Feb 23 22:07:20 2014
@@ -130,20 +130,23 @@ public final class PredicateEvaluator {
}
} else if (org.startsWith("slf4j.") || org.startsWith("metatype") || org.startsWith("hsqldb")) {
return true;
+ } else if (value.startsWith("eclipse.jdt")) {
+ return true;
}
} else if (value.startsWith("serp")) {
return true;
- } else if (value.startsWith("org.eclipse.jdt")) {
- return true;
}
} else if ("tomcat".equalsIgnoreCase(container)) {
- if (value.startsWith("org.apache.")) {
- final String sub = value.substring("org.apache.".length());
- if (isTomcat(sub)) {
+ if (value.startsWith("org.")) {
+ final String org = value.substring("org.".length());
+ if (org.startsWith("apache.")) {
+ final String sub = value.substring("org.apache.".length());
+ if (isTomcat(sub)) {
+ return true;
+ }
+ } else if (value.startsWith("eclipse.jdt")) {
return true;
}
- } else if (value.startsWith("org.eclipse.jdt")) {
- return true;
}
} else if ("jvm".equalsIgnoreCase(container)) {
if (value.startsWith("java") || value.startsWith("sun") || value.startsWith("com.sun")) {