Fix 106736 - permitting classes dir as aspect URL (also permitting .zip files)

diff --git a/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java b/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
index 9f098de0ac732966219407d56916ac73fd7b9ac2..d0d46db814372ee10ee63f63cc7f7005901157f0 100644 (file)
--- a/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
+++ b/weaver/src/org/aspectj/weaver/tools/WeavingAdaptor.java
@@ -256,7 +256,9 @@ public class WeavingAdaptor {
         */
        private void addAspectLibrary(String aspectLibraryName) {
                File aspectLibrary = new File(aspectLibraryName);
-               if (aspectLibrary.isFile() && aspectLibraryName.endsWith(".jar")) {
+               if (aspectLibrary.isDirectory()
+                || (aspectLibrary.isFile() 
+                        && FileUtil.hasZipSuffix(aspectLibraryName))) {
                        try {
                                info("adding aspect library: '" + aspectLibrary + "'");
                                weaver.addLibraryJarFile(aspectLibrary);