You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/02/21 16:30:44 UTC
[54/55] git commit: MARMOTTA-106: renamed packages in sesame-filter
MARMOTTA-106: renamed packages in sesame-filter
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/63992b51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/63992b51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/63992b51
Branch: refs/heads/master
Commit: 63992b51236a6dc30ada986c25d384f720c71730
Parents: 21a28cf
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Feb 21 16:00:50 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Feb 21 16:00:50 2013 +0100
----------------------------------------------------------------------
.../commons/sesame/filter/AllOfFilter.java | 58 ++++++++++++
.../commons/sesame/filter/AlwaysFalseFilter.java | 35 +++++++
.../commons/sesame/filter/AlwaysTrueFilter.java | 35 +++++++
.../marmotta/commons/sesame/filter/NotFilter.java | 41 ++++++++
.../commons/sesame/filter/OneOfFilter.java | 58 ++++++++++++
.../commons/sesame/filter/SesameFilter.java | 34 +++++++
.../sesame/filter/resource/ResourceFilter.java | 32 +++++++
.../sesame/filter/resource/UriPrefixFilter.java | 72 +++++++++++++++
.../sesame/filter/resource/UriRegexFilter.java | 70 ++++++++++++++
.../sesame/filter/statement/StatementFilter.java | 27 ++++++
.../apache/marmotta/sesame/filter/AllOfFilter.java | 58 ------------
.../marmotta/sesame/filter/AlwaysFalseFilter.java | 35 -------
.../marmotta/sesame/filter/AlwaysTrueFilter.java | 35 -------
.../apache/marmotta/sesame/filter/NotFilter.java | 41 --------
.../apache/marmotta/sesame/filter/OneOfFilter.java | 58 ------------
.../marmotta/sesame/filter/SesameFilter.java | 34 -------
.../sesame/filter/resource/ResourceFilter.java | 32 -------
.../sesame/filter/resource/UriPrefixFilter.java | 72 ---------------
.../sesame/filter/resource/UriRegexFilter.java | 70 --------------
.../sesame/filter/statement/StatementFilter.java | 27 ------
.../kiwi/versioning/sail/KiWiVersioningSail.java | 4 +-
.../marmotta/ldcache/sail/KiWiLinkedDataSail.java | 2 +-
.../ldcache/sail/KiWiLinkedDataSailConnection.java | 3 +-
.../sail/test/KiWiLinkedDataSailOfflineTest.java | 5 +-
.../kiwi/core/model/filter/LMFLocalFilter.java | 3 +-
.../services/ldcache/LDCacheSailProvider.java | 3 +-
.../services/VersioningSailProvider.java | 7 +-
27 files changed, 478 insertions(+), 473 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AllOfFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AllOfFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AllOfFilter.java
new file mode 100644
index 0000000..bb1d7ac
--- /dev/null
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AllOfFilter.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (C) 2013 Salzburg Research.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.marmotta.commons.sesame.filter;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A filter combining several filters and requiring that all filters match.
+ * <p/>
+ * Author: Sebastian Schaffert
+ */
+public class AllOfFilter<T> implements SesameFilter<T> {
+
+ private Set<SesameFilter<T>> children;
+
+
+ public AllOfFilter(SesameFilter<T>... children) {
+ this(new HashSet<SesameFilter<T>>(Arrays.asList(children)));
+ }
+
+ public AllOfFilter(Set<SesameFilter<T>> children) {
+ this.children = children;
+ }
+
+ /**
+ * Return false in case the filter does not accept the resource passed as argument, true otherwise.
+ *
+ *
+ * @param resource
+ * @return
+ */
+ @Override
+ public boolean accept(T resource) {
+
+ for(SesameFilter<T> filter : children) {
+ if(!filter.accept(resource)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysFalseFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysFalseFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysFalseFilter.java
new file mode 100644
index 0000000..2310db7
--- /dev/null
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysFalseFilter.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) 2013 Salzburg Research.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.marmotta.commons.sesame.filter;
+
+/**
+ * A filter that always returns false.
+ * <p/>
+ * Author: Sebastian Schaffert (sschaffert@apache.org)
+ */
+public class AlwaysFalseFilter<T> implements SesameFilter<T> {
+
+ /**
+ * Return false in case the filter does not accept the object passed as argument, true otherwise.
+ *
+ * @param object the object to check
+ * @return true in case the object is accepted, false otherwise
+ */
+ @Override
+ public boolean accept(T object) {
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysTrueFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysTrueFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysTrueFilter.java
new file mode 100644
index 0000000..9b5ecf1
--- /dev/null
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysTrueFilter.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) 2013 Salzburg Research.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.marmotta.commons.sesame.filter;
+
+/**
+ * A filter that accepts everything.
+ * <p/>
+ * Author: Sebastian Schaffert (sschaffert@apache.org)
+ */
+public class AlwaysTrueFilter<T> implements SesameFilter<T> {
+
+ /**
+ * Return false in case the filter does not accept the object passed as argument, true otherwise.
+ *
+ * @param object the object to check
+ * @return true in case the object is accepted, false otherwise
+ */
+ @Override
+ public boolean accept(T object) {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/NotFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/NotFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/NotFilter.java
new file mode 100644
index 0000000..0a8e0f0
--- /dev/null
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/NotFilter.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (C) 2013 Salzburg Research.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.marmotta.commons.sesame.filter;
+
+/**
+ * Negates a wrapped filter
+ * <p/>
+ * Author: Sebastian Schaffert (sschaffert@apache.org)
+ */
+public class NotFilter<T> implements SesameFilter<T> {
+
+ SesameFilter<T> wrapped;
+
+ public NotFilter(SesameFilter<T> wrapped) {
+ this.wrapped = wrapped;
+ }
+
+ /**
+ * Return false in case the filter does not accept the resource passed as argument, true otherwise.
+ *
+ * @param resource
+ * @return
+ */
+ @Override
+ public boolean accept(T resource) {
+ return !wrapped.accept(resource);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/OneOfFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/OneOfFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/OneOfFilter.java
new file mode 100644
index 0000000..70dc0b5
--- /dev/null
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/OneOfFilter.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (C) 2013 Salzburg Research.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.marmotta.commons.sesame.filter;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A filter combining several other filters with a disjunction, i.e. it is sufficient that one of the other filters
+ * matches.
+ * <p/>
+ * Author: Sebastian Schaffert
+ */
+public class OneOfFilter<T> implements SesameFilter<T> {
+
+ private Set<SesameFilter<T>> children;
+
+
+ public OneOfFilter(SesameFilter<T>... children) {
+ this(new HashSet<SesameFilter<T>>(Arrays.asList(children)));
+ }
+
+ public OneOfFilter(Set<SesameFilter<T>> children) {
+ this.children = children;
+ }
+
+ /**
+ * Return false in case the filter does not accept the resource passed as argument, true otherwise.
+ *
+ *
+ * @param resource
+ * @return
+ */
+ @Override
+ public boolean accept(T resource) {
+ for(SesameFilter<T> filter : children) {
+ if(filter.accept(resource)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/SesameFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/SesameFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/SesameFilter.java
new file mode 100644
index 0000000..5799573
--- /dev/null
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/SesameFilter.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (C) 2013 Salzburg Research.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.marmotta.commons.sesame.filter;
+
+/**
+ * Generic superinterface for all filters. Only defines an accept() method.
+ * <p/>
+ * Author: Sebastian Schaffert (sschaffert@apache.org)
+ */
+public interface SesameFilter<T> {
+
+ /**
+ * Return false in case the filter does not accept the object passed as argument, true otherwise.
+ *
+ *
+ * @param object the object to check
+ * @return true in case the object is accepted, false otherwise
+ */
+ public boolean accept(T object);
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/ResourceFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/ResourceFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/ResourceFilter.java
new file mode 100644
index 0000000..51244ae
--- /dev/null
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/ResourceFilter.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (C) 2013 Salzburg Research.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.marmotta.commons.sesame.filter.resource;
+
+import org.apache.marmotta.commons.sesame.filter.SesameFilter;
+import org.openrdf.model.Resource;
+
+/**
+ * A common interface for enhancement filters on resources. Specifies a single method, "accept", which should
+ * return false in case the filter does not accept the resource passed as argument.
+ * <p/>
+ * Note that enhancement filters should only implement methods that are not expensive to compute, since they will be
+ * evaluated when the transaction commits and before adding a resource to the enhancement queue.
+ * <p/>
+ * Author: Sebastian Schaffert
+ */
+public interface ResourceFilter extends SesameFilter<Resource> {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/UriPrefixFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/UriPrefixFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/UriPrefixFilter.java
new file mode 100644
index 0000000..b469d68
--- /dev/null
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/UriPrefixFilter.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (C) 2013 Salzburg Research.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.marmotta.commons.sesame.filter.resource;
+
+import org.openrdf.model.Resource;
+import org.openrdf.model.URI;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A filter only accepting resources starting with a given prefix.
+ * <p/>
+ * Author: Sebastian Schaffert
+ */
+public class UriPrefixFilter implements ResourceFilter {
+
+
+ private Set<String> prefixes;
+
+ public UriPrefixFilter(String... prefixes) {
+ this(new HashSet<String>(Arrays.asList(prefixes)));
+ }
+
+ public UriPrefixFilter(Set<String> prefixes) {
+ this.prefixes = prefixes;
+ }
+
+ public Set<String> getPrefixes() {
+ return prefixes;
+ }
+
+ /**
+ * Return false in case the filter does not accept the resource passed as argument, true otherwise.
+ *
+ *
+ * @param resource
+ * @return
+ */
+ @Override
+ public boolean accept(Resource resource) {
+ if(! (resource instanceof URI)) {
+ return false;
+ }
+
+ URI uri = (URI) resource;
+
+ for(String prefix : prefixes) {
+ if(uri.stringValue().startsWith(prefix)) {
+ return true;
+ }
+ }
+
+
+ return false;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/UriRegexFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/UriRegexFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/UriRegexFilter.java
new file mode 100644
index 0000000..b079c9b
--- /dev/null
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/resource/UriRegexFilter.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (C) 2013 Salzburg Research.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.marmotta.commons.sesame.filter.resource;
+
+import org.openrdf.model.Resource;
+import org.openrdf.model.URI;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * A filter only accepting URI resources where the URI matches one of the configured patterns.
+ * <p/>
+ * Author: Sebastian Schaffert
+ */
+public class UriRegexFilter implements ResourceFilter {
+
+ private Set<Pattern> patterns;
+
+
+ public UriRegexFilter(Collection<String> regexps) {
+ patterns = new HashSet<Pattern>();
+
+ for(String s : regexps) {
+ Pattern p = Pattern.compile(s);
+ patterns.add(p);
+ }
+
+ }
+
+ /**
+ * Return false in case the filter does not accept the resource passed as argument, true otherwise.
+ *
+ *
+ * @param resource
+ * @return
+ */
+ @Override
+ public boolean accept(Resource resource) {
+ if(! (resource instanceof URI)) {
+ return false;
+ }
+
+ URI uri = (URI) resource;
+
+ for(Pattern p : patterns) {
+ if(p.matcher(uri.stringValue()).matches()) {
+ return true;
+ }
+ }
+
+
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/statement/StatementFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/statement/StatementFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/statement/StatementFilter.java
new file mode 100644
index 0000000..9b5dc89
--- /dev/null
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/statement/StatementFilter.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2013 Salzburg Research.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.marmotta.commons.sesame.filter.statement;
+
+import org.apache.marmotta.commons.sesame.filter.SesameFilter;
+import org.openrdf.model.Statement;
+
+/**
+ * Add file description here!
+ * <p/>
+ * Author: Sebastian Schaffert (sschaffert@apache.org)
+ */
+public interface StatementFilter extends SesameFilter<Statement> {
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AllOfFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AllOfFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AllOfFilter.java
deleted file mode 100644
index 9d5f3a9..0000000
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AllOfFilter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.sesame.filter;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A filter combining several filters and requiring that all filters match.
- * <p/>
- * Author: Sebastian Schaffert
- */
-public class AllOfFilter<T> implements SesameFilter<T> {
-
- private Set<SesameFilter<T>> children;
-
-
- public AllOfFilter(SesameFilter<T>... children) {
- this(new HashSet<SesameFilter<T>>(Arrays.asList(children)));
- }
-
- public AllOfFilter(Set<SesameFilter<T>> children) {
- this.children = children;
- }
-
- /**
- * Return false in case the filter does not accept the resource passed as argument, true otherwise.
- *
- *
- * @param resource
- * @return
- */
- @Override
- public boolean accept(T resource) {
-
- for(SesameFilter<T> filter : children) {
- if(!filter.accept(resource)) {
- return false;
- }
- }
-
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AlwaysFalseFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AlwaysFalseFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AlwaysFalseFilter.java
deleted file mode 100644
index 1addd2d..0000000
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AlwaysFalseFilter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.sesame.filter;
-
-/**
- * A filter that always returns false.
- * <p/>
- * Author: Sebastian Schaffert (sschaffert@apache.org)
- */
-public class AlwaysFalseFilter<T> implements SesameFilter<T> {
-
- /**
- * Return false in case the filter does not accept the object passed as argument, true otherwise.
- *
- * @param object the object to check
- * @return true in case the object is accepted, false otherwise
- */
- @Override
- public boolean accept(T object) {
- return false;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AlwaysTrueFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AlwaysTrueFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AlwaysTrueFilter.java
deleted file mode 100644
index b063c7e..0000000
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/AlwaysTrueFilter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.sesame.filter;
-
-/**
- * A filter that accepts everything.
- * <p/>
- * Author: Sebastian Schaffert (sschaffert@apache.org)
- */
-public class AlwaysTrueFilter<T> implements SesameFilter<T> {
-
- /**
- * Return false in case the filter does not accept the object passed as argument, true otherwise.
- *
- * @param object the object to check
- * @return true in case the object is accepted, false otherwise
- */
- @Override
- public boolean accept(T object) {
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/NotFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/NotFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/NotFilter.java
deleted file mode 100644
index 50654ac..0000000
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/NotFilter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.sesame.filter;
-
-/**
- * Negates a wrapped filter
- * <p/>
- * Author: Sebastian Schaffert (sschaffert@apache.org)
- */
-public class NotFilter<T> implements SesameFilter<T> {
-
- SesameFilter<T> wrapped;
-
- public NotFilter(SesameFilter<T> wrapped) {
- this.wrapped = wrapped;
- }
-
- /**
- * Return false in case the filter does not accept the resource passed as argument, true otherwise.
- *
- * @param resource
- * @return
- */
- @Override
- public boolean accept(T resource) {
- return !wrapped.accept(resource);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/OneOfFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/OneOfFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/OneOfFilter.java
deleted file mode 100644
index 3ab8704..0000000
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/OneOfFilter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.sesame.filter;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A filter combining several other filters with a disjunction, i.e. it is sufficient that one of the other filters
- * matches.
- * <p/>
- * Author: Sebastian Schaffert
- */
-public class OneOfFilter<T> implements SesameFilter<T> {
-
- private Set<SesameFilter<T>> children;
-
-
- public OneOfFilter(SesameFilter<T>... children) {
- this(new HashSet<SesameFilter<T>>(Arrays.asList(children)));
- }
-
- public OneOfFilter(Set<SesameFilter<T>> children) {
- this.children = children;
- }
-
- /**
- * Return false in case the filter does not accept the resource passed as argument, true otherwise.
- *
- *
- * @param resource
- * @return
- */
- @Override
- public boolean accept(T resource) {
- for(SesameFilter<T> filter : children) {
- if(filter.accept(resource)) {
- return true;
- }
- }
-
- return false;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/SesameFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/SesameFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/SesameFilter.java
deleted file mode 100644
index 036735f..0000000
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/SesameFilter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.sesame.filter;
-
-/**
- * Generic superinterface for all filters. Only defines an accept() method.
- * <p/>
- * Author: Sebastian Schaffert (sschaffert@apache.org)
- */
-public interface SesameFilter<T> {
-
- /**
- * Return false in case the filter does not accept the object passed as argument, true otherwise.
- *
- *
- * @param object the object to check
- * @return true in case the object is accepted, false otherwise
- */
- public boolean accept(T object);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/ResourceFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/ResourceFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/ResourceFilter.java
deleted file mode 100644
index dd8132d..0000000
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/ResourceFilter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.sesame.filter.resource;
-
-import org.apache.marmotta.sesame.filter.SesameFilter;
-import org.openrdf.model.Resource;
-
-/**
- * A common interface for enhancement filters on resources. Specifies a single method, "accept", which should
- * return false in case the filter does not accept the resource passed as argument.
- * <p/>
- * Note that enhancement filters should only implement methods that are not expensive to compute, since they will be
- * evaluated when the transaction commits and before adding a resource to the enhancement queue.
- * <p/>
- * Author: Sebastian Schaffert
- */
-public interface ResourceFilter extends SesameFilter<Resource> {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/UriPrefixFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/UriPrefixFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/UriPrefixFilter.java
deleted file mode 100644
index fc6d214..0000000
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/UriPrefixFilter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.sesame.filter.resource;
-
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A filter only accepting resources starting with a given prefix.
- * <p/>
- * Author: Sebastian Schaffert
- */
-public class UriPrefixFilter implements ResourceFilter {
-
-
- private Set<String> prefixes;
-
- public UriPrefixFilter(String... prefixes) {
- this(new HashSet<String>(Arrays.asList(prefixes)));
- }
-
- public UriPrefixFilter(Set<String> prefixes) {
- this.prefixes = prefixes;
- }
-
- public Set<String> getPrefixes() {
- return prefixes;
- }
-
- /**
- * Return false in case the filter does not accept the resource passed as argument, true otherwise.
- *
- *
- * @param resource
- * @return
- */
- @Override
- public boolean accept(Resource resource) {
- if(! (resource instanceof URI)) {
- return false;
- }
-
- URI uri = (URI) resource;
-
- for(String prefix : prefixes) {
- if(uri.stringValue().startsWith(prefix)) {
- return true;
- }
- }
-
-
- return false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/UriRegexFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/UriRegexFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/UriRegexFilter.java
deleted file mode 100644
index 4d500bc..0000000
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/resource/UriRegexFilter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.sesame.filter.resource;
-
-import org.openrdf.model.Resource;
-import org.openrdf.model.URI;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * A filter only accepting URI resources where the URI matches one of the configured patterns.
- * <p/>
- * Author: Sebastian Schaffert
- */
-public class UriRegexFilter implements ResourceFilter {
-
- private Set<Pattern> patterns;
-
-
- public UriRegexFilter(Collection<String> regexps) {
- patterns = new HashSet<Pattern>();
-
- for(String s : regexps) {
- Pattern p = Pattern.compile(s);
- patterns.add(p);
- }
-
- }
-
- /**
- * Return false in case the filter does not accept the resource passed as argument, true otherwise.
- *
- *
- * @param resource
- * @return
- */
- @Override
- public boolean accept(Resource resource) {
- if(! (resource instanceof URI)) {
- return false;
- }
-
- URI uri = (URI) resource;
-
- for(Pattern p : patterns) {
- if(p.matcher(uri.stringValue()).matches()) {
- return true;
- }
- }
-
-
- return false;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/statement/StatementFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/statement/StatementFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/statement/StatementFilter.java
deleted file mode 100644
index 2ec7f9f..0000000
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/sesame/filter/statement/StatementFilter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.marmotta.sesame.filter.statement;
-
-import org.apache.marmotta.sesame.filter.SesameFilter;
-import org.openrdf.model.Statement;
-
-/**
- * Add file description here!
- * <p/>
- * Author: Sebastian Schaffert (sschaffert@apache.org)
- */
-public interface StatementFilter extends SesameFilter<Statement> {
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java
index 44bbfd5..987cc93 100644
--- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java
+++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiVersioningSail.java
@@ -15,6 +15,8 @@
*/
package org.apache.marmotta.kiwi.versioning.sail;
+import org.apache.marmotta.commons.sesame.filter.AlwaysTrueFilter;
+import org.apache.marmotta.commons.sesame.filter.SesameFilter;
import org.apache.marmotta.kiwi.model.rdf.KiWiResource;
import org.apache.marmotta.kiwi.sail.KiWiStore;
import org.apache.marmotta.kiwi.transactions.api.TransactionListener;
@@ -25,8 +27,6 @@ import org.apache.marmotta.kiwi.versioning.api.VersioningSail;
import org.apache.marmotta.kiwi.versioning.model.Version;
import org.apache.marmotta.kiwi.versioning.persistence.KiWiVersioningConnection;
import org.apache.marmotta.kiwi.versioning.persistence.KiWiVersioningPersistence;
-import org.apache.marmotta.sesame.filter.AlwaysTrueFilter;
-import org.apache.marmotta.sesame.filter.SesameFilter;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
import org.openrdf.model.URI;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/libraries/ldcache/ldcache-sail-kiwi/src/main/java/org/apache/marmotta/ldcache/sail/KiWiLinkedDataSail.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/src/main/java/org/apache/marmotta/ldcache/sail/KiWiLinkedDataSail.java b/libraries/ldcache/ldcache-sail-kiwi/src/main/java/org/apache/marmotta/ldcache/sail/KiWiLinkedDataSail.java
index 5d29659..daaa31e 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/src/main/java/org/apache/marmotta/ldcache/sail/KiWiLinkedDataSail.java
+++ b/libraries/ldcache/ldcache-sail-kiwi/src/main/java/org/apache/marmotta/ldcache/sail/KiWiLinkedDataSail.java
@@ -15,12 +15,12 @@
*/
package org.apache.marmotta.ldcache.sail;
+import org.apache.marmotta.commons.sesame.filter.SesameFilter;
import org.apache.marmotta.kiwi.sail.KiWiStore;
import org.apache.marmotta.ldcache.backend.kiwi.LDCachingKiWiBackend;
import org.apache.marmotta.ldcache.model.CacheConfiguration;
import org.apache.marmotta.ldcache.services.LDCache;
import org.apache.marmotta.ldclient.model.ClientConfiguration;
-import org.apache.marmotta.sesame.filter.SesameFilter;
import org.openrdf.model.Resource;
import org.openrdf.sail.NotifyingSail;
import org.openrdf.sail.NotifyingSailConnection;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/libraries/ldcache/ldcache-sail-kiwi/src/main/java/org/apache/marmotta/ldcache/sail/KiWiLinkedDataSailConnection.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/src/main/java/org/apache/marmotta/ldcache/sail/KiWiLinkedDataSailConnection.java b/libraries/ldcache/ldcache-sail-kiwi/src/main/java/org/apache/marmotta/ldcache/sail/KiWiLinkedDataSailConnection.java
index 07e0c3c..705b026 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/src/main/java/org/apache/marmotta/ldcache/sail/KiWiLinkedDataSailConnection.java
+++ b/libraries/ldcache/ldcache-sail-kiwi/src/main/java/org/apache/marmotta/ldcache/sail/KiWiLinkedDataSailConnection.java
@@ -16,8 +16,9 @@
package org.apache.marmotta.ldcache.sail;
import info.aduna.iteration.CloseableIteration;
+
+import org.apache.marmotta.commons.sesame.filter.SesameFilter;
import org.apache.marmotta.ldcache.services.LDCache;
-import org.apache.marmotta.sesame.filter.SesameFilter;
import org.openrdf.model.BNode;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/libraries/ldcache/ldcache-sail-kiwi/src/test/java/org/apache/marmotta/ldcache/sail/test/KiWiLinkedDataSailOfflineTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/src/test/java/org/apache/marmotta/ldcache/sail/test/KiWiLinkedDataSailOfflineTest.java b/libraries/ldcache/ldcache-sail-kiwi/src/test/java/org/apache/marmotta/ldcache/sail/test/KiWiLinkedDataSailOfflineTest.java
index 72b73b0..28462de 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/src/test/java/org/apache/marmotta/ldcache/sail/test/KiWiLinkedDataSailOfflineTest.java
+++ b/libraries/ldcache/ldcache-sail-kiwi/src/test/java/org/apache/marmotta/ldcache/sail/test/KiWiLinkedDataSailOfflineTest.java
@@ -17,6 +17,9 @@
package org.apache.marmotta.ldcache.sail.test;
import info.aduna.iteration.CloseableIteration;
+
+import org.apache.marmotta.commons.sesame.filter.resource.ResourceFilter;
+import org.apache.marmotta.commons.sesame.filter.resource.UriPrefixFilter;
import org.apache.marmotta.kiwi.persistence.KiWiDialect;
import org.apache.marmotta.kiwi.persistence.h2.H2Dialect;
import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect;
@@ -25,8 +28,6 @@ import org.apache.marmotta.kiwi.sail.KiWiStore;
import org.apache.marmotta.ldcache.sail.KiWiLinkedDataSail;
import org.apache.marmotta.ldcache.sail.test.dummy.DummyEndpoint;
import org.apache.marmotta.ldclient.model.ClientConfiguration;
-import org.apache.marmotta.sesame.filter.resource.ResourceFilter;
-import org.apache.marmotta.sesame.filter.resource.UriPrefixFilter;
import org.hamcrest.CoreMatchers;
import org.junit.After;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/platform/marmotta-core/src/main/java/kiwi/core/model/filter/LMFLocalFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/model/filter/LMFLocalFilter.java b/platform/marmotta-core/src/main/java/kiwi/core/model/filter/LMFLocalFilter.java
index 92c3536..2d8e1ce 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/model/filter/LMFLocalFilter.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/model/filter/LMFLocalFilter.java
@@ -17,7 +17,8 @@ package kiwi.core.model.filter;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.util.KiWiContext;
-import org.apache.marmotta.sesame.filter.resource.ResourceFilter;
+
+import org.apache.marmotta.commons.sesame.filter.resource.ResourceFilter;
import org.openrdf.model.BNode;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/platform/marmotta-ldcache/src/main/java/at/newmedialab/lmf/ldcache/services/ldcache/LDCacheSailProvider.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/src/main/java/at/newmedialab/lmf/ldcache/services/ldcache/LDCacheSailProvider.java b/platform/marmotta-ldcache/src/main/java/at/newmedialab/lmf/ldcache/services/ldcache/LDCacheSailProvider.java
index 76e21e5..ab06f1e 100644
--- a/platform/marmotta-ldcache/src/main/java/at/newmedialab/lmf/ldcache/services/ldcache/LDCacheSailProvider.java
+++ b/platform/marmotta-ldcache/src/main/java/at/newmedialab/lmf/ldcache/services/ldcache/LDCacheSailProvider.java
@@ -22,12 +22,13 @@ import kiwi.core.api.triplestore.NotifyingSailProvider;
import kiwi.core.api.triplestore.SesameService;
import kiwi.core.events.ConfigurationChangedEvent;
import kiwi.core.model.filter.LMFLocalFilter;
+
+import org.apache.marmotta.commons.sesame.filter.NotFilter;
import org.apache.marmotta.ldcache.sail.KiWiLinkedDataSail;
import org.apache.marmotta.ldcache.services.LDCache;
import org.apache.marmotta.ldclient.api.endpoint.Endpoint;
import org.apache.marmotta.ldclient.api.ldclient.LDClientService;
import org.apache.marmotta.ldclient.model.ClientConfiguration;
-import org.apache.marmotta.sesame.filter.NotFilter;
import org.openrdf.model.Resource;
import org.openrdf.sail.NotifyingSail;
import org.openrdf.sail.helpers.NotifyingSailWrapper;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/63992b51/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/services/VersioningSailProvider.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/services/VersioningSailProvider.java b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/services/VersioningSailProvider.java
index 0e60407..96425e4 100644
--- a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/services/VersioningSailProvider.java
+++ b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/services/VersioningSailProvider.java
@@ -19,14 +19,15 @@ import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.triplestore.SesameService;
import kiwi.core.api.triplestore.TransactionalSailProvider;
import kiwi.core.events.ConfigurationChangedEvent;
+
+import org.apache.marmotta.commons.sesame.filter.AllOfFilter;
+import org.apache.marmotta.commons.sesame.filter.SesameFilter;
+import org.apache.marmotta.commons.sesame.filter.statement.StatementFilter;
import org.apache.marmotta.kiwi.transactions.api.TransactionalSail;
import org.apache.marmotta.kiwi.transactions.wrapper.TransactionalSailWrapper;
import org.apache.marmotta.kiwi.versioning.model.Version;
import org.apache.marmotta.kiwi.versioning.repository.SnapshotRepositoryConnection;
import org.apache.marmotta.kiwi.versioning.sail.KiWiVersioningSail;
-import org.apache.marmotta.sesame.filter.AllOfFilter;
-import org.apache.marmotta.sesame.filter.SesameFilter;
-import org.apache.marmotta.sesame.filter.statement.StatementFilter;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
import org.openrdf.repository.RepositoryException;