From 64c5f287c55245e3306ff51886e5c648dd13ff20 Mon Sep 17 00:00:00 2001 From: aaron Date: Tue, 27 Apr 2010 17:46:46 +0000 Subject: [PATCH] fixes for edge-cases when using reflections to find classes outside of the main jar. Will push as a patch to reflections git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3264 348d0f76-0448-11de-a6fe-93d51630548a --- ivy.xml | 2 +- .../sting/utils/classloader/PackageUtils.java | 9 ++++++--- ...ar => reflections-0.9.5-svnversion79M.jar} | Bin 78521 -> 81876 bytes ...ml => reflections-0.9.5-svnversion79M.xml} | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) rename settings/repository/org.reflections/{reflections-0.9.5-svnversion79.jar => reflections-0.9.5-svnversion79M.jar} (84%) rename settings/repository/org.reflections/{reflections-0.9.5-svnversion79.xml => reflections-0.9.5-svnversion79M.xml} (68%) diff --git a/ivy.xml b/ivy.xml index 3c0b7aebe..46f2d46fa 100644 --- a/ivy.xml +++ b/ivy.xml @@ -18,7 +18,7 @@ - + diff --git a/java/src/org/broadinstitute/sting/utils/classloader/PackageUtils.java b/java/src/org/broadinstitute/sting/utils/classloader/PackageUtils.java index d5e676356..45a344c98 100755 --- a/java/src/org/broadinstitute/sting/utils/classloader/PackageUtils.java +++ b/java/src/org/broadinstitute/sting/utils/classloader/PackageUtils.java @@ -26,11 +26,14 @@ package org.broadinstitute.sting.utils.classloader; import org.reflections.Reflections; +import org.reflections.scanners.ResourcesScanner; import org.reflections.scanners.SubTypesScanner; import org.reflections.util.ClasspathHelper; import org.reflections.util.ConfigurationBuilder; +import org.reflections.util.ManifestAwareClasspathHelper; import org.slf4j.LoggerFactory; +import java.net.URL; import java.util.Set; import java.util.ArrayList; import java.util.List; @@ -46,11 +49,11 @@ public class PackageUtils { private static Reflections reflections = null; static { - + List urls = ManifestAwareClasspathHelper.getUrlsForManifestCurrentClasspath(); // Initialize general-purpose source tree reflector. reflections = new Reflections( new ConfigurationBuilder() - .setUrls(ClasspathHelper.getUrlsForCurrentClasspath()) - .setScanners(new SubTypesScanner())); + .setUrls(urls) + .setScanners(new SubTypesScanner(),new ResourcesScanner())); } /** diff --git a/settings/repository/org.reflections/reflections-0.9.5-svnversion79.jar b/settings/repository/org.reflections/reflections-0.9.5-svnversion79M.jar similarity index 84% rename from settings/repository/org.reflections/reflections-0.9.5-svnversion79.jar rename to settings/repository/org.reflections/reflections-0.9.5-svnversion79M.jar index 2b391eddfd78941a6b2c32a9abfa573768f1efe5..32b740a570c66c8fb046279474a024916d38b608 100644 GIT binary patch delta 6547 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 - +