You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by rw...@apache.org on 2014/02/27 19:59:53 UTC
[1/2] git commit: 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
Repository: marmotta
Updated Branches:
refs/heads/develop 2574bbef4 -> b243490b2
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/develop
Commit: 60b6f8125e40d53a2a6401faf3c56f24be9248a7
Parents: 638dea3
Author: Rupert Westenthaler <ru...@gmail.com>
Authored: Thu Feb 27 19:59:38 2014 +0100
Committer: Rupert Westenthaler <ru...@gmail.com>
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 {
[2/2] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/marmotta into develop
Posted by rw...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Jakob Frank (1) and Sergio Fernández (1)
# Via Sergio Fernández
* 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta:
MARMOTTA-431: aligned files names with timestamped versions
MARMOTTA-446: Added "includeInferred" flag to the SesameBackend constructors/factories. MARMOTTA-445: Fixed
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/b243490b
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/b243490b
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/b243490b
Branch: refs/heads/develop
Commit: b243490b2f60b29d6013d8a126a63482766d6700
Parents: 60b6f81 2574bbe
Author: Rupert Westenthaler <ru...@gmail.com>
Authored: Thu Feb 27 19:59:45 2014 +0100
Committer: Rupert Westenthaler <ru...@gmail.com>
Committed: Thu Feb 27 19:59:45 2014 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 2 +-
.../backend/sesame/AbstractSesameBackend.java | 144 +++----
.../ContextAwareSesameConnectionBackend.java | 23 +-
.../backend/sesame/SesameConnectionBackend.java | 88 ++--
.../backend/sesame/SesameRepositoryBackend.java | 32 +-
.../backend/sesame/SesameValueBackend.java | 420 +++++++++----------
6 files changed, 377 insertions(+), 332 deletions(-)
----------------------------------------------------------------------