LTW weaver/dump@within option + fix a sout in weaver

5 files changed, 84 insertions, 31 deletions

diff --git a/loadtime/src/aspectj_1_5_0.dtd b/loadtime/src/aspectj_1_5_0.dtd
index 86bc43d51..710c0dac8 100644
--- a/loadtime/src/aspectj_1_5_0.dtd
+++ b/loadtime/src/aspectj_1_5_0.dtd
@@ -46,7 +46,7 @@ weaver
     TODO: Note: the scope of the options can be ClassLoader aware but should be assumed JVM wide
 ******************************************************************************************************************************-->
 <!ELEMENT weaver (
-    (include | exclude)*
+    (include | exclude | dump)*
 )>
 <!ATTLIST weaver
     options CDATA #IMPLIED
@@ -78,6 +78,17 @@ A class must be matched by NONE of the exclude elements to be exposed to the wea
     within CDATA #REQUIRED
 >
 <!--*****************************************************************************************************************************
+dump
+*********************************************************************************************************************************
+[dump] control post-weaving dump to the "./_dump" folder (debugging purpose only)
+@within defines a type pattern
+    (it is not a startWith)
+******************************************************************************************************************************-->
+<!ELEMENT dump EMPTY>
+<!ATTLIST dump
+    within CDATA #REQUIRED
+>
+<!--*****************************************************************************************************************************
 aspects
 *********************************************************************************************************************************
 [aspects] defines a set of aspects
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
index 62389bab7..0d17dfdec 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
@@ -51,9 +51,11 @@ public class Aj implements ClassPreProcessor {
         }
 
         try {
-            byte[] weaved = WeaverContainer.getWeaver(loader).weaveClass(className, bytes);
-            //FIXME AV make dump optionnal and configurable
-            __dump(className, weaved);
+            WeavingAdaptor weavingAdaptor = WeaverContainer.getWeaver(loader);
+            byte[] weaved = weavingAdaptor.weaveClass(className, bytes);
+            if (weavingAdaptor.shouldDump(className.replace('/', '.'))) {
+                dump(className, weaved);
+            }
             return weaved;
         } catch (Throwable t) {
             //FIXME AV wondering if we should have the option to fail (throw runtime exception) here
@@ -112,23 +114,22 @@ public class Aj implements ClassPreProcessor {
     }
 
     /**
-     * Dump the given bytcode in _dump/...
+     * Dump the given bytcode in _dump/... (dev mode)
      *
      * @param name
      * @param b
      * @throws Throwable
      */
-    static void __dump(String name, byte[] b) throws Throwable {
-        if (true) return;//FIXME AV have an option
+    static void dump(String name, byte[] b) throws Throwable {
         String className = name.replace('.', '/');
         final File dir;
         if (className.indexOf('/') > 0) {
-            dir = new File("_dump" + File.separator + className.substring(0, className.lastIndexOf('/')));
+            dir = new File("_ajdump" + File.separator + className.substring(0, className.lastIndexOf('/')));
         } else {
-            dir = new File("_dump");
+            dir = new File("_ajdump");
         }
         dir.mkdirs();
-        String fileName = "_dump" + File.separator + className + ".class";
+        String fileName = "_ajdump" + File.separator + className + ".class";
         FileOutputStream os = new FileOutputStream(fileName);
         os.write(b);
         os.close();
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
index b3e361ada..8c90b978b 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
@@ -11,13 +11,6 @@
  *******************************************************************************/
 package org.aspectj.weaver.loadtime;
 
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-
 import org.aspectj.asm.IRelationship;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
@@ -35,6 +28,13 @@ import org.aspectj.weaver.patterns.TypePattern;
 import org.aspectj.weaver.tools.GeneratedClassHandler;
 import org.aspectj.weaver.tools.WeavingAdaptor;
 
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
@@ -42,19 +42,10 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
 
     private final static String AOP_XML = "META-INF/aop.xml";
 
-    //ATAJ LTW include/exclude
+    private List m_dumpTypePattern = new ArrayList();
     private List m_includeTypePattern = new ArrayList();
     private List m_excludeTypePattern = new ArrayList();
     private List m_aspectExcludeTypePattern = new ArrayList();
-    public void addIncludeTypePattern(TypePattern typePattern) {
-        m_includeTypePattern.add(typePattern);
-    }
-    public void addExcludeTypePattern(TypePattern typePattern) {
-        m_excludeTypePattern.add(typePattern);
-    }
-    public void addAspectExcludeTypePattern(TypePattern typePattern) {
-        m_aspectExcludeTypePattern.add(typePattern);
-    }
 
     public ClassLoaderWeavingAdaptor(final ClassLoader loader) {
         super(null);// at this stage we don't have yet a generatedClassHandler to define to the VM the closures
@@ -68,7 +59,9 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
             public void acceptClass(String name, byte[] bytes) {
                 //TODO av make dump configurable
                 try {
-                    Aj.__dump(name, bytes);
+                    if (shouldDump(name.replace('/', '.'))) {
+                        Aj.dump(name, bytes);
+                    }
                 } catch (Throwable throwable) {
                     throwable.printStackTrace();
                 }
@@ -130,6 +123,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
             registerAspectExclude(weaver, loader, definitions);
             registerAspects(weaver, loader, definitions);
             registerIncludeExclude(weaver, loader, definitions);
+            registerDump(weaver, loader, definitions);
         } catch (Exception e) {
             weaver.getWorld().getMessageHandler().handleMessage(
                     new Message("Register definition failed", IMessage.WARNING, e, null)
@@ -161,7 +155,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
         world.setXlazyTjp(weaverOption.lazyTjp);
         weaver.setReweavableMode(weaverOption.reWeavable, false);
         world.setXnoInline(weaverOption.noInline);
-        world.setBehaveInJava5Way(weaverOption.java5);
+        world.setBehaveInJava5Way(weaverOption.java5);//TODO should be autodetected ?
         //TODO proceedOnError option
     }
 
@@ -227,6 +221,24 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
         }
     }
 
+    /**
+     * Register the dump filter
+     *
+     * @param weaver
+     * @param loader
+     * @param definitions
+     */
+    private void registerDump(final BcelWeaver weaver, final ClassLoader loader, final List definitions) {
+        for (Iterator iterator = definitions.iterator(); iterator.hasNext();) {
+            Definition definition = (Definition) iterator.next();
+            for (Iterator iterator1 = definition.getDumpPatterns().iterator(); iterator1.hasNext();) {
+                String dump = (String) iterator1.next();
+                TypePattern pattern = new PatternParser(dump).parseTypePattern();
+                m_dumpTypePattern.add(pattern);
+            }
+        }
+    }
+
     protected boolean accept(String className) {
         // avoid ResolvedType if not needed
         if (m_excludeTypePattern.isEmpty() && m_includeTypePattern.isEmpty()) {
@@ -244,7 +256,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
         }
         for (Iterator iterator = m_includeTypePattern.iterator(); iterator.hasNext();) {
             TypePattern typePattern = (TypePattern) iterator.next();
-            if (! typePattern.matchesStatically(classInfo)) {
+            if (!typePattern.matchesStatically(classInfo)) {
                 // include does not match - skip
                 return false;
             }
@@ -270,4 +282,21 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
         return true;
     }
 
+    public boolean shouldDump(String className) {
+        // avoid ResolvedType if not needed
+        if (m_dumpTypePattern.isEmpty()) {
+            return false;
+        }
+        //TODO AV - optimize for className.startWith only
+        ResolvedTypeX classInfo = weaver.getWorld().getCoreType(TypeX.forName(className));
+        //dump
+        for (Iterator iterator = m_dumpTypePattern.iterator(); iterator.hasNext();) {
+            TypePattern typePattern = (TypePattern) iterator.next();
+            if (typePattern.matchesStatically(classInfo)) {
+                // dump match
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/definition/Definition.java b/loadtime/src/org/aspectj/weaver/loadtime/definition/Definition.java
index e67e21f0f..73677e60f 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/definition/Definition.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/definition/Definition.java
@@ -23,6 +23,8 @@ public class Definition {
 
     private StringBuffer m_weaverOptions;
 
+    private List m_dumpPatterns;
+
     private List m_includePatterns;
 
     private List m_excludePatterns;
@@ -35,6 +37,7 @@ public class Definition {
 
     public Definition() {
         m_weaverOptions = new StringBuffer();
+        m_dumpPatterns = new ArrayList(0);
         m_includePatterns = new ArrayList(0);
         m_excludePatterns = new ArrayList(0);
         m_aspectClassNames = new ArrayList();
@@ -46,6 +49,10 @@ public class Definition {
         return m_weaverOptions.toString();
     }
 
+    public List getDumpPatterns() {
+        return m_dumpPatterns;
+    }
+
     public List getIncludePatterns() {
         return m_includePatterns;
     }
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/definition/DocumentParser.java b/loadtime/src/org/aspectj/weaver/loadtime/definition/DocumentParser.java
index 79faf54f4..9dbbfa18f 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/definition/DocumentParser.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/definition/DocumentParser.java
@@ -47,6 +47,7 @@ public class DocumentParser extends DefaultHandler {
 
     private final static String ASPECTJ_ELEMENT = "aspectj";
     private final static String WEAVER_ELEMENT = "weaver";
+    private final static String DUMP_ELEMENT = "dump";
     private final static String INCLUDE_ELEMENT = "include";
     private final static String EXCLUDE_ELEMENT = "exclude";
     private final static String OPTIONS_ATTRIBUTE = "options";
@@ -59,7 +60,6 @@ public class DocumentParser extends DefaultHandler {
     private final static String WITHIN_ATTRIBUTE = "within";
     private final static String EXPRESSION_ATTRIBUTE = "expression";
 
-
     private final Definition m_definition;
 
     private boolean m_inAspectJ;
@@ -176,6 +176,11 @@ public class DocumentParser extends DefaultHandler {
             if (!isNull(typePattern)) {
                 m_definition.getExcludePatterns().add(typePattern);
             }
+        } else if (DUMP_ELEMENT.equals(qName) && m_inWeaver) {
+            String typePattern = attributes.getValue(WITHIN_ATTRIBUTE);
+            if (!isNull(typePattern)) {
+                m_definition.getDumpPatterns().add(typePattern);
+            }
         } else if (EXCLUDE_ELEMENT.equals(qName) && m_inAspects) {
             String typePattern = attributes.getValue(WITHIN_ATTRIBUTE);
             if (!isNull(typePattern)) {