MARMOTTA-442: DefaultConfiguration now uses its Classloader for the ServiceLoader used to load functions and tests. This is required so that loading functions and tests works in OSGI
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/60b6f812 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/60b6f812 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/60b6f812 Branch: refs/heads/ldp Commit: 60b6f8125e40d53a2a6401faf3c56f24be9248a7 Parents: 638dea3 Author: Rupert Westenthaler <[email protected]> Authored: Thu Feb 27 19:59:38 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Thu Feb 27 19:59:38 2014 +0100 ---------------------------------------------------------------------- .../apache/marmotta/ldpath/parser/DefaultConfiguration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/60b6f812/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/parser/DefaultConfiguration.java ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/parser/DefaultConfiguration.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/parser/DefaultConfiguration.java index faba2d5..2238c5e 100644 --- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/parser/DefaultConfiguration.java +++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/parser/DefaultConfiguration.java @@ -46,10 +46,12 @@ public class DefaultConfiguration<Node> extends Configuration<Node> { private static Logger log = LoggerFactory.getLogger(DefaultConfiguration.class); @SuppressWarnings("rawtypes") - private static ServiceLoader<SelectorFunction> functionLoader = ServiceLoader.load(SelectorFunction.class); + private static ServiceLoader<SelectorFunction> functionLoader = ServiceLoader.load(SelectorFunction.class, + DefaultConfiguration.class.getClassLoader()); @SuppressWarnings("rawtypes") - private static ServiceLoader<TestFunction> testLoader = ServiceLoader.load(TestFunction.class); + private static ServiceLoader<TestFunction> testLoader = ServiceLoader.load(TestFunction.class, + DefaultConfiguration.class.getClassLoader()); public static final Map<String, String> DEFAULT_NAMESPACES; static {
