Replace hard-coded vetoed class with configurable version -- fixes

Author: vsilaev

net.tascalate.javaflow.spi/src/main/java/org/apache/commons/javaflow/spi/ClassMatcherFileParser.java

@@ -43,7 +43,7 @@ ClassMatcher parse(URL url) throws IOException {
                     continue;
                 }
                 String kind    = s.substring(0, columnPos).trim();
-                String variant = s.substring(columnPos + 1).trim();
+                String variant = s.substring(columnPos + 1, equalsPos).trim();
                 String target  = s.substring(equalsPos + 1).trim();
                 if (target.length() == 0) {
                     // Invalid class name

net.tascalate.javaflow.spi/src/main/java/org/apache/commons/javaflow/spi/ClassMatchers.java

@@ -93,7 +93,7 @@ public boolean matches(String name, String signature, String superName, String[]
     }    
 
     public static ClassMatcher byClassNamePattern(final String classNamePattern) {
-        final Pattern pattern = Pattern.compile("^" + escapeDots(className(classNamePattern)) + "$");
+        final Pattern pattern = Pattern.compile("^" + classNamePattern + "$");
         return new ClassMatcher() {
             @Override
             public boolean matches(String name, String signature, String superName, String[] interfaces) {
@@ -143,13 +143,7 @@ public boolean matches(String name, String signature, String superName, String[]
         };
     }
 
-    private static String escapeDots(String s) {
-        return s != null ? MATCH_DOTS.matcher(s).replaceAll("\\.") : null;
-    }
-    
     private static String className(String internalClassName) {
-        return internalClassName != null ? internalClassName.replace('/', '.') : null;
+        return internalClassName != null ? internalClassName.replace('.', '/') : null;
     }
-    
-    private static final Pattern MATCH_DOTS = Pattern.compile("\\.");
 }

net.tascalate.javaflow.spi/src/main/java/org/apache/commons/javaflow/spi/ClasspathResourceLoader.java

@@ -48,7 +48,7 @@ public InputStream getResourceAsStream(String name) throws IOException {
 
     public ClassMatcher createVeto() throws IOException {
         List<ClassMatcher> matchers = new ArrayList<ClassMatcher>();
-        Enumeration<URL> allResources = classLoader.getResources("/META-INF/net.tascalate.javaflow.veto.cmf");
+        Enumeration<URL> allResources = classLoader.getResources("META-INF/net.tascalate.javaflow.veto.cmf");
         ClassMatcherFileParser parser = new ClassMatcherFileParser();
         while (allResources.hasMoreElements()) {
             URL resource = allResources.nextElement();

net.tascalate.javaflow.spi/src/main/java/org/apache/commons/javaflow/spi/StopException.java

@@ -15,10 +15,6 @@
  */
 package org.apache.commons.javaflow.spi;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 public class StopException extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
@@ -32,26 +28,4 @@ public Throwable fillInStackTrace() {
     }
 
     public static final StopException INSTANCE = new StopException();
-
-    private static boolean __dirtyCheckSkipContinuationsOnClass(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        if (null != interfaces) {
-            for (String intf : interfaces) {
-                if (PROXY_MARKER_INTERFACES.contains(intf)) {
-                    return true;
-                }
-            }
-        }
-        String lname = name.toLowerCase();
-        if (lname.contains("$$enhancer") && lname.contains("cglib")) {
-            return true;
-        }
-        return false;
-    }
-
-    private static final Set<String> PROXY_MARKER_INTERFACES = new HashSet<String>(Arrays.asList(
-        "org/apache/webbeans/proxy/OwbInterceptorProxy",
-        "org/apache/webbeans/proxy/OwbNormalScopeProxy",
-        "org/jboss/weld/bean/proxy/ProxyObject",
-        "org/jboss/as/ee/component/serialization/WriteReplaceInterface"
-    ));
 }

net.tascalate.javaflow.spi/src/main/resources/META-INF/net.tascalate.javaflow.veto.cmf

@@ -1,7 +1,8 @@
-implements-interface:name=org.apache.webbeans.proxy.OwbInterceptorProxy
-implements-interface:name=org.apache.webbeans.proxy.OwbNormalScopeProxy
-implements-interface:name=org.jboss.weld.bean.prox.ProxyObject
-implements-interface:name=org.jboss.as.ee.component.serialization.WriteReplaceInterface
+implements-interface:name=org/apache/webbeans/proxy/OwbInterceptorProxy
+implements-interface:name=org/apache/webbeans/proxy/OwbNormalScopeProxy
+implements-interface:name=org/jboss/weld/bean/proxy/ProxyObject
+implements-interface:name=org/jboss/as/ee/component/serialization/WriteReplaceInterface
+class:name-pattern=.*\$\$EnhancerByCGLIB\$\$.*
 # possible values are:
 # implements-interface:name-part
 # implements-interface:name-pattern