You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/09/30 18:44:38 UTC
[01/50] [abbrv] git commit: fixes MARMOTTA-300 and MARMOTTA-302
Updated Branches:
refs/heads/master cdb3223db -> a9bf7e4fa
fixes MARMOTTA-300 and MARMOTTA-302
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/83522bfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/83522bfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/83522bfc
Branch: refs/heads/master
Commit: 83522bfc1f38f4cad7068043abd6fb62f86c5f96
Parents: 69cc8f3
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 10 11:44:51 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 10 11:44:51 2013 +0200
----------------------------------------------------------------------
.../sesame/repository/ResourceUtils.java | 22 ++++++++++----------
.../kiwi/persistence/KiWiConnection.java | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/83522bfc/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
index c048cb9..95cc9a4 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
@@ -82,7 +82,7 @@ public class ResourceUtils {
* @return true if the {@link Resource} is ever used as subject.
*/
public static boolean isSubject(RepositoryConnection conn, final Resource rsc) {
- return existsStatement(conn, rsc, null, null, null);
+ return existsStatement(conn, rsc, null, null);
}
/**
@@ -102,7 +102,7 @@ public class ResourceUtils {
* @return true if the {@link URI} is ever used as predicate.
*/
public static boolean isPredicate(RepositoryConnection conn, final URI uri) {
- return existsStatement(conn, null, uri, null, null);
+ return existsStatement(conn, null, uri, null);
}
/**
@@ -122,7 +122,7 @@ public class ResourceUtils {
* @return true if the {@link Value} is ever used as predicate.
*/
public static boolean isObject(RepositoryConnection conn, final Value val) {
- return existsStatement(conn, null, null, val, null);
+ return existsStatement(conn, null, null, val);
}
@@ -143,7 +143,7 @@ public class ResourceUtils {
* @return true if the {@link Resource} is ever used as context.
*/
public static boolean isContext(RepositoryConnection conn, Resource rsc) {
- return existsStatement(conn, null, null, null, rsc);
+ return existsStatement(conn, null, null, null);
}
/**
@@ -168,16 +168,16 @@ public class ResourceUtils {
/**
* Check for the existence of a {@link Statement} with the provided constraints. <code>null</code> is a wildcard.
* <br>This is a convenience method and does not really fit whith <em>Resource</em>Utils.
- * @param conn the {@link ResourceConnection} to check on
- * @param subj the subject of the {@link Statement} or <code>null</code> for a wildcard.
- * @param pred the predicate of the {@link Statement} or <code>null</code> for a wildcard.
- * @param object the object of the {@link Statement} or <code>null</code> for a wildcard.
- * @param ctx the context of the {@link Statement} or <code>null</code> for a wildcard.
+ *
+ * @param conn the {@link org.apache.marmotta.commons.sesame.repository.ResourceConnection} to check on
+ * @param subj the subject of the {@link org.openrdf.model.Statement} or <code>null</code> for a wildcard.
+ * @param pred the predicate of the {@link org.openrdf.model.Statement} or <code>null</code> for a wildcard.
+ * @param object the object of the {@link org.openrdf.model.Statement} or <code>null</code> for a wildcard.
* @return true if a {@link Statement} with the provided constraints exists.
*/
- public static boolean existsStatement(RepositoryConnection conn, Resource subj, URI pred, Value object, Resource ctx) {
+ public static boolean existsStatement(RepositoryConnection conn, Resource subj, URI pred, Value object) {
try {
- return conn.hasStatement(subj,pred,object,true,ctx);
+ return conn.hasStatement(subj,pred,object,true);
} catch (RepositoryException e) {
log.error(e.getMessage());
return false;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/83522bfc/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
index 3467525..3043e70 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
@@ -1591,7 +1591,7 @@ public class KiWiConnection {
if(row.getLong("ltype") != 0) {
result.setType((KiWiUriResource) loadNodeById(row.getLong("ltype")));
} else {
- log.warn("Loaded literal without type: '{}' (id:{}).", result.getContent(), result.getId());
+ log.debug("Loaded literal without type: '{}' (id:{}).", result.getContent(), result.getId());
}
cacheNode(result);
@@ -1687,7 +1687,7 @@ public class KiWiConnection {
result.setCreator((KiWiResource)loadNodeById(row.getLong("creator")));
}
result.setDeleted(row.getBoolean("deleted"));
- result.setInferred(row.getBoolean("deleted"));
+ result.setInferred(row.getBoolean("inferred"));
result.setCreated(new Date(row.getTimestamp("createdAt").getTime()));
try {
if(row.getDate("deletedAt") != null) {
[04/50] [abbrv] git commit: MARMOTTA-110: Splitted Backend for LDPath,
fixed some warnings. MARMOTTA-215: Added Tests for @graph parsing in LDPath
Posted by ss...@apache.org.
MARMOTTA-110: Splitted Backend for LDPath, fixed some warnings.
MARMOTTA-215: Added Tests for @graph parsing in LDPath
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/55e05efa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/55e05efa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/55e05efa
Branch: refs/heads/master
Commit: 55e05efa4503a4bd7fdcb83de5ca86a48e94857f
Parents: d74b7a7
Author: Jakob Frank <ja...@apache.org>
Authored: Mon Sep 9 15:20:22 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Sep 10 12:30:33 2013 +0200
----------------------------------------------------------------------
.../ldpath/api/functions/NodeFunction.java | 2 +-
.../marmotta/ldpath/api/tests/NodeTest.java | 1 +
.../api/transformers/NodeTransformer.java | 5 +-
.../model/functions/ConcatenateFunction.java | 3 +-
.../ldpath/model/functions/CountFunction.java | 3 +-
.../ldpath/model/functions/FirstFunction.java | 5 +-
.../ldpath/model/functions/LastFunction.java | 5 +-
.../ldpath/model/functions/SortFunction.java | 3 +-
.../marmotta/ldpath/model/programs/Program.java | 53 +++++++++++------
.../tests/functions/BinaryNumericTest.java | 1 +
.../marmotta/ldpath/util/Collections.java | 3 +
.../marmotta/ldpath/parser/ProgramTest.java | 61 ++++++++++++++++++++
.../ldpath-core/src/test/resources/logback.xml | 2 +
.../src/test/resources/parse/program.ldpath | 17 +++---
14 files changed, 128 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/functions/NodeFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/functions/NodeFunction.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/functions/NodeFunction.java
index 4d26d83..86805f6 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/functions/NodeFunction.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/functions/NodeFunction.java
@@ -44,7 +44,7 @@ public interface NodeFunction<T,Node> extends LDPathConstruct<Node> {
* @param args a nested list of KiWiNodes
* @return
*/
- public T apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException;
+ public T apply(RDFBackend<Node> backend, Node context, @SuppressWarnings("unchecked") Collection<Node>... args) throws IllegalArgumentException;
/**
* A string describing the signature of this node function, e.g. "fn:content(uris : Nodes) : Nodes". The
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/tests/NodeTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/tests/NodeTest.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/tests/NodeTest.java
index 17f4da1..78a0414 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/tests/NodeTest.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/tests/NodeTest.java
@@ -31,6 +31,7 @@ import org.apache.marmotta.ldpath.api.functions.NodeFunction;
public abstract class NodeTest<Node> implements NodeFunction<Boolean, Node> {
@Override
+ @SafeVarargs
public final Boolean apply(RDFBackend<Node> backend, Node context, Collection<Node>... args)
throws IllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
index 54e50ff..c467fb1 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/transformers/NodeTransformer.java
@@ -17,11 +17,10 @@
*/
package org.apache.marmotta.ldpath.api.transformers;
-import org.apache.marmotta.ldpath.api.backend.NodeBackend;
-import org.apache.marmotta.ldpath.api.backend.RDFBackend;
-
import java.util.Map;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+
/**
* Implementations of this interface allow to transform KiWiNode objects into the type T. This is
* currently required by the indexer to map KiWiNodes to the Java types corresponding to the
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
index 81437a6..127c621 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
@@ -46,7 +46,8 @@ public class ConcatenateFunction<Node> extends SelectorFunction<Node> {
* @return
*/
@Override
- public Collection<Node> apply(RDFBackend<Node> rdfBackend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ @SafeVarargs
+ public final Collection<Node> apply(RDFBackend<Node> rdfBackend, Node context, Collection<Node>... args) throws IllegalArgumentException {
Iterator<Node> it = org.apache.marmotta.ldpath.util.Collections.iterator(args);
StringBuilder result = new StringBuilder();
while (it.hasNext()) {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/CountFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/CountFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/CountFunction.java
index 1f0d130..6e0fc90 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/CountFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/CountFunction.java
@@ -31,7 +31,8 @@ public class CountFunction<Node> extends SelectorFunction<Node> {
private final URI dataType = URI.create("http://www.w3.org/2001/XMLSchema#integer");
@Override
- public Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ @SafeVarargs
+ public final Collection<Node> apply(RDFBackend<Node> backend, Node context, Collection<Node>... args) throws IllegalArgumentException {
LinkedList<Node> result = new LinkedList<Node>();
for (Collection<Node> coll : args) {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/FirstFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/FirstFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/FirstFunction.java
index 735c13a..44e34c4 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/FirstFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/FirstFunction.java
@@ -29,7 +29,7 @@ import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
*
*
* @param <Node> the node type used by the backend
- * @author jakob
+ * @author Jakob Frank <ja...@apache.org>
*
*/
public class FirstFunction<Node> extends SelectorFunction<Node> {
@@ -44,7 +44,8 @@ public class FirstFunction<Node> extends SelectorFunction<Node> {
* @return
*/
@Override
- public Collection<Node> apply(RDFBackend<Node> rdfBackend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ @SafeVarargs
+ public final Collection<Node> apply(RDFBackend<Node> rdfBackend, Node context, Collection<Node>... args) throws IllegalArgumentException {
for (Collection<Node> arg : args) {
if (arg.size() > 0) { return arg; }
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/LastFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/LastFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/LastFunction.java
index ef3cbfe..a0e502e 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/LastFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/LastFunction.java
@@ -27,7 +27,7 @@ import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
/**
* Selects the <code>last</code> node in the argument list.
*
- * @author jfrank
+ * @author Jakob Frank <ja...@apache.org>
*
*/
public class LastFunction<Node> extends SelectorFunction<Node> {
@@ -41,7 +41,8 @@ public class LastFunction<Node> extends SelectorFunction<Node> {
* @return
*/
@Override
- public Collection<Node> apply(RDFBackend<Node> rdfBackend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ @SafeVarargs
+ public final Collection<Node> apply(RDFBackend<Node> rdfBackend, Node context, Collection<Node>... args) throws IllegalArgumentException {
for (int i = args.length - 1; i >= 0; i--) {
if (args[i].size() > 0) { return args[i]; }
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
index 30ec623..786f4ad 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/SortFunction.java
@@ -65,7 +65,8 @@ public class SortFunction<Node> extends SelectorFunction<Node> {
* @return
*/
@Override
- public Collection<Node> apply(final RDFBackend<Node> nodeRDFBackend, Node context, Collection<Node>... args) throws IllegalArgumentException {
+ @SafeVarargs
+ public final Collection<Node> apply(final RDFBackend<Node> nodeRDFBackend, Node context, Collection<Node>... args) throws IllegalArgumentException {
String order = "string";
String direction = "asc";
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/programs/Program.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/programs/Program.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/programs/Program.java
index 43930eb..ae4ffcb 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/programs/Program.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/programs/Program.java
@@ -58,7 +58,7 @@ public class Program<Node> implements LDPathConstruct<Node> {
* A map mapping from namespace prefix to namespace URI
*/
private Map<String, String> namespaces;
-
+
/**
* Restrict evaluation of the program to the graphs/contexts
*/
@@ -74,7 +74,7 @@ public class Program<Node> implements LDPathConstruct<Node> {
* An (optional) selector to resolve a document boost factor.
*/
private FieldMapping<Float,Node> booster;
-
+
/**
* The field mappings contained in this program.
*/
@@ -83,7 +83,7 @@ public class Program<Node> implements LDPathConstruct<Node> {
public Program() {
namespaces = new LinkedHashMap<String, String>();
fields = new LinkedHashSet<FieldMapping<?,Node>>();
- graphs = new HashSet<Node>();
+ graphs = new LinkedHashSet<Node>();
}
public void addNamespace(String prefix, String uri) {
@@ -97,7 +97,7 @@ public class Program<Node> implements LDPathConstruct<Node> {
public Set<FieldMapping<?,Node>> getFields() {
return fields;
}
-
+
public FieldMapping<?,Node> getField(String name) {
for(FieldMapping<?,Node> m : fields) {
if(name.equals(m.getFieldName())) {
@@ -134,21 +134,21 @@ public class Program<Node> implements LDPathConstruct<Node> {
public void setNamespaces(Map<String, String> namespaces) {
this.namespaces = new LinkedHashMap<String, String>(namespaces);
}
-
+
public Set<Node> getGraphs() {
return this.graphs;
}
-
+
@SuppressWarnings("unchecked")
public Node[] getGraphArr() {
- return (Node[]) this.graphs.toArray(new Object[this.graphs.size()]);
+ return (Node[]) this.graphs.toArray();
}
-
+
public void setGraphs(Collection<Node> graphs) {
this.graphs.clear();
this.graphs.addAll(graphs);
}
-
+
/**
* Executes this Program on the parsed {@link RDFBackend backend}.
* @param context The context of the execution
@@ -178,22 +178,41 @@ public class Program<Node> implements LDPathConstruct<Node> {
return result;
}
-
-
+
+
public String getPathExpression(NodeBackend<Node> backend) {
StringBuilder sb = new StringBuilder();
- // Filter (?)
+ // Graphs (optional)
+ if (graphs != null && graphs.size() > 0) {
+ sb.append("@graph");
+ boolean first = true;
+ for (Node gaph : graphs) {
+ if (backend.isURI(gaph)) {
+ if (first) {
+ sb.append(" <");
+ } else{
+ sb.append(", <");
+ }
+ sb.append(backend.stringValue(gaph)).append(">");
+
+ first = false;
+ }
+ }
+ sb.append(" ;\n");
+ }
+
+ // Filter (optional)
if (filter != null) {
sb.append(String.format("@filter %s ;%n", filter.getPathExpression(backend)));
}
- // Booster (?)
+ // Booster (optional)
if (booster != null) {
sb.append(String.format("@boost %s ;%n", booster.getSelector().getPathExpression(backend)));
}
// Field-Definitions
- for (FieldMapping<?,Node> field : fields) {
+ for (FieldMapping<?,Node> field : fields) {
sb.append(String.format(" %s%n", field.getPathExpression(backend)));
}
String progWithoutNamespace = sb.toString();
@@ -210,7 +229,7 @@ public class Program<Node> implements LDPathConstruct<Node> {
progWithoutNamespace = progWithoutNamespace.replaceAll("<" + Pattern.quote(ns.getValue()) + "([^>]*)>", Matcher.quoteReplacement(ns.getKey())
+ ":$1");
}
-
+
// Also resolve default namespaces...
for (Entry<String, String> ns : DEFAULT_NAMESPACES.entrySet()) {
@@ -221,8 +240,8 @@ public class Program<Node> implements LDPathConstruct<Node> {
}
final StringBuilder prefixes = new StringBuilder();
for (Entry<String, String> ns : namespaces.entrySet()) {
- prefixes.append(String.format("@prefix %s : <%s> ;%n", ns.getKey(), ns.getValue()));
- }
+ prefixes.append(String.format("@prefix %s: <%s> ;%n", ns.getKey(), ns.getValue()));
+ }
return prefixes.append(progWithoutNamespace).toString();
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/BinaryNumericTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/BinaryNumericTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/BinaryNumericTest.java
index b7422d6..a35781c 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/BinaryNumericTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/functions/BinaryNumericTest.java
@@ -30,6 +30,7 @@ public abstract class BinaryNumericTest<Node> extends TestFunction<Node> {
protected final DoubleTransformer<Node> transformer = new DoubleTransformer<Node>();
@Override
+ @SafeVarargs
public final Boolean apply(RDFBackend<Node> backend, Node context,
Collection<Node>... args) throws IllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/util/Collections.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/util/Collections.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/util/Collections.java
index 8f2abea..651c771 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/util/Collections.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/util/Collections.java
@@ -34,6 +34,7 @@ public class Collections {
* @param lists
* @return
*/
+ @SafeVarargs
public static <T> List<T> concat(final Collection<T>... lists) {
List<T> result = new ArrayList<T>();
for(Collection<T> list : lists) {
@@ -46,6 +47,7 @@ public class Collections {
* @param lists the array with the lists
* @return the plain iterator over all elements of the lists
*/
+ @SafeVarargs
public static <T> Iterator<T> iterator(final Collection<T>...lists){
return iterator(0,lists);
}
@@ -57,6 +59,7 @@ public class Collections {
* @return the plain iterator over all elements of the lists starting from
* index offset
*/
+ @SafeVarargs
public static <T> Iterator<T> iterator(final int offset,final Collection<T>...lists){
if(offset < 0){
throw new IllegalArgumentException("The parsed Offest MUST NOT be < 0!");
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
new file mode 100644
index 0000000..0ee7311
--- /dev/null
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
@@ -0,0 +1,61 @@
+package org.apache.marmotta.ldpath.parser;
+
+import static org.junit.Assert.assertThat;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.URL;
+import java.util.Map;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.marmotta.ldpath.api.backend.RDFBackend;
+import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+import org.apache.marmotta.ldpath.model.programs.Program;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.text.IsEqualIgnoringWhiteSpace;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class ProgramTest {
+
+ private static StringTestingBackend backend;
+
+ private String expr;
+
+ private Program<String> program;
+
+ @BeforeClass
+ public static void beforeClass() {
+ backend = new StringTestingBackend();
+ }
+
+
+ @Before
+ public void before() throws ParseException, IOException {
+ final URL resource = ParserTest.class.getResource("/parse/program.ldpath");
+ assertThat("Could not load test input data '/parse/program.ldpath'", resource, CoreMatchers.notNullValue());
+
+ expr = IOUtils.toString(resource);
+
+ RdfPathParser<String> rdfPathParser = new RdfPathParser<String>(backend,new StringReader(expr));
+ rdfPathParser.registerTransformer("http://example.com/type", new NodeTransformer<String, String>() {
+ @Override
+ public String transform(RDFBackend<String> backend, String node, Map<String,String> configuration)
+ throws IllegalArgumentException {
+ return node;
+ }
+ });
+
+ program = rdfPathParser.parseProgram();
+
+ expr = expr.replaceAll("/\\*(?:.|[\\n\\r])*?\\*/", "");
+ }
+
+ @Test
+ public void testGetPathExpression() {
+ final String result = program.getPathExpression(backend);
+ Assert.assertThat(result, IsEqualIgnoringWhiteSpace.equalToIgnoringWhiteSpace(expr));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/resources/logback.xml b/libraries/ldpath/ldpath-core/src/test/resources/logback.xml
index 1bfecff..16c98cd 100644
--- a/libraries/ldpath/ldpath-core/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-core/src/test/resources/logback.xml
@@ -21,6 +21,8 @@
<pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
</encoder>
</appender>
+
+ <logger name="org.apache.marmotta.ldpath.parser.DefaultConfiguration" level="WARN" />
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/55e05efa/libraries/ldpath/ldpath-core/src/test/resources/parse/program.ldpath
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/resources/parse/program.ldpath b/libraries/ldpath/ldpath-core/src/test/resources/parse/program.ldpath
index cb75ce6..7d2670a 100644
--- a/libraries/ldpath/ldpath-core/src/test/resources/parse/program.ldpath
+++ b/libraries/ldpath/ldpath-core/src/test/resources/parse/program.ldpath
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@prefix test: <http://example.com/>;
+@prefix test: <http://example.com/> ;
@prefix foo: <http://foo.com/some/path#> ;
@graph test:context, foo:ctx, test:bar ;
@@ -22,12 +22,13 @@
@boost foo:boost / ^test:boost ;
-path = test:p1 / test:p2 :: test:type;
-lang_test = test:p1[@en] :: test:type;
-type_test = foo:p2[^^test:int] :: test:type;
-int_s = (foo:go)* :: test:type;
-int_p = (foo:go)+ :: test:type;
+path = test:p1 / test:p2 :: test:type ;
+lang_test = test:p1[@en] :: test:type ;
+type_test = foo:p2[^^test:int] :: test:type ;
+int_s = (foo:go)* :: test:type ;
+int_p = (foo:go)+ :: test:type ;
+group = (test:p1 / test:p2) :: test:type ;
-inverse = ^test:incoming :: test:type;
+inverse = ^test:incoming :: test:type ;
-config = test:foo :: test:type(c1=true, c2="false", c3="1.234");
\ No newline at end of file
+config = test:foo :: test:type(c1="true", c2="false", c3="1.234") ;
\ No newline at end of file
[25/50] [abbrv] git commit: fixes MARMOTTA-305 - was caused because
Context was not considered in ResourceUtils
Posted by ss...@apache.org.
fixes MARMOTTA-305 - was caused because Context was not considered in ResourceUtils
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/c262fbc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/c262fbc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/c262fbc6
Branch: refs/heads/master
Commit: c262fbc681b27ad4c3f5741185253864a8788a8e
Parents: 34a2c5c
Author: tkurz <tk...@apache.org>
Authored: Thu Sep 12 21:40:58 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Thu Sep 12 21:40:58 2013 +0200
----------------------------------------------------------------------
.../marmotta/commons/sesame/repository/ResourceUtils.java | 6 +++---
.../platform/core/webservices/resource/ResourceWebService.java | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c262fbc6/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
index c70e27e..1484df2 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
@@ -143,7 +143,7 @@ public class ResourceUtils {
* @return true if the {@link Resource} is ever used as context.
*/
public static boolean isContext(RepositoryConnection conn, Resource rsc) {
- return existsStatement(conn, null, null, null);
+ return existsStatement(conn, null, null, null, rsc);
}
/**
@@ -175,9 +175,9 @@ public class ResourceUtils {
* @param object the object of the {@link org.openrdf.model.Statement} or <code>null</code> for a wildcard.
* @return true if a {@link Statement} with the provided constraints exists.
*/
- public static boolean existsStatement(RepositoryConnection conn, Resource subj, URI pred, Value object) {
+ public static boolean existsStatement(RepositoryConnection conn, Resource subj, URI pred, Value object, Resource ... context) {
try {
- return conn.hasStatement(subj,pred,object,true);
+ return conn.hasStatement(subj,pred,object,true,context);
} catch (RepositoryException e) {
log.error(e.getMessage());
return false;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c262fbc6/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java
index facd716..f2e76eb 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java
@@ -366,10 +366,12 @@ public class ResourceWebService {
RepositoryConnection conn = sesameService.getConnection();
try {
conn.begin();
- Resource r;
+ Resource r = null;
if (UriUtil.validate(resource)) {
try {
- r = ResourceUtils.getUriResource(conn, resource);
+ if(ResourceUtils.isSubject(conn, resource)) { //tests if a resource is used as subject
+ r = ResourceUtils.getUriResource(conn, resource);
+ }
} catch (Exception e) {
log.error("Error retrieving the resource <{}>: {}", resource, e.getMessage());
log.debug("So redirecting directly to it...");
[03/50] [abbrv] git commit: fixed some further wrong usages of
hasStatement and getStatements
Posted by ss...@apache.org.
fixed some further wrong usages of hasStatement and getStatements
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/d74b7a77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/d74b7a77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/d74b7a77
Branch: refs/heads/master
Commit: d74b7a77e6ee2317dfcd689cdb5bc84892111a1d
Parents: ce5cf2c
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 10 12:15:49 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 10 12:15:49 2013 +0200
----------------------------------------------------------------------
.../commons/sesame/repository/ResourceUtils.java | 6 +++++-
.../commons/sesame/facading/impl/FacadingImpl.java | 12 ++++++++++--
.../facading/concurrent/ConcurrentFacadingTest.java | 5 ++++-
.../core/webservices/resource/InspectionWebService.java | 2 +-
4 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d74b7a77/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
index 95cc9a4..c70e27e 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
@@ -1233,7 +1233,11 @@ public class ResourceUtils {
URI rdf_type = con.getValueFactory().createURI(Namespaces.NS_RDF + "type");
if(rdf_type != null) {
- return con.hasStatement(r,rdf_type,type,true,context);
+ if(context != null) {
+ return con.hasStatement(r,rdf_type,type,true,context);
+ } else {
+ return con.hasStatement(r,rdf_type,type,true);
+ }
}
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d74b7a77/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java b/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
index 4976592..be43a64 100644
--- a/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
+++ b/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
@@ -261,13 +261,21 @@ public class FacadingImpl implements Facading {
String[] rdfTypes = FacadeUtils.getFacadeAnnotation(type, RDFType.class).value();
boolean facadeable = true;
for (String s_type : rdfTypes) {
- facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true, context);
+ if(context != null) {
+ facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true, context);
+ } else {
+ facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true);
+ }
}
// also check for @RDFFilter
if (FacadeUtils.isFacadeAnnotationPresent(type, RDFFilter.class)) {
String[] filterTypes = FacadeUtils.getFacadeAnnotation(type, RDFFilter.class).value();
for (String s_type : filterTypes) {
- facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true, context);
+ if(context != null) {
+ facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true, context);
+ } else {
+ facadeable &= connection.hasStatement(r, RDF_TYPE, connection.getValueFactory().createURI(s_type), true);
+ }
}
}
return facadeable;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d74b7a77/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
index bd9edd6..32ce2a0 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
@@ -99,8 +99,11 @@ public class ConcurrentFacadingTest extends AbstractFacadingTest {
}
}
+ /**
+ * Test for MARMOTTA-236
+ * @throws RepositoryException
+ */
@Test
- @Ignore("Not a proper solution yet")
public void testParallelFacadingType() throws RepositoryException {
final RepositoryConnection mainCon = repositoryRDF.getConnection();
try {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d74b7a77/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/InspectionWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/InspectionWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/InspectionWebService.java
index 56a0c98..e80a8c3 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/InspectionWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/InspectionWebService.java
@@ -174,7 +174,7 @@ public class InspectionWebService {
private List<TriplePoJo> buildResultList(RepositoryConnection conn, URI s, URI p, URI o, URI c, long start, int limit) throws RepositoryException {
List<TriplePoJo> result = new ArrayList<InspectionWebService.TriplePoJo>();
- RepositoryResult<Statement> triples = conn.getStatements(s,p,o,true,c);
+ RepositoryResult<Statement> triples = c != null ? conn.getStatements(s,p,o,true,c) : conn.getStatements(s,p,o,true);
// skip until start
for(int i = 0; i<start && triples.hasNext(); i++) {
triples.next();
[21/50] [abbrv] git commit: change configuration for new admin ui
(for MARMOTTA-228)
Posted by ss...@apache.org.
change configuration for new admin ui (for MARMOTTA-228)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/40ce6eb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/40ce6eb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/40ce6eb9
Branch: refs/heads/master
Commit: 40ce6eb9abb1fe45f8954918ec5fd8038ffc40f5
Parents: 4e767a7
Author: tkurz <tk...@apache.org>
Authored: Thu Sep 12 14:23:00 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Thu Sep 12 14:23:00 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/kiwi-module.properties | 41 ++++++++++++-----
.../src/main/resources/templates/admin.ftl | 48 ++++++++++++++++----
.../src/main/resources/kiwi-module.properties | 6 ++-
.../src/main/resources/kiwi-module.properties | 12 ++++-
.../src/main/resources/kiwi-module.properties | 6 ++-
.../src/main/resources/kiwi-module.properties | 13 +++++-
.../src/main/resources/kiwi-module.properties | 14 +++++-
.../src/main/resources/kiwi-module.properties | 8 +++-
.../src/main/resources/kiwi-module.properties | 6 ++-
9 files changed, 127 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-core/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/kiwi-module.properties b/platform/marmotta-core/src/main/resources/kiwi-module.properties
index c3e2c28..37692bb 100644
--- a/platform/marmotta-core/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-core/src/main/resources/kiwi-module.properties
@@ -18,7 +18,7 @@
name=Core Services
-container=Admin
+container=Generic
container.weight = 10
subtitle = Configure LMF Core
@@ -29,16 +29,35 @@ icon_small = /admin/img/config_small.png
#do not change!!!
baseurl=/core
-adminpages=/admin/about.html,\
- /admin/configuration.html,\
- /admin/tasks.html,\
- /admin/import.html,\
- /admin/export.html,\
- /admin/dataview.html,\
- /admin/contexts.html,\
- /admin/prefixes.html,\
- /admin/system.html,\
- /admin/database.html
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configuration.html
+
+adminpage.2.title=Tasks
+adminpage.2.link=/admin/tasks.html
+
+adminpage.3.title=Import
+adminpage.3.link=/admin/import.html
+
+adminpage.4.title=Export
+adminpage.4.link=/admin/export.html
+
+adminpage.5.title=Data Views
+adminpage.5.link=/admin/dataview.html
+
+adminpage.6.title=Context Manager
+adminpage.6.link=/admin/contexts.html
+
+adminpage.7.title=Prefix Manager
+adminpage.7.link=/admin/prefixes.html
+
+adminpage.8.title=System
+adminpage.8.link=/admin/system.html
+
+adminpage.9.title=Database
+adminpage.9.link=/admin/database.html
webservices=org.apache.marmotta.platform.core.webservices.config.ConfigurationWebService,\
org.apache.marmotta.platform.core.webservices.config.DependenciesWebService,\
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-core/src/main/resources/templates/admin.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/admin.ftl b/platform/marmotta-core/src/main/resources/templates/admin.ftl
index 3352942..90173ff 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -58,18 +58,49 @@
}
ul.center_submenu li {
list-style: none;
- display: inline;
- margin-bottom: -1px;
- padding: 5px 0 0;
- margin-bottom: 10px;
- background-color: white;
- border: 1px solid black;
+ display: list-item;
+ float: left;
+ padding: 5px;
+ margin-right: 4px;
}
ul.center_submenu li.active {
- margin-bottom:-1px;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
+ background-color: white;
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
+ border-top: 1px solid #ccc;
}
ul.center_submenu a {
- padding:10px;
+ text-decoration: underline;
+ font-weight: bold;
+ color: #0B61A4;
+ }
+
+ ul.center_submenu li.active a {
+ text-decoration: none;
+ }
+ #content {
+ border-top-left-radius: 0;
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
+ border-left: 1px solid #ccc;
+ }
+ #login_logout {
+ float: right;
+ margin-right: 5px;
+ margin-top: -3px;
+ border: 1px solid #aaa;
+ padding: 4px 10px 2px;
+ background-color: white;
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ box-shadow: 0px 0px 8px #555;
+ }
+ #login_logout a {
+ color: #0B61A4;
+ font-weight: bold;
}
</style>
</head>
@@ -130,6 +161,7 @@
</#if>
</#list>
</ul>
+ <div class="clear"></div>
<div id="content">
${CONTENT}
</div>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-ldcache/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/src/main/resources/kiwi-module.properties b/platform/marmotta-ldcache/src/main/resources/kiwi-module.properties
index 0f0c425..3f3dd4e 100644
--- a/platform/marmotta-ldcache/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-ldcache/src/main/resources/kiwi-module.properties
@@ -25,7 +25,11 @@ baseurl=/cache
webservices=org.apache.marmotta.platform.ldcache.webservices.LinkedDataCachingWebService
-adminpages=/admin/about.html,/admin/configuration.html
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configuration.html
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-ldpath/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/src/main/resources/kiwi-module.properties b/platform/marmotta-ldpath/src/main/resources/kiwi-module.properties
index dd04fc9..6cfc446 100644
--- a/platform/marmotta-ldpath/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-ldpath/src/main/resources/kiwi-module.properties
@@ -17,7 +17,8 @@
#
name=LD Path Querying
-subtitle =
+
+container = Query and Update
icon_small = /admin/img/ld_path_small.png
#icon_big =
@@ -30,5 +31,14 @@ entities=
adminpages= /admin/about.html, /admin/ldpath.html, /admin/functions.html
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Query Interface
+adminpage.1.link=/admin/ldpath.html
+
+adminpage.2.title=Function Set
+adminpage.2.link=/admin/functions.html
+
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-reasoner/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/src/main/resources/kiwi-module.properties b/platform/marmotta-reasoner/src/main/resources/kiwi-module.properties
index 90187a8..cc520d1 100644
--- a/platform/marmotta-reasoner/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-reasoner/src/main/resources/kiwi-module.properties
@@ -25,4 +25,8 @@ icon_small = /admin/img/reasoner_small.png
webservices=org.apache.marmotta.platform.reasoner.webservices.ProgramWebService,org.apache.marmotta.platform.reasoner.webservices.ReasonerWebService
-adminpages=/admin/about.html,/admin/configure.html
\ No newline at end of file
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configure.html
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-security/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/src/main/resources/kiwi-module.properties b/platform/marmotta-security/src/main/resources/kiwi-module.properties
index e83618b..3e10010 100644
--- a/platform/marmotta-security/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-security/src/main/resources/kiwi-module.properties
@@ -17,6 +17,7 @@
#
name=Security
+container=Generic
baseurl=/security
@@ -26,8 +27,18 @@ icon_small = /public/img/security_small.png
webservices=org.apache.marmotta.platform.security.webservices.SecurityWebService
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configuration.html
+
+adminpage.2.title=Profiles
+adminpage.2.link=/admin/profiles.html
+
+adminpage.3.title=Rule Set
+adminpage.3.link=/admin/rules.html
-adminpages=/admin/about.html,/admin/configuration.html,/admin/profiles.html,/admin/rules.html
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-sparql/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/resources/kiwi-module.properties b/platform/marmotta-sparql/src/main/resources/kiwi-module.properties
index 5641ea4..4d1fe2d 100644
--- a/platform/marmotta-sparql/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-sparql/src/main/resources/kiwi-module.properties
@@ -18,6 +18,8 @@
name=SPARQL
weight = 20
+container = Query and Update
+container.weight = 5
baseurl=/sparql
@@ -27,5 +29,15 @@ icon_small = /admin/img/sparql_small.png
webservices=org.apache.marmotta.platform.sparql.webservices.SparqlWebService
-adminpages=/admin/about.html,/admin/configuration.html,/admin/snorql.html,/admin/update.html
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configuration.html
+
+adminpage.2.title=Query Interface
+adminpage.2.link=/admin/snorql.html
+
+adminpage.3.title=Update Interface
+adminpage.3.link=/admin/update.html
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-user/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/resources/kiwi-module.properties b/platform/marmotta-user/src/main/resources/kiwi-module.properties
index 60a5965..dc804e9 100644
--- a/platform/marmotta-user/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-user/src/main/resources/kiwi-module.properties
@@ -18,6 +18,8 @@
name=Users
+container=Generic
+
baseurl=/user
subtitle = Profile and Account Management
@@ -27,9 +29,11 @@ icon_small = /admin/img/user_small.png
webservices=org.apache.marmotta.platform.user.webservices.UserWebService,\
org.apache.marmotta.platform.user.webservices.UserManagementWebService
+adminpage.0.title=About Me
+adminpage.0.link=/me.html
-adminpages=/me.html,\
- /admin/users.html
+adminpage.1.title=Users
+adminpage.1.link=/admin/users.html
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-versioning/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/resources/kiwi-module.properties b/platform/marmotta-versioning/src/main/resources/kiwi-module.properties
index 12dd95c..f143730 100644
--- a/platform/marmotta-versioning/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-versioning/src/main/resources/kiwi-module.properties
@@ -27,4 +27,8 @@ webservices=org.apache.marmotta.platform.versioning.webservices.VersioningWebSer
icon_small = /admin/img/clock_small.png
-adminpages=/admin/about.html,/admin/configuration.html
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configuration.html
[34/50] [abbrv] git commit: [maven-release-plugin] prepare release
3.1.0-incubating
Posted by ss...@apache.org.
[maven-release-plugin] prepare release 3.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/543a6f65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/543a6f65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/543a6f65
Branch: refs/heads/master
Commit: 543a6f658e783214675ea068a15a22f2e7e797c0
Parents: 9cc8d97
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Sep 13 15:09:19 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Sep 13 15:09:19 2013 +0200
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 2 +-
build/archetypes/marmotta-archetype-webapp/pom.xml | 2 +-
build/archetypes/pom.xml | 2 +-
build/checkstyle-resources/pom.xml | 2 +-
build/dependency-resource-supplement/pom.xml | 2 +-
build/plugins/buildinfo-maven-plugin/pom.xml | 2 +-
build/plugins/marmotta-maven-plugin/pom.xml | 2 +-
build/plugins/pom.xml | 2 +-
build/plugins/refpack-maven-plugin/pom.xml | 2 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 2 +-
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 2 +-
extras/webjars/codemirror/pom.xml | 6 ++----
extras/webjars/pom.xml | 6 ++----
extras/webjars/sgvizler/pom.xml | 6 ++----
extras/webjars/snorql/pom.xml | 6 ++----
extras/webjars/strftime/pom.xml | 6 ++----
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-splash/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 2 +-
libraries/kiwi/kiwi-sparql/pom.xml | 5 ++---
libraries/kiwi/kiwi-transactions/pom.xml | 2 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 2 +-
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
libraries/kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-api/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-file/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-core/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-facebook/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-html/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-ldap/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdf/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdfa/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-vimeo/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-xml/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-youtube/pom.xml | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
libraries/ldpath/ldpath-core/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
libraries/ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 6 +++++-
platform/marmotta-core/pom.xml | 2 +-
platform/marmotta-ldcache/pom.xml | 2 +-
platform/marmotta-ldpath/pom.xml | 2 +-
platform/marmotta-reasoner/pom.xml | 2 +-
platform/marmotta-security/pom.xml | 2 +-
platform/marmotta-sparql/pom.xml | 2 +-
platform/marmotta-user/pom.xml | 2 +-
platform/marmotta-versioning/pom.xml | 2 +-
platform/pom.xml | 2 +-
pom.xml | 5 +++--
88 files changed, 100 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index 15ab89d..8cc13ff 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index dde1896..bfb2aba 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index bb1c01b..dea4e2a 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>archetypes-reactor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index 2a55e83..0ef41ed 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index d9eb75a..92d77a4 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index df5c3aa..e363329 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index 5126b17..fc86edf 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
<artifactId>plugins-reactor</artifactId>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index d25196d..3a11349 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 4f129c1..0ab97f5 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<artifactId>plugins-reactor</artifactId>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index 3da02ac..c1982b4 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>plugins-reactor</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
<!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>23</version> <relativePath /> -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index b6b8359..a3bd4de 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index b79125f..07ef981 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index 2213ba3..f636502 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index f63e640..0eac626 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index a672ec2..a84fbaf 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 182338c..06ba1eb 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index 1e318d5..36be4ae 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index c7d7532..9dfd8a5 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index 18c3eee..475ae41 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index 3414eed..8ec3e73 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 5dd8f40..0f4a8d8 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index 6d88340..25de2c0 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 393b2de..0be1aef 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index 132b00d..1605757 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -16,15 +16,13 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/extras/webjars/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml
index f6d2ef6..2450243 100644
--- a/extras/webjars/pom.xml
+++ b/extras/webjars/pom.xml
@@ -16,15 +16,13 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index beaa1c8..a611271 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -16,15 +16,13 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index f8f4aeb..0f8831e 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -16,15 +16,13 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index 47834b0..6f337ab 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -16,15 +16,13 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 11b8ec7..5db3648 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index 0d8d859..aea7c89 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 444f55f..60d6f86 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 01fc15b..8aa8a8d 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index ce9fda9..c4bcf84 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index cdc67aa..e76b396 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index 754a363..3ddd37d 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -16,14 +16,13 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index c76886e..07d3b2d 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index 493383a..ac82859 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index 9f98878..2c8a49d 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
</parent>
<artifactId>kiwi-tripletable</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index 7a3dc74..81c2a4c 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 323b311..665f70d 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index 5cc7128..13dbd08 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index f4db276..0df8bea 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldcache/ldcache-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml
index b613fb8..881b2bf 100644
--- a/libraries/ldcache/ldcache-backend-file/pom.xml
+++ b/libraries/ldcache/ldcache-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldcache/ldcache-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
index a67f0a5..1fab347 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldcache/ldcache-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml
index f406705..6b2c713 100644
--- a/libraries/ldcache/ldcache-core/pom.xml
+++ b/libraries/ldcache/ldcache-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldcache/ldcache-sail-generic/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/pom.xml b/libraries/ldcache/ldcache-sail-generic/pom.xml
index 6556e5b..8ed617e 100644
--- a/libraries/ldcache/ldcache-sail-generic/pom.xml
+++ b/libraries/ldcache/ldcache-sail-generic/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldcache/ldcache-sail-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/pom.xml b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
index e05681f..8c755ea 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml
index b7d126d..26dee79 100644
--- a/libraries/ldcache/pom.xml
+++ b/libraries/ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 22eb397..6873d92 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index 17dd713..de02401 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index 7b044f3..e1526d5 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-provider-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml
index efa9821..8b4a77d 100644
--- a/libraries/ldclient/ldclient-provider-html/pom.xml
+++ b/libraries/ldclient/ldclient-provider-html/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-provider-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml
index 4736c8f..539209e 100644
--- a/libraries/ldclient/ldclient-provider-ldap/pom.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
index a97c354..c2d2d9f 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index c67862f..6719feb 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index ab3355a..fd75822 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-provider-rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdfa/pom.xml b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
index eb1e264..8dcd4b3 100644
--- a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index 541bd79..d1e38fa 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-provider-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml
index 0ff9206..12ebc32 100644
--- a/libraries/ldclient/ldclient-provider-xml/pom.xml
+++ b/libraries/ldclient/ldclient-provider-xml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index 062ce27..43ebc06 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldclient/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml
index a35912e..084786b 100644
--- a/libraries/ldclient/pom.xml
+++ b/libraries/ldclient/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index faacf31..d97b08f 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index a8ebdae..236ff61 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index 30028ce..6338891 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 030d560..5be1f7e 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index b500bc4..da8f536 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index 70738f8..95dd222 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index b2f6704..ac7553a 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index dea27be..62e6fe7 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index d49d490..dc031ad 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index ae8abfa..333fbcc 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 0e9612e..42823a3 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index 0ce6361..57a840d 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index 818b73e..d2a227d 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index a4c680a..a2f5a15 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 99568d2..42eaaa3 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/libraries/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/pom.xml b/libraries/pom.xml
index a3dbffd..9c1079c 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bc0377d..ec6db55 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<packaging>pom</packaging>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<name>Apache Marmotta Parent</name>
<description>Parent POM for the Apache Marmotta project</description>
@@ -1586,4 +1586,8 @@
</scm>
-->
+
+ <scm>
+ <tag>3.1.0-incubating</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index 6ebaaf8..f27b855 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index b73049a..2fac3fb 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index 19a16a0..9178ee7 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index 861a38c..0b0cee3 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 183e65d..3e6f337 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 2e7a6d3..fbe950b 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index a6ac0fb..c8279ec 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index aa64a16..35a0868 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index 8c7a027..3713bab 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/543a6f65/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ba1c49..ee0fec8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>parent</relativePath>
</parent>
@@ -124,7 +124,8 @@
<url>https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</url>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</developerConnection>
- </scm>
+ <tag>3.1.0-incubating</tag>
+ </scm>
<issueManagement>
<system>Jira</system>
[37/50] [abbrv] git commit: MARMOTTA-213: cosmetic changes
Posted by ss...@apache.org.
MARMOTTA-213: cosmetic changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/08fac275
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/08fac275
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/08fac275
Branch: refs/heads/master
Commit: 08fac2756b0f39fe3308091c3ec1cf53f9ccc1a3
Parents: 30c02f0
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Sep 20 13:05:31 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Sep 20 13:05:31 2013 +0200
----------------------------------------------------------------------
NOTICE.txt | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/08fac275/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index eb3d48e..f527a32 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -11,8 +11,8 @@ Portions of this software were originally based on the following:
These have been licensed to the Apache Software Foundation under a software grant.
* The module extras/webjars/snorql constains a adapted version of the D2R
- Snorql Library, which was originally created by Richard Cyganaik for the D2R
- server project (http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/). It is
+ Snorql library, which was originally created by Richard Cyganaik for the D2R
+ Server project (http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/). It is
licensed under the Apache Software License 2.0. The source code is available
at http://github.com/kurtjx/SNORQL
@@ -20,4 +20,3 @@ These have been licensed to the Apache Software Foundation under a software gran
of the Javolution library. Javolution has copyright (c) 2012, Javolution and
is licensed under BSD license. The original source code is available at
http://javolution.org
-
[43/50] [abbrv] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by ss...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f3143213
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f3143213
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f3143213
Branch: refs/heads/master
Commit: f31432132727d052e454d6f8c4d97765de696aa9
Parents: a0fe8a7
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 24 10:57:03 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 24 10:57:03 2013 +0200
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 2 +-
build/archetypes/marmotta-archetype-webapp/pom.xml | 2 +-
build/archetypes/pom.xml | 2 +-
build/checkstyle-resources/pom.xml | 2 +-
build/dependency-resource-supplement/pom.xml | 2 +-
build/plugins/buildinfo-maven-plugin/pom.xml | 2 +-
build/plugins/marmotta-maven-plugin/pom.xml | 2 +-
build/plugins/pom.xml | 2 +-
build/plugins/refpack-maven-plugin/pom.xml | 2 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 2 +-
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 2 +-
extras/webjars/codemirror/pom.xml | 2 +-
extras/webjars/pom.xml | 2 +-
extras/webjars/sgvizler/pom.xml | 2 +-
extras/webjars/snorql/pom.xml | 2 +-
extras/webjars/strftime/pom.xml | 2 +-
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-splash/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 2 +-
libraries/kiwi/kiwi-sparql/pom.xml | 2 +-
libraries/kiwi/kiwi-transactions/pom.xml | 2 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 2 +-
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
libraries/kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-api/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-file/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-core/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-facebook/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-html/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-ldap/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdf/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdfa/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-vimeo/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-xml/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-youtube/pom.xml | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
libraries/ldpath/ldpath-core/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
libraries/ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 6 +-----
platform/marmotta-core/pom.xml | 2 +-
platform/marmotta-ldcache/pom.xml | 2 +-
platform/marmotta-ldpath/pom.xml | 2 +-
platform/marmotta-reasoner/pom.xml | 2 +-
platform/marmotta-security/pom.xml | 2 +-
platform/marmotta-sparql/pom.xml | 2 +-
platform/marmotta-user/pom.xml | 2 +-
platform/marmotta-versioning/pom.xml | 2 +-
platform/pom.xml | 2 +-
pom.xml | 4 ++--
88 files changed, 89 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index 8cc13ff..f0fd540 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index bfb2aba..b7a424c 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index dea4e2a..8e0a159 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>archetypes-reactor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index 0ef41ed..b3a6a3a 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index 92d77a4..c8f01c2 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index e363329..7b37981 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index fc86edf..ccbf2c7 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<artifactId>plugins-reactor</artifactId>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index 3a11349..9b81934 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 0ab97f5..097efe3 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<artifactId>plugins-reactor</artifactId>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index c1982b4..95fafb3 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>plugins-reactor</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>23</version> <relativePath /> -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index a3bd4de..58d17db 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index 07ef981..fb27410 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index f636502..ff5a67c 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 0eac626..3959563 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index a84fbaf..4e7e229 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 06ba1eb..7104ebe 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index 36be4ae..d228916 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index 9dfd8a5..b490c5a 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index 475ae41..ccde248 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index 8ec3e73..9115052 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 0f4a8d8..619db50 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index 25de2c0..b7a194e 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 0be1aef..281e334 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index 1605757..004f5bd 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/extras/webjars/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml
index 2450243..98034fc 100644
--- a/extras/webjars/pom.xml
+++ b/extras/webjars/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index a611271..30ad9f1 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index 0f8831e..bb286d5 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index 6f337ab..bbf66df 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 5db3648..d2e7902 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index aea7c89..edcd041 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 60d6f86..fb30987 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 8aa8a8d..95fa064 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index c4bcf84..b28547d 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index e76b396..5785642 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index 3ddd37d..f824894 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index 07d3b2d..41fc742 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index ac82859..b8e880a 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index 2c8a49d..c0b297c 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>kiwi-tripletable</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index 81c2a4c..ebed513 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 665f70d..f219e8b 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index 13dbd08..be4cb03 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index 0df8bea..e3270ac 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldcache/ldcache-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml
index 881b2bf..7a6cd94 100644
--- a/libraries/ldcache/ldcache-backend-file/pom.xml
+++ b/libraries/ldcache/ldcache-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldcache/ldcache-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
index 1fab347..f638d16 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldcache/ldcache-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml
index 6b2c713..7499cc7 100644
--- a/libraries/ldcache/ldcache-core/pom.xml
+++ b/libraries/ldcache/ldcache-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldcache/ldcache-sail-generic/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/pom.xml b/libraries/ldcache/ldcache-sail-generic/pom.xml
index 8ed617e..b43d08c 100644
--- a/libraries/ldcache/ldcache-sail-generic/pom.xml
+++ b/libraries/ldcache/ldcache-sail-generic/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldcache/ldcache-sail-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/pom.xml b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
index 8c755ea..428fe07 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml
index 26dee79..d8de48e 100644
--- a/libraries/ldcache/pom.xml
+++ b/libraries/ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 6873d92..250f7fd 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index de02401..93e5f65 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index e1526d5..17f40b5 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-provider-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml
index 8b4a77d..a78e4d5 100644
--- a/libraries/ldclient/ldclient-provider-html/pom.xml
+++ b/libraries/ldclient/ldclient-provider-html/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-provider-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml
index 539209e..6d0b934 100644
--- a/libraries/ldclient/ldclient-provider-ldap/pom.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
index c2d2d9f..08e8437 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index 6719feb..9a09b52 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index fd75822..5b6df79 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-provider-rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdfa/pom.xml b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
index 8dcd4b3..247df46 100644
--- a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index d1e38fa..f2fc4d7 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-provider-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml
index 12ebc32..5d8deae 100644
--- a/libraries/ldclient/ldclient-provider-xml/pom.xml
+++ b/libraries/ldclient/ldclient-provider-xml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index 43ebc06..1a79aa4 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldclient/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml
index 084786b..e0e2a21 100644
--- a/libraries/ldclient/pom.xml
+++ b/libraries/ldclient/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index d97b08f..f1eff45 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index 236ff61..a5d5c02 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index 6338891..24e946f 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 5be1f7e..978d1af 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index da8f536..ac9b6b9 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index 95dd222..b68926d 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index ac7553a..150c0da 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index 62e6fe7..cecc3cc 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index dc031ad..83a77ed 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index 333fbcc..a7c844c 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 42823a3..39cca2b 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index 57a840d..22d1c42 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index d2a227d..d317f1f 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index a2f5a15..b5a6723 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 42eaaa3..2981dce 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/libraries/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 9c1079c..8c2f6cf 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 84f3600..2bfcc52 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<packaging>pom</packaging>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<name>Apache Marmotta Parent</name>
<description>Parent POM for the Apache Marmotta project</description>
@@ -1585,8 +1585,4 @@
<tag>3.0.0-incubating</tag>
</scm>
-->
-
- <scm>
- <tag>3.1.0-incubating</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index f27b855..a3c5ca4 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index 2fac3fb..b9c52e9 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index 9178ee7..abb6788 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index 0b0cee3..a58c1ee 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 3e6f337..5b47e3c 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index fbe950b..37189dd 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index c8279ec..23b1870 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index 35a0868..77590aa 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index 3713bab..6f1264b 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f3143213/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee0fec8..ae48672 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
@@ -124,7 +124,7 @@
<url>https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</url>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</developerConnection>
- <tag>3.1.0-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
[30/50] [abbrv] fix licenses and configuration of RAT plugin
Posted by ss...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/helper/DBConnectionChecker.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/helper/DBConnectionChecker.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/helper/DBConnectionChecker.java
index 49eae30..bce19b6 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/helper/DBConnectionChecker.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/helper/DBConnectionChecker.java
@@ -1,13 +1,12 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest1.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest1.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest1.java
index 310c6ec..cee043e 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest1.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest1.java
@@ -1,13 +1,12 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest2.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest2.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest2.java
index cd23616..d903698 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest2.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest2.java
@@ -1,13 +1,12 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/KiWiDatabaseRunner.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/KiWiDatabaseRunner.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/KiWiDatabaseRunner.java
index 3eecff2..170fdba 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/KiWiDatabaseRunner.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/KiWiDatabaseRunner.java
@@ -1,13 +1,12 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
index 487bfde..7815127 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
@@ -1,13 +1,12 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiSailConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiSailConcurrencyTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiSailConcurrencyTest.java
index 20b4dd4..c5661c7 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiSailConcurrencyTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiSailConcurrencyTest.java
@@ -1,13 +1,12 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiSailInterruptTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiSailInterruptTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiSailInterruptTest.java
index 176d375..710f128 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiSailInterruptTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiSailInterruptTest.java
@@ -1,13 +1,12 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiStoreTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiStoreTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiStoreTest.java
index d73e7f2..081dae4 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiStoreTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiStoreTest.java
@@ -1,13 +1,12 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryConnectionTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryConnectionTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryConnectionTest.java
index c969c91..f71f964 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryConnectionTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryConnectionTest.java
@@ -1,13 +1,12 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
index f9a776b..7291859 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.kiwi.test.sesame.repository;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-tripletable/src/test/java/org/apache/marmotta/kiwi/model/caching/TripleTableTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/src/test/java/org/apache/marmotta/kiwi/model/caching/TripleTableTest.java b/libraries/kiwi/kiwi-tripletable/src/test/java/org/apache/marmotta/kiwi/model/caching/TripleTableTest.java
index 63e9344..98858bc 100644
--- a/libraries/kiwi/kiwi-tripletable/src/test/java/org/apache/marmotta/kiwi/model/caching/TripleTableTest.java
+++ b/libraries/kiwi/kiwi-tripletable/src/test/java/org/apache/marmotta/kiwi/model/caching/TripleTableTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.model.caching;
import org.apache.commons.lang3.RandomStringUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_ldcache_001_002.sql
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_ldcache_001_002.sql b/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_ldcache_001_002.sql
index 5a51ec9..d9b9966 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_ldcache_001_002.sql
+++ b/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_ldcache_001_002.sql
@@ -1,3 +1,18 @@
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You 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.
+
ALTER TABLE ldcache_entries ADD COLUMN triple_count int NOT NULL DEFAULT 0;
UPDATE
ldcache_entries
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/upgrade_ldcache_001_002.sql
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/upgrade_ldcache_001_002.sql b/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/upgrade_ldcache_001_002.sql
index 5a51ec9..d9b9966 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/upgrade_ldcache_001_002.sql
+++ b/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/upgrade_ldcache_001_002.sql
@@ -1,3 +1,18 @@
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You 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.
+
ALTER TABLE ldcache_entries ADD COLUMN triple_count int NOT NULL DEFAULT 0;
UPDATE
ldcache_entries
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/upgrade_ldcache_001_002.sql
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/upgrade_ldcache_001_002.sql b/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/upgrade_ldcache_001_002.sql
index 5a51ec9..d9b9966 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/upgrade_ldcache_001_002.sql
+++ b/libraries/ldcache/ldcache-backend-kiwi/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/upgrade_ldcache_001_002.sql
@@ -1,3 +1,18 @@
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You 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.
+
ALTER TABLE ldcache_entries ADD COLUMN triple_count int NOT NULL DEFAULT 0;
UPDATE
ldcache_entries
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java b/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java
index 4afda47..b341a27 100644
--- a/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java
+++ b/libraries/ldpath/ldpath-backend-sesame/src/main/java/org/apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.ldpath.backend.sesame;
import java.math.BigDecimal;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/EmptyTestingBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/EmptyTestingBackend.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/EmptyTestingBackend.java
index 65329f0..cf02c4c 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/EmptyTestingBackend.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/EmptyTestingBackend.java
@@ -1,13 +1,12 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
index d7b401a..6a7734d 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
@@ -1,13 +1,12 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
index ff7e6d1..0f74279 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.ldpath.parser;
import static org.junit.Assert.assertThat;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/SelectorsTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/SelectorsTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/SelectorsTest.java
index 4ac44b5..f2a0327 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/SelectorsTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/SelectorsTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.ldpath.parser;
import java.io.StringReader;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/StringTestingBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/StringTestingBackend.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/StringTestingBackend.java
index 47a1032..2af51ad 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/StringTestingBackend.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/StringTestingBackend.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.ldpath.parser;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/TestsTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/TestsTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/TestsTest.java
index 1b2ce9d..92f820e 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/TestsTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/TestsTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.ldpath.parser;
import java.io.StringReader;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6f6f8bb..bc0377d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -427,8 +427,8 @@
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<excludes>
- <!-- everything in extras is contributed 3rd party -->
- <exclude>**/extras/**</exclude>
+ <!-- 3rd party libraries -->
+ <exclude>extras/**</exclude>
<!-- auto-generated files -->
<exclude>**/*.txt</exclude>
@@ -442,6 +442,7 @@
<exclude>.git/**</exclude>
<exclude>.idea/**</exclude>
<exclude>.eclipse/**</exclude>
+ <exclude>**/*.ids</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/*.ipr</exclude>
<exclude>**/*.iws</exclude>
@@ -451,20 +452,10 @@
<!-- known 3rd-party source code -->
- <exclude>**/jquery*.js</exclude>
- <exclude>**/jquery*.css</exclude>
- <exclude>**/foundation.js</exclude>
- <exclude>**/strftime.js</exclude>
- <exclude>**/customforms.js</exclude>
- <exclude>**/pageguide.js</exclude>
- <exclude>**/raphael-dracula.pack.min.js</exclude>
- <exclude>**/dygraph/**</exclude>
- <exclude>**/sgvizler/**</exclude>
- <exclude>**/js/lib/**</exclude>
<exclude>**/src/ext/**</exclude>
<exclude>**/src/main/resources/task-dialog*.properties</exclude>
- <exclude>**/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/**</exclude>
<exclude>**/src/test/resources/org/apache/marmotta/commons/sesame/rio/vcard/*.vcf</exclude>
+ <exclude>platform/marmotta-sparql/src/main/resources/web/admin/sgvizler.html</exclude>
<!-- META-INF files don't take a license header -->
<exclude>**/META-INF/**</exclude>
@@ -472,7 +463,6 @@
<!-- some parsers don't support comments, they are covered by the general LICENSE.txt
similar to binaries -->
<exclude>**/src/test/resources/org/apache/marmotta/commons/sesame/rio/ical/*.ics</exclude>
- <exclude>**/src/test/resources/org/apache/marmotta/commons/sesame/rio/rdfjson/*.json</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItemType.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItemType.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItemType.java
index 524db52..1c93f7b 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItemType.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItemType.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.platform.core.model.template;
/**
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java
index 341a688..0b6e93b 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/jaxrs/ExceptionMapperServiceImpl.java
@@ -1,8 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.platform.core.services.jaxrs;
-import org.apache.marmotta.platform.core.api.content.ContentReader;
import org.apache.marmotta.platform.core.api.jaxrs.ExceptionMapperService;
-import org.apache.marmotta.platform.core.events.ConfigurationServiceInitEvent;
import org.apache.marmotta.platform.core.events.SystemStartupEvent;
import org.apache.marmotta.platform.core.jaxrs.CDIExceptionMapper;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/model/filter/LDCacheIgnoreFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/model/filter/LDCacheIgnoreFilter.java b/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/model/filter/LDCacheIgnoreFilter.java
index 045017e..9e3614f 100644
--- a/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/model/filter/LDCacheIgnoreFilter.java
+++ b/platform/marmotta-ldcache/src/main/java/org/apache/marmotta/platform/ldcache/model/filter/LDCacheIgnoreFilter.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.platform.ldcache.model.filter;
import org.apache.marmotta.commons.sesame.filter.resource.ResourceFilter;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 3808063..2e7a6d3 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -156,6 +156,19 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <!-- these are "extras", so they come from 3rd parties, no RAT check! -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- known 3rd party -->
+ <exclude>src/main/resources/web/admin/sgvizler.html</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
[22/50] [abbrv] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Posted by ss...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/4acdca54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/4acdca54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/4acdca54
Branch: refs/heads/master
Commit: 4acdca546e5a13393848d90657cbe2dc9185c625
Parents: 40ce6eb a2de373
Author: tkurz <tk...@apache.org>
Authored: Thu Sep 12 14:23:11 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Thu Sep 12 14:23:11 2013 +0200
----------------------------------------------------------------------
.../sesame/facading/impl/FacadingImpl.java | 3 ++
.../concurrent/ConcurrentFacadingTest.java | 1 +
.../webjars/snorql/src/main/resources/snorql.js | 7 +++-
.../evaluation/KiWiEvaluationStrategyImpl.java | 9 +++--
.../persistence/KiWiSparqlConnection.java | 25 ++++++++++--
.../sparql/sail/KiWiSparqlSailConnection.java | 2 +-
.../kiwi/persistence/KiWiConnection.java | 3 ++
.../kiwi/persistence/h2/statements.properties | 1 +
.../marmotta/kiwi/test/RepositoryTest.java | 42 ++++++++++++++++++++
.../kiwi/test/sesame/KiWiLocaleTest.java | 2 +-
.../services/sparql/SparqlServiceImpl.java | 2 +-
.../sparql/webservices/SparqlWebService.java | 2 +-
.../src/main/resources/web/admin/snorql.html | 1 -
.../src/main/resources/web/admin/update.html | 1 -
14 files changed, 86 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[26/50] [abbrv] git commit: implemented tests for Linked Data access
(fixes MARMOTTA-28)
Posted by ss...@apache.org.
implemented tests for Linked Data access (fixes MARMOTTA-28)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/ec26977c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/ec26977c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/ec26977c
Branch: refs/heads/master
Commit: ec26977c9faf8732f1fcaff964c02b383f800bf8
Parents: c262fbc
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Sep 13 10:19:54 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Sep 13 10:19:54 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 +-
.../platform/core/test/ld/LinkedDataTest.java | 139 +++++++++++++++++--
2 files changed, 130 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec26977c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b88d5fe..6f6f8bb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1171,12 +1171,12 @@
<dependency>
<groupId>org.semarglproject</groupId>
<artifactId>semargl-rdfa</artifactId>
- <version>0.4</version>
+ <version>0.6</version>
</dependency>
<dependency>
<groupId>org.semarglproject</groupId>
<artifactId>semargl-sesame</artifactId>
- <version>0.4</version>
+ <version>0.6</version>
</dependency>
<!-- KiWi Triple Store -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec26977c/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
index 85cbed9..b48d747 100644
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
@@ -17,22 +17,17 @@
package org.apache.marmotta.platform.core.test.ld;
-import com.google.common.collect.Sets;
import com.jayway.restassured.RestAssured;
import org.apache.commons.io.IOUtils;
-import org.apache.marmotta.commons.sesame.model.Namespaces;
-import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.marmotta.platform.core.api.triplestore.ContextService;
import org.apache.marmotta.platform.core.api.triplestore.SesameService;
import org.apache.marmotta.platform.core.test.base.JettyMarmotta;
-import org.apache.marmotta.platform.core.webservices.config.ConfigurationWebService;
import org.apache.marmotta.platform.core.webservices.resource.ContentWebService;
import org.apache.marmotta.platform.core.webservices.resource.MetaWebService;
import org.apache.marmotta.platform.core.webservices.resource.ResourceWebService;
import org.codehaus.jackson.map.ObjectMapper;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
import org.openrdf.model.Statement;
import org.openrdf.model.URI;
import org.openrdf.repository.Repository;
@@ -42,10 +37,13 @@ import org.openrdf.repository.RepositoryResult;
import org.openrdf.repository.sail.SailRepository;
import org.openrdf.rio.RDFFormat;
import org.openrdf.rio.RDFParseException;
+import org.openrdf.rio.Rio;
import org.openrdf.sail.memory.MemoryStore;
import java.io.IOException;
import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Random;
import static com.jayway.restassured.RestAssured.expect;
import static com.jayway.restassured.RestAssured.form;
@@ -60,14 +58,18 @@ public class LinkedDataTest {
private static JettyMarmotta marmotta;
private static SesameService sesameService;
+ private static ContextService contextService;
private static ObjectMapper mapper = new ObjectMapper();
+ private static Random rnd = new Random();
+
@BeforeClass
public static void setUp() throws RepositoryException, IOException, RDFParseException {
marmotta = new JettyMarmotta("/marmotta", ResourceWebService.class, MetaWebService.class, ContentWebService.class);
sesameService = marmotta.getService(SesameService.class);
+ contextService = marmotta.getService(ContextService.class);
RestAssured.baseURI = "http://localhost";
RestAssured.port = marmotta.getPort();
@@ -109,7 +111,7 @@ public class LinkedDataTest {
}
/**
- * Test if we can retrieve Linked Data resources as RDF/XML.
+ * Test if we can retrieve Linked Data resources as Turtle
*
* @throws Exception
*/
@@ -118,6 +120,17 @@ public class LinkedDataTest {
testGetBase(RDFFormat.TURTLE);
}
+ /**
+ * Test if we can retrieve Linked Data resources as Turtle
+ *
+ * @throws Exception
+ */
+ @Ignore("JSON-LD Parser currently does not parse the result properly")
+ @Test
+ public void testGetJSONLD() throws Exception {
+ testGetBase(RDFFormat.JSONLD);
+ }
+
private void testGetBase(RDFFormat format) throws Exception {
String data = given().header("Accept",format.getDefaultMIMEType()).expect().statusCode(200).when().get(createResourceURI("sepp_huber").stringValue()).asString();
@@ -136,7 +149,8 @@ public class LinkedDataTest {
RepositoryResult<Statement> statements = icon.getStatements(createResourceURI("sepp_huber"), null,null,true);
while(statements.hasNext()) {
- Assert.assertTrue(con.hasStatement(statements.next(),true));
+ Statement stmt = statements.next();
+ Assert.assertTrue("statement "+stmt+" not found in results",con.hasStatement(stmt,true));
}
con.commit();
@@ -148,7 +162,106 @@ public class LinkedDataTest {
String invalid = given().header("Accept",format.getDefaultMIMEType()).expect().statusCode(404).when().get(createResourceURI("xyz").stringValue()).asString();
- System.err.println(invalid);
+ }
+
+
+ /**
+ * Test if we can write Linked Data resources as RDF/XML.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testPostRDFXML() throws Exception {
+ testPostPutDeleteBase(RDFFormat.RDFXML);
+ }
+
+ /**
+ * Test if we can write Linked Data resources as Turtle
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testPostTurtle() throws Exception {
+ testPostPutDeleteBase(RDFFormat.TURTLE);
+ }
+
+ /**
+ * Test if we can write Linked Data resources as JSON-LD
+ *
+ * @throws Exception
+ */
+ @Ignore("JSON-LD Parser currently does not parse the result properly")
+ @Test
+ public void testPostJSONLD() throws Exception {
+ testPostPutDeleteBase(RDFFormat.JSONLD);
+ }
+
+
+ private void testPostPutDeleteBase(RDFFormat format) throws Exception {
+ URI resource1 = randomResource();
+
+ // create resource 1 with empty body and expect that we can afterwards retrieve it (even if empty triples)
+ expect().statusCode(201).when().post(resource1.stringValue());
+ // TODO: at the moment we will return 404 because we have no way to check for existance of a resource without triples
+ given().header("Accept",format.getDefaultMIMEType()).expect().statusCode(404).when().get(resource1.stringValue());
+
+
+ // create resource 2 with some triples that we generate randomly in a temporary repository
+ Repository mem = new SailRepository(new MemoryStore());
+ mem.initialize();
+
+ RepositoryConnection con = mem.getConnection();
+ RepositoryConnection mcon = sesameService.getConnection();
+ try {
+ for(int i=0; i < rnd.nextInt(20); i++ ) {
+ con.add(resource1, randomResource(), randomResource(), contextService.getDefaultContext());
+ }
+
+
+ // send the post to the resource with the triples serialized in the given format
+ StringWriter data = new StringWriter();
+ con.export(Rio.createWriter(format,data));
+ String body = data.toString();
+
+ given()
+ .header("Content-Type", format.getDefaultMIMEType())
+ .body(body)
+ .expect()
+ .statusCode(200)
+ .when()
+ .put(resource1.stringValue());
+
+
+
+
+ // now check in the Marmotta triple store if all triples are there
+ RepositoryResult<Statement> statements = con.getStatements(resource1,null,null,true);
+ while(statements.hasNext()) {
+ Statement stmt = statements.next();
+ Assert.assertTrue("statement "+stmt+" not found in triple store",mcon.hasStatement(stmt,true));
+ }
+
+
+ con.commit();
+ mcon.commit();
+ } finally {
+ con.close();
+ mcon.close();
+ }
+
+ given().header("Accept",format.getDefaultMIMEType()).expect().statusCode(200).when().get(resource1.stringValue());
+
+
+ // test if we can delete the resource and then it is no longer there
+ expect().statusCode(200).when().delete(resource1.stringValue());
+ given().header("Accept",format.getDefaultMIMEType()).expect().statusCode(404).when().get(resource1.stringValue());
+
+ RepositoryConnection mcon2 = sesameService.getConnection();
+ try {
+ Assert.assertFalse("resource was not properly deleted", mcon2.hasStatement(resource1,null,null,true));
+ } finally {
+ mcon2.close();
+ }
}
@@ -160,4 +273,8 @@ public class LinkedDataTest {
return sesameService.getRepository().getValueFactory().createURI(id);
}
+ private static URI randomResource() {
+ return sesameService.getRepository().getValueFactory().createURI(RestAssured.baseURI + ":" + RestAssured.port + RestAssured.basePath + "/resource/" + RandomStringUtils.randomAlphanumeric(8));
+ }
+
}
[19/50] [abbrv] git commit: change status code of SPARQL timeout to
504 to prevent Firefox from retrying the request immediately (MARMOTTA-280);
patched SNORQL so it displays a nicer error message in case the SPARQL query
fails
Posted by ss...@apache.org.
change status code of SPARQL timeout to 504 to prevent Firefox from retrying the request immediately (MARMOTTA-280); patched SNORQL so it displays a nicer error message in case the SPARQL query fails
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/647cbaed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/647cbaed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/647cbaed
Branch: refs/heads/master
Commit: 647cbaed0f84a76ac031b561c2f6753f266c2cd9
Parents: 49ddd16
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Wed Sep 11 17:56:02 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Wed Sep 11 17:56:02 2013 +0200
----------------------------------------------------------------------
extras/webjars/snorql/src/main/resources/snorql.js | 7 ++++++-
.../platform/sparql/webservices/SparqlWebService.java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/647cbaed/extras/webjars/snorql/src/main/resources/snorql.js
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/src/main/resources/snorql.js b/extras/webjars/snorql/src/main/resources/snorql.js
index 620fa1e..b1346de 100755
--- a/extras/webjars/snorql/src/main/resources/snorql.js
+++ b/extras/webjars/snorql/src/main/resources/snorql.js
@@ -289,7 +289,12 @@ function Snorql() {
this.displayErrorMessage = function(message) {
var pre = document.createElement('pre');
- pre.innerHTML = message;
+ var json = JSON.parse(message);
+ if(json.message) {
+ pre.innerHTML = '<strong style="color: #ff0000">' + json.message; + "</strong>";
+ } else {
+ pre.innerHTML = message;
+ }
this._display(pre, 'result');
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/647cbaed/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
index 107db27..a611cf9 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/webservices/SparqlWebService.java
@@ -493,7 +493,7 @@ public class SparqlWebService {
} catch (MalformedQueryException e) {
throw new WebApplicationException(e.getCause(), Response.status(Response.Status.BAD_REQUEST).entity(WebServiceUtil.jsonErrorResponse(e)).build());
} catch (TimeoutException e) {
- throw new WebApplicationException(e.getCause(), Response.status(Response.Status.REQUEST_TIMEOUT).entity(WebServiceUtil.jsonErrorResponse(e)).build());
+ throw new WebApplicationException(e.getCause(), Response.status(Response.Status.GATEWAY_TIMEOUT).entity(WebServiceUtil.jsonErrorResponse(e)).build());
}
}
};
[28/50] [abbrv] git commit: better shutdown handling for reasoner
thread (fixes MARMOTTA-307)
Posted by ss...@apache.org.
better shutdown handling for reasoner thread (fixes MARMOTTA-307)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/6e97cc08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/6e97cc08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/6e97cc08
Branch: refs/heads/master
Commit: 6e97cc082354952466325b4efda949674ef6f2ec
Parents: c7563c0
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Sep 13 12:36:31 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Sep 13 12:36:31 2013 +0200
----------------------------------------------------------------------
.../marmotta/kiwi/reasoner/engine/ReasoningEngine.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6e97cc08/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
index 47891c6..1b189d8 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
@@ -905,7 +905,7 @@ public class ReasoningEngine implements TransactionListener {
if(force) {
log.warn("forced shutdown of reasoning service initiated, state will be inconsistent ...");
- reasonerThread.shutdown();
+ reasonerThread.shutdown(true);
for(int i = 0; i<3 && isRunning(); i++) {
log.warn("reasoner not yet finished, waiting for 1 seconds (try={})", i+1);
@@ -929,7 +929,7 @@ public class ReasoningEngine implements TransactionListener {
}
}
- reasonerThread.shutdown();
+ reasonerThread.shutdown(false);
}
isshutdown = true;
@@ -957,6 +957,7 @@ public class ReasoningEngine implements TransactionListener {
private class SKWRLReasoner extends Thread {
private boolean shutdown = false;
private boolean running = false;
+ private boolean forceshutdown = false;
private SKWRLReasoner() {
super("SKWRL Reasoner " + ++indexerCounter);
@@ -964,9 +965,10 @@ public class ReasoningEngine implements TransactionListener {
start();
}
- public void shutdown() {
+ public void shutdown(boolean force) {
log.info("REASONER: signalling shutdown to reasoner thread");
shutdown = true;
+ forceshutdown = force;
this.interrupt();
}
@@ -980,7 +982,7 @@ public class ReasoningEngine implements TransactionListener {
startTask(getName(), TASK_GROUP);
- while (!shutdown || reasoningQueue.size() > 0) {
+ while (!forceshutdown && (!shutdown || reasoningQueue.size() > 0)) {
running = false;
try {
updateTaskStatus("idle");
@@ -993,10 +995,13 @@ public class ReasoningEngine implements TransactionListener {
executeReasoner(data);
} catch (InterruptedException ex) {
+ } catch (RuntimeException ex) {
+ // can happen on forced shutdown
} catch (Exception ex) {
log.warn("reasoning task threw an exception",ex);
}
}
+ running = false;
try {
endTask();
} catch (Exception ex) {
[13/50] [abbrv] git commit: configuration service mapped list to
strings, which was a bug. commit fixes MARMOTTA-231
Posted by ss...@apache.org.
configuration service mapped list to strings, which was a bug. commit fixes MARMOTTA-231
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/6d60b047
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/6d60b047
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/6d60b047
Branch: refs/heads/master
Commit: 6d60b0476f5523ed0d002bd2a65a9acb2a10ff5d
Parents: 213495c
Author: tkurz <tk...@apache.org>
Authored: Wed Sep 11 14:38:58 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Wed Sep 11 14:38:58 2013 +0200
----------------------------------------------------------------------
.../js/widgets/configurator/configurator.coffee | 15 +++++++++++++--
.../webservices/config/ConfigurationWebService.java | 2 +-
2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6d60b047/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee b/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
index a8e8a51..b2ec849 100644
--- a/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
+++ b/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
@@ -544,10 +544,21 @@ class Client
str = "{"
for value,index in data
- str += '"'+value.key + '":"'+value.getValue() + '"'
+ v = '"'+value.getValue()+'"'
+ if (value.getValue().split(",").length > 1)
+ x = value.getValue().split(",")
+ v = "["
+ for val,i in x
+ v += '"'+val+'"'
+ if i < x.length-1
+ v += ','
+
+ v += "]"
+
+ str += '"'+value.key + '":'+v
str += "," if index < data.length-1
str += "}"
-
+ console.log str
$.ajax data =
type : 'POST'
contentType: "application/json"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6d60b047/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
index 464132e..1da3836 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
@@ -121,7 +121,7 @@ public class ConfigurationWebService {
ObjectMapper mapper = new ObjectMapper();
try {
//log.info(getContentData(request.getReader()));
- Map<String,String> values = mapper.readValue(request.getInputStream(), new TypeReference<HashMap<String,String>>(){});
+ Map<String,Object> values = mapper.readValue(request.getInputStream(), new TypeReference<HashMap<String,Object>>(){});
configurationService.setConfigurations(values);
} catch (IOException e) {
return Response.serverError().build();
[09/50] [abbrv] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Posted by ss...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/09f96df9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/09f96df9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/09f96df9
Branch: refs/heads/master
Commit: 09f96df997dad836a36b986297a7fbdcd7b50469
Parents: d467cec 1a3a45c
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Sep 10 14:44:25 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Sep 10 14:44:25 2013 +0200
----------------------------------------------------------------------
.../sesame/repository/ResourceUtils.java | 28 ++++---
.../sesame/facading/impl/FacadingImpl.java | 12 ++-
.../concurrent/ConcurrentFacadingTest.java | 5 +-
.../kiwi/persistence/KiWiConnection.java | 4 +-
.../ldpath/api/functions/NodeFunction.java | 2 +-
.../marmotta/ldpath/api/tests/NodeTest.java | 1 +
.../api/transformers/NodeTransformer.java | 5 +-
.../ldpath/backend/file/ParserTest.java | 6 +-
.../java/org/apache/marmotta/ldpath/LDPath.java | 12 +--
.../ldpath/model/fields/FieldMapping.java | 23 ++++--
.../model/functions/ConcatenateFunction.java | 3 +-
.../ldpath/model/functions/CountFunction.java | 3 +-
.../ldpath/model/functions/FirstFunction.java | 5 +-
.../ldpath/model/functions/LastFunction.java | 5 +-
.../ldpath/model/functions/SortFunction.java | 3 +-
.../marmotta/ldpath/model/programs/Program.java | 53 +++++++++-----
.../ldpath/model/tests/LiteralTypeTest.java | 15 +++-
.../tests/functions/BinaryNumericTest.java | 1 +
.../marmotta/ldpath/util/Collections.java | 3 +
.../at/newmedialab/ldpath/parser/rdfpath.jj | 77 +++++++++++---------
.../BinaryNumericTestFunctionsTest.java | 4 +-
.../ldpath/model/functions/FunctionsTest.java | 16 ++--
.../marmotta/ldpath/parser/ParserTest.java | 10 +--
.../marmotta/ldpath/parser/ProgramTest.java | 61 ++++++++++++++++
.../marmotta/ldpath/parser/SelectorsTest.java | 2 +-
.../marmotta/ldpath/parser/TestsTest.java | 2 +-
.../marmotta/ldpath/test/AbstractTestBase.java | 14 ++--
.../ldpath-core/src/test/resources/logback.xml | 2 +
.../src/test/resources/parse/program.ldpath | 20 +++--
.../model/functions/date/DateFunctionsTest.java | 6 +-
.../model/functions/html/HtmlFunctionsTest.java | 8 +-
.../model/functions/math/MathFunctionTest.java | 30 ++++----
.../tests/functions/text/StringTestTest.java | 4 +-
.../xml/RemoveXmlTagsFunctionTest.java | 4 +-
.../model/functions/xml/XPathFunctionTest.java | 4 +-
.../resource/InspectionWebService.java | 2 +-
.../resources/web/public/html/reasoning.html | 2 +-
37 files changed, 295 insertions(+), 162 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09f96df9/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
[42/50] [abbrv] git commit: [maven-release-plugin] prepare release
3.1.0-incubating
Posted by ss...@apache.org.
[maven-release-plugin] prepare release 3.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/a0fe8a7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/a0fe8a7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/a0fe8a7b
Branch: refs/heads/master
Commit: a0fe8a7b082d9cb4e9a224d901f927fa26e817eb
Parents: 27ee092
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 24 10:57:03 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 24 10:57:03 2013 +0200
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 2 +-
build/archetypes/marmotta-archetype-webapp/pom.xml | 2 +-
build/archetypes/pom.xml | 2 +-
build/checkstyle-resources/pom.xml | 2 +-
build/dependency-resource-supplement/pom.xml | 2 +-
build/plugins/buildinfo-maven-plugin/pom.xml | 2 +-
build/plugins/marmotta-maven-plugin/pom.xml | 2 +-
build/plugins/pom.xml | 2 +-
build/plugins/refpack-maven-plugin/pom.xml | 2 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 2 +-
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 2 +-
extras/webjars/codemirror/pom.xml | 2 +-
extras/webjars/pom.xml | 2 +-
extras/webjars/sgvizler/pom.xml | 2 +-
extras/webjars/snorql/pom.xml | 2 +-
extras/webjars/strftime/pom.xml | 2 +-
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-splash/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 2 +-
libraries/kiwi/kiwi-sparql/pom.xml | 2 +-
libraries/kiwi/kiwi-transactions/pom.xml | 2 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 2 +-
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
libraries/kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-api/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-file/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-core/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-facebook/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-html/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-ldap/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdf/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdfa/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-vimeo/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-xml/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-youtube/pom.xml | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
libraries/ldpath/ldpath-core/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
libraries/ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 6 +++++-
platform/marmotta-core/pom.xml | 2 +-
platform/marmotta-ldcache/pom.xml | 2 +-
platform/marmotta-ldpath/pom.xml | 2 +-
platform/marmotta-reasoner/pom.xml | 2 +-
platform/marmotta-security/pom.xml | 2 +-
platform/marmotta-sparql/pom.xml | 2 +-
platform/marmotta-user/pom.xml | 2 +-
platform/marmotta-versioning/pom.xml | 2 +-
platform/pom.xml | 2 +-
pom.xml | 4 ++--
88 files changed, 93 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index 15ab89d..8cc13ff 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index dde1896..bfb2aba 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index bb1c01b..dea4e2a 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>archetypes-reactor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index 2a55e83..0ef41ed 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index d9eb75a..92d77a4 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index df5c3aa..e363329 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index 5126b17..fc86edf 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
<artifactId>plugins-reactor</artifactId>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index d25196d..3a11349 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 4f129c1..0ab97f5 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<artifactId>plugins-reactor</artifactId>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index 3da02ac..c1982b4 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>plugins-reactor</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
<!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>23</version> <relativePath /> -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index b6b8359..a3bd4de 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index b79125f..07ef981 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index 2213ba3..f636502 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index f63e640..0eac626 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index a672ec2..a84fbaf 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 182338c..06ba1eb 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index 1e318d5..36be4ae 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index c7d7532..9dfd8a5 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index 18c3eee..475ae41 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index 3414eed..8ec3e73 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 5dd8f40..0f4a8d8 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index 6d88340..25de2c0 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 393b2de..0be1aef 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index 1a8e2dd..1605757 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/extras/webjars/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml
index 927b81b..2450243 100644
--- a/extras/webjars/pom.xml
+++ b/extras/webjars/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index 8a7a862..a611271 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index 832e8aa..0f8831e 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index 79f8730..6f337ab 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 11b8ec7..5db3648 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index 0d8d859..aea7c89 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 444f55f..60d6f86 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 01fc15b..8aa8a8d 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index ce9fda9..c4bcf84 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index cdc67aa..e76b396 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index 9187873..3ddd37d 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index c76886e..07d3b2d 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index 493383a..ac82859 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index 9f98878..2c8a49d 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
</parent>
<artifactId>kiwi-tripletable</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index 7a3dc74..81c2a4c 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 323b311..665f70d 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index 5cc7128..13dbd08 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index f4db276..0df8bea 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldcache/ldcache-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml
index b613fb8..881b2bf 100644
--- a/libraries/ldcache/ldcache-backend-file/pom.xml
+++ b/libraries/ldcache/ldcache-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
index a67f0a5..1fab347 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldcache/ldcache-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml
index f406705..6b2c713 100644
--- a/libraries/ldcache/ldcache-core/pom.xml
+++ b/libraries/ldcache/ldcache-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldcache/ldcache-sail-generic/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/pom.xml b/libraries/ldcache/ldcache-sail-generic/pom.xml
index 6556e5b..8ed617e 100644
--- a/libraries/ldcache/ldcache-sail-generic/pom.xml
+++ b/libraries/ldcache/ldcache-sail-generic/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/pom.xml b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
index e05681f..8c755ea 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml
index b7d126d..26dee79 100644
--- a/libraries/ldcache/pom.xml
+++ b/libraries/ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 22eb397..6873d92 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index 17dd713..de02401 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index 7b044f3..e1526d5 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-provider-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml
index efa9821..8b4a77d 100644
--- a/libraries/ldclient/ldclient-provider-html/pom.xml
+++ b/libraries/ldclient/ldclient-provider-html/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-provider-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml
index 4736c8f..539209e 100644
--- a/libraries/ldclient/ldclient-provider-ldap/pom.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
index a97c354..c2d2d9f 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index c67862f..6719feb 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index ab3355a..fd75822 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdfa/pom.xml b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
index eb1e264..8dcd4b3 100644
--- a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index 541bd79..d1e38fa 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-provider-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml
index 0ff9206..12ebc32 100644
--- a/libraries/ldclient/ldclient-provider-xml/pom.xml
+++ b/libraries/ldclient/ldclient-provider-xml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index 062ce27..43ebc06 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldclient/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml
index a35912e..084786b 100644
--- a/libraries/ldclient/pom.xml
+++ b/libraries/ldclient/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index faacf31..d97b08f 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index a8ebdae..236ff61 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index 30028ce..6338891 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 030d560..5be1f7e 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index b500bc4..da8f536 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index 70738f8..95dd222 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index b2f6704..ac7553a 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index dea27be..62e6fe7 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index d49d490..dc031ad 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index ae8abfa..333fbcc 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 0e9612e..42823a3 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index 0ce6361..57a840d 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index 818b73e..d2a227d 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index a4c680a..a2f5a15 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 99568d2..42eaaa3 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/libraries/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/pom.xml b/libraries/pom.xml
index a3dbffd..9c1079c 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fe6ea61..84f3600 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<packaging>pom</packaging>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<name>Apache Marmotta Parent</name>
<description>Parent POM for the Apache Marmotta project</description>
@@ -1585,4 +1585,8 @@
<tag>3.0.0-incubating</tag>
</scm>
-->
+
+ <scm>
+ <tag>3.1.0-incubating</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index 6ebaaf8..f27b855 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index b73049a..2fac3fb 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index 19a16a0..9178ee7 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index 861a38c..0b0cee3 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 183e65d..3e6f337 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 2e7a6d3..fbe950b 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index a6ac0fb..c8279ec 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index aa64a16..35a0868 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index 8c7a027..3713bab 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a0fe8a7b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aaa9f22..ee0fec8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>parent</relativePath>
</parent>
@@ -124,7 +124,7 @@
<url>https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</url>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>3.1.0-incubating</tag>
</scm>
<issueManagement>
[48/50] [abbrv] git commit: implemented a collection of different id
generators (MARMOTTA-324)
Posted by ss...@apache.org.
implemented a collection of different id generators (MARMOTTA-324)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/4b8b8680
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/4b8b8680
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/4b8b8680
Branch: refs/heads/master
Commit: 4b8b86802a9814f8cffbb03a5262b00f7a42f9a9
Parents: c576351
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Sep 30 18:12:32 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Sep 30 18:12:32 2013 +0200
----------------------------------------------------------------------
libraries/kiwi/kiwi-triplestore/pom.xml | 6 +
.../marmotta/kiwi/config/KiWiConfiguration.java | 40 ++---
.../generator/DatabaseSequenceIDGenerator.java | 75 ++++++++
.../marmotta/kiwi/generator/IDGenerator.java | 61 +++++++
.../kiwi/generator/IDGeneratorType.java | 54 ++++++
.../generator/MemorySequenceIDGenerator.java | 178 +++++++++++++++++++
.../kiwi/generator/SnowflakeIDGenerator.java | 178 +++++++++++++++++++
.../kiwi/generator/UUIDRandomIDGenerator.java | 82 +++++++++
.../kiwi/generator/UUIDTimeIDGenerator.java | 108 +++++++++++
.../kiwi/persistence/KiWiConnection.java | 92 +++-------
.../kiwi/persistence/KiWiPersistence.java | 135 +++-----------
parent/pom.xml | 13 ++
.../services/triplestore/SesameServiceImpl.java | 29 ++-
.../main/resources/config-defaults.properties | 5 +-
.../resources/config-descriptions.properties | 9 +-
15 files changed, 843 insertions(+), 222 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index b8e880a..956ae68 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -72,6 +72,12 @@
<artifactId>tomcat-jdbc</artifactId>
</dependency>
+ <!-- primary key generation -->
+ <dependency>
+ <groupId>com.fasterxml.uuid</groupId>
+ <artifactId>java-uuid-generator</artifactId>
+ </dependency>
+
<!-- Sesame dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java
index 6767100..3daf16d 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/config/KiWiConfiguration.java
@@ -17,6 +17,7 @@
*/
package org.apache.marmotta.kiwi.config;
+import org.apache.marmotta.kiwi.generator.IDGeneratorType;
import org.apache.marmotta.kiwi.persistence.KiWiDialect;
/**
@@ -83,13 +84,10 @@ public class KiWiConfiguration {
private int cursorSize = 1000;
/**
- * If enabled, and batchCommit is also true, load sequence values into static memory fields once and increment
- * values purely in-memory. The last value is then written back on batch commits.
+ * The method to use for generating row IDs. Starting with Marmotta 3.2, the default is to use the Twitter Snowflake
+ * algorithm.
*/
- private boolean memorySequences = true;
-
-
- private boolean commitSequencesOnCommit = true;
+ private IDGeneratorType idGeneratorType = IDGeneratorType.SNOWFLAKE;
public KiWiConfiguration(String name, String jdbcUrl, String dbUser, String dbPassword, KiWiDialect dialect) {
@@ -201,32 +199,16 @@ public class KiWiConfiguration {
this.cursorSize = cursorSize;
}
- public boolean isMemorySequences() {
- return memorySequences;
- }
-
/**
- * Enable in-memory sequences. If enabled, and batchCommit is also true, load sequence values into static memory
- * fields once and increment values purely in-memory. The last value is then written back on batch commits. This
- * feature can avoid many database accesses and connections and therefore give significant performance improvements.
- * (EXPERIMENTAL).
+ * The ID generator used for generating row IDs in the database. See documentation in {@link IDGeneratorType}
+ *
+ * @return the type defined for this configuration
*/
- public void setMemorySequences(boolean memorySequences) {
- this.memorySequences = memorySequences;
+ public IDGeneratorType getIdGeneratorType() {
+ return idGeneratorType;
}
-
- public boolean isCommitSequencesOnCommit() {
- return commitSequencesOnCommit;
- }
-
- /**
- * This flag determines whether memory sequences should be stored back into the database on every commit or only
- * when the repository shuts down. Saving back on every commit is safer, but has less performance.
- *
- * @param commitSequencesOnCommit
- */
- public void setCommitSequencesOnCommit(boolean commitSequencesOnCommit) {
- this.commitSequencesOnCommit = commitSequencesOnCommit;
+ public void setIdGeneratorType(IDGeneratorType idGeneratorType) {
+ this.idGeneratorType = idGeneratorType;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/DatabaseSequenceIDGenerator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/DatabaseSequenceIDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/DatabaseSequenceIDGenerator.java
new file mode 100644
index 0000000..ddaa094
--- /dev/null
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/DatabaseSequenceIDGenerator.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.generator;
+
+import org.apache.marmotta.kiwi.persistence.KiWiConnection;
+import org.apache.marmotta.kiwi.persistence.KiWiPersistence;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * Generate IDs using database sequences
+ *
+ * @author Sebastian Schaffert (sschaffert@apache.org)
+ */
+public class DatabaseSequenceIDGenerator implements IDGenerator {
+
+ public DatabaseSequenceIDGenerator() {
+ }
+
+
+ /**
+ * Initialise the generator for the given persistence and module
+ */
+ @Override
+ public void init(KiWiPersistence persistence, String scriptName) {
+ }
+
+ /**
+ * Commit the current state of memory sequences to the database using the connection passed as second argument.
+ *
+ * @param persistence
+ * @param con
+ * @throws java.sql.SQLException
+ */
+ @Override
+ public void commit(KiWiPersistence persistence, Connection con) throws SQLException {
+ }
+
+ /**
+ * Shut down this id generator, performing any cleanups that might be necessary.
+ *
+ * @param persistence
+ */
+ @Override
+ public void shutdown(KiWiPersistence persistence) {
+
+ }
+
+ /**
+ * Return the next unique id for the type with the given name using the generator's id generation strategy.
+ *
+ * @param name
+ * @return
+ */
+ @Override
+ public long getId(String name, KiWiConnection connection) throws SQLException {
+ return connection.getDatabaseSequence(name);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGenerator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGenerator.java
new file mode 100644
index 0000000..2318a8d
--- /dev/null
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGenerator.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.generator;
+
+import org.apache.marmotta.kiwi.persistence.KiWiConnection;
+import org.apache.marmotta.kiwi.persistence.KiWiPersistence;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * An interface for database ID generators.
+ *
+ * @author Sebastian Schaffert (sschaffert@apache.org)
+ */
+public interface IDGenerator {
+
+ /**
+ * Return the next unique id for the type with the given name using the generator's id generation strategy.
+ * @param name
+ *
+ * @return
+ */
+ public long getId(String name, KiWiConnection connection) throws SQLException;
+
+ /**
+ * Initialise the generator for the given persistence and module
+ */
+ public void init(KiWiPersistence persistence, String scriptName);
+
+ /**
+ * Commit the current state of memory sequences to the database using the connection passed as second argument.
+ *
+ * @param persistence
+ * @param con
+ * @throws java.sql.SQLException
+ */
+ void commit(KiWiPersistence persistence, Connection con) throws SQLException;
+
+ /**
+ * Shut down this id generator, performing any cleanups that might be necessary.
+ *
+ * @param persistence
+ */
+ public void shutdown(KiWiPersistence persistence);
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGeneratorType.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGeneratorType.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGeneratorType.java
new file mode 100644
index 0000000..86bb6a2
--- /dev/null
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/IDGeneratorType.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.generator;
+
+/**
+ * An enum for describing different ways of calculating the primary key ids for database rows in the KiWiConfiguration
+ *
+ * @author Sebastian Schaffert (sschaffert@apache.org)
+ */
+public enum IDGeneratorType {
+ /**
+ * Generate keys using database sequences (for databases which support it) or atomic table updates
+ */
+ DATABASE_SEQUENCE,
+
+ /**
+ * Load the sequences in-memory on startup and generate ids by incrementing an atomic counter. Much faster
+ * than database sequences and backwards-compatible, but only works for exclusive connections to the
+ * database (i.e. no other application is accessing the same database)
+ */
+ MEMORY_SEQUENCE,
+
+
+ /**
+ * Generate row ids using the least significant 8 bytes of time-based UUIDs as described in http://www.ietf.org/rfc/rfc4122.txt
+ */
+ UUID_TIME,
+
+
+ /**
+ * Generate the row ids using the least significant 8 bytes of secure random UUIDs as described in http://www.ietf.org/rfc/rfc4122.txt
+ */
+ UUID_RANDOM,
+
+ /**
+ * Generate the row ids using the Twitter Snowflake algorithm described in https://github.com/twitter/snowflake
+ */
+ SNOWFLAKE
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/MemorySequenceIDGenerator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/MemorySequenceIDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/MemorySequenceIDGenerator.java
new file mode 100644
index 0000000..908bc44
--- /dev/null
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/MemorySequenceIDGenerator.java
@@ -0,0 +1,178 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.generator;
+
+import com.google.common.util.concurrent.AtomicLongMap;
+import org.apache.marmotta.kiwi.persistence.KiWiConnection;
+import org.apache.marmotta.kiwi.persistence.KiWiPersistence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Generate unique IDs by incrementing an in-memory atomic long value for each sequence. This method is much faster
+ * than database sequences and backwards compatible (because values are written back to the database on each commit),
+ * but it does not work reliably if several applications access the same database.
+ *
+ * @author Sebastian Schaffert (sschaffert@apache.org)
+ */
+public class MemorySequenceIDGenerator implements IDGenerator {
+ private static Logger log = LoggerFactory.getLogger(MemorySequenceIDGenerator.class);
+
+ /**
+ * A map holding in-memory sequences to be used for sequence caching in case the appropriate configuration option
+ * is configued and batched commits are enabled.
+ */
+ private AtomicLongMap<String> memorySequences;
+
+
+ // keep track which memory sequences have been updated and need to be written back
+ private Set<String> sequencesUpdated;
+
+ private ReentrantLock sequencesLock;
+
+
+
+ public MemorySequenceIDGenerator() {
+ this.sequencesLock = new ReentrantLock();
+ this.sequencesUpdated = new HashSet<>();
+ memorySequences = AtomicLongMap.create();
+ }
+
+ /**
+ * Initialise in-memory sequences if the feature is enabled.
+ */
+ @Override
+ public void init(KiWiPersistence persistence, String scriptName) {
+ sequencesLock.lock();
+ try {
+ try {
+ Connection con = persistence.getJDBCConnection(true);
+ try {
+ for(String sequenceName : persistence.getDialect().listSequences(scriptName)) {
+
+ // load sequence value from database
+ // if there is a preparation needed to update the transaction, run it first
+ if(persistence.getDialect().hasStatement(sequenceName+".prep")) {
+ PreparedStatement prepNodeId = con.prepareStatement(persistence.getDialect().getStatement(sequenceName+".prep"));
+ prepNodeId.executeUpdate();
+ prepNodeId.close();
+ }
+
+ PreparedStatement queryNodeId = con.prepareStatement(persistence.getDialect().getStatement(sequenceName));
+ ResultSet resultNodeId = queryNodeId.executeQuery();
+ try {
+ if(resultNodeId.next()) {
+ memorySequences.put(sequenceName,resultNodeId.getLong(1)-1);
+ } else {
+ throw new SQLException("the sequence did not return a new value");
+ }
+ } finally {
+ resultNodeId.close();
+ }
+
+ con.commit();
+ }
+ } finally {
+ persistence.releaseJDBCConnection(con);
+ }
+ } catch(SQLException ex) {
+ log.warn("database error: could not initialise in-memory sequences",ex);
+ }
+ } finally {
+ sequencesLock.unlock();
+ }
+
+ }
+
+ /**
+ * Commit the current state of memory sequences to the database using the connection passed as second argument.
+ *
+ * @param persistence
+ * @param con
+ * @throws SQLException
+ */
+ @Override
+ public void commit(KiWiPersistence persistence, Connection con) throws SQLException {
+ sequencesLock.lock();
+ try {
+ // clear existing list of updated sequences
+ Set<String> updated = this.sequencesUpdated;
+ this.sequencesUpdated = new HashSet<>();
+
+ try {
+ for(Map.Entry<String,Long> entry : memorySequences.asMap().entrySet()) {
+ if( updated.contains(entry.getKey()) && entry.getValue() > 0) {
+ PreparedStatement updateSequence = con.prepareStatement(persistence.getDialect().getStatement(entry.getKey()+".set"));
+ updateSequence.setLong(1, entry.getValue());
+ if(updateSequence.execute()) {
+ updateSequence.getResultSet().close();
+ } else {
+ updateSequence.getUpdateCount();
+ }
+ }
+ }
+ } catch(SQLException ex) {
+ // MySQL deadlock state, in this case we retry anyways
+ if(!"40001".equals(ex.getSQLState())) {
+ log.error("SQL exception:",ex);
+ }
+ throw ex;
+ }
+
+ } finally {
+ sequencesLock.unlock();
+ }
+ }
+
+ /**
+ * Shut down this id generator, performing any cleanups that might be necessary.
+ *
+ * @param persistence
+ */
+ @Override
+ public void shutdown(KiWiPersistence persistence) {
+
+ }
+
+ /**
+ * Return the next unique id for the type with the given name using the generator's id generation strategy.
+ *
+ * @param name
+ * @return
+ */
+ @Override
+ public long getId(String name, KiWiConnection connection) throws SQLException {
+ sequencesUpdated.add(name);
+
+ if(memorySequences != null) {
+ return memorySequences.incrementAndGet(name);
+ } else {
+ return 0;
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java
new file mode 100644
index 0000000..a56d37d
--- /dev/null
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/SnowflakeIDGenerator.java
@@ -0,0 +1,178 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.generator;
+
+import org.apache.marmotta.kiwi.persistence.KiWiConnection;
+import org.apache.marmotta.kiwi.persistence.KiWiPersistence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Enumeration;
+import java.util.Random;
+
+/**
+ * Generate unique IDs using the Twitter Snowflake algorithm (see https://github.com/twitter/snowflake). Snowflake IDs
+ * are 64 bit positive longs composed of:
+ * - 41 bits time stamp
+ * - 10 bits machine id
+ * - 12 bits sequence number
+ *
+ *
+ * @author Sebastian Schaffert (sschaffert@apache.org)
+ */
+public class SnowflakeIDGenerator implements IDGenerator {
+ private static Logger log = LoggerFactory.getLogger(SnowflakeIDGenerator.class);
+
+
+ private final long datacenterIdBits = 10L;
+ private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+ private final long sequenceBits = 12L;
+
+ private final long datacenterIdShift = sequenceBits;
+ private final long timestampLeftShift = sequenceBits + datacenterIdBits;
+ private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+ private final long twepoch = 1288834974657L;
+ private long datacenterId;
+
+ private volatile long lastTimestamp = -1L;
+ private volatile long sequence = 0L;
+
+
+ public SnowflakeIDGenerator() {
+ try {
+ datacenterId = getDatacenterId();
+ } catch (SocketException | UnknownHostException e) {
+ log.warn("SNOWFLAKE: could not determine machine address; using random datacenter ID");
+ Random rnd = new Random();
+ datacenterId = rnd.nextInt((int)maxDatacenterId) + 1;
+ }
+ if (datacenterId > maxDatacenterId || datacenterId < 0){
+ log.warn("SNOWFLAKE: datacenterId > maxDatacenterId; using random datacenter ID");
+ Random rnd = new Random();
+ datacenterId = rnd.nextInt((int)maxDatacenterId) + 1;
+ }
+
+ log.info("SNOWFLAKE: initialised with datacenter ID {}", datacenterId);
+ }
+
+ protected long tilNextMillis(long lastTimestamp){
+ long timestamp = System.currentTimeMillis();
+ while (timestamp <= lastTimestamp) {
+ timestamp = System.currentTimeMillis();
+ }
+ return timestamp;
+ }
+
+ protected long getDatacenterId() throws SocketException, UnknownHostException {
+ InetAddress ip = InetAddress.getLocalHost();
+ NetworkInterface network = null;
+
+
+ Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces();
+ while (en.hasMoreElements()) {
+ NetworkInterface nint = en.nextElement();
+ if (!nint.isLoopback()) {
+ network = nint;
+ break;
+ }
+ }
+
+ byte[] mac = network.getHardwareAddress();
+
+ Random rnd = new Random();
+ byte rndByte = (byte)(rnd.nextInt() & 0x000000FF);
+
+ // take the last byte of the MAC address and a random byte as datacenter ID
+ long id = ((0x000000FF & (long)mac[mac.length-1]) | (0x0000FF00 & (((long)rndByte)<<8)))>>6;
+
+
+ return id;
+ }
+
+
+
+ /**
+ * Commit the current state of memory sequences to the database using the connection passed as second argument.
+ *
+ * @param persistence
+ * @param con
+ * @throws java.sql.SQLException
+ */
+ @Override
+ public void commit(KiWiPersistence persistence, Connection con) throws SQLException {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Return the next unique id for the type with the given name using the generator's id generation strategy.
+ *
+ * @param name
+ * @return
+ */
+ @Override
+ public synchronized long getId(String name, KiWiConnection connection) throws SQLException {
+ long timestamp = System.currentTimeMillis();
+ if(timestamp<lastTimestamp) {
+ log.warn("Clock moved backwards. Refusing to generate id for {} milliseconds.",(lastTimestamp - timestamp));
+ try {
+ Thread.sleep((lastTimestamp - timestamp));
+ } catch (InterruptedException e) {
+ }
+ }
+ if (lastTimestamp == timestamp) {
+ sequence = (sequence + 1) & sequenceMask;
+ if (sequence == 0) {
+ timestamp = tilNextMillis(lastTimestamp);
+ }
+ } else {
+ sequence = 0;
+ }
+ lastTimestamp = timestamp;
+ long id = ((timestamp - twepoch) << timestampLeftShift) | (datacenterId << datacenterIdShift) | sequence;
+
+ if(id < 0) {
+ log.warn("ID is smaller than 0: {}",id);
+ }
+ return id;
+ }
+
+ /**
+ * Initialise the generator for the given persistence and module
+ */
+ @Override
+ public void init(KiWiPersistence persistence, String scriptName) {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ /**
+ * Shut down this id generator, performing any cleanups that might be necessary.
+ *
+ * @param persistence
+ */
+ @Override
+ public void shutdown(KiWiPersistence persistence) {
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDRandomIDGenerator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDRandomIDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDRandomIDGenerator.java
new file mode 100644
index 0000000..d5863d3
--- /dev/null
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDRandomIDGenerator.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.generator;
+
+import com.fasterxml.uuid.Generators;
+import com.fasterxml.uuid.impl.RandomBasedGenerator;
+import org.apache.marmotta.kiwi.persistence.KiWiConnection;
+import org.apache.marmotta.kiwi.persistence.KiWiPersistence;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * Generate a long id using the least significant bits of a secure random UUDI
+ *
+ * @author Sebastian Schaffert (sschaffert@apache.org)
+ */
+public class UUIDRandomIDGenerator implements IDGenerator {
+
+ RandomBasedGenerator generator;
+
+ public UUIDRandomIDGenerator() {
+ generator = Generators.randomBasedGenerator();
+ }
+
+
+ /**
+ * Initialise the generator for the given persistence and module
+ */
+ @Override
+ public void init(KiWiPersistence persistence, String scriptName) {
+ }
+
+ /**
+ * Commit the current state of memory sequences to the database using the connection passed as second argument.
+ *
+ * @param persistence
+ * @param con
+ * @throws java.sql.SQLException
+ */
+ @Override
+ public void commit(KiWiPersistence persistence, Connection con) throws SQLException {
+ }
+
+
+ /**
+ * Shut down this id generator, performing any cleanups that might be necessary.
+ *
+ * @param persistence
+ */
+ @Override
+ public void shutdown(KiWiPersistence persistence) {
+
+ }
+
+ /**
+ * Return the next unique id for the type with the given name using the generator's id generation strategy.
+ *
+ * @param name
+ * @return
+ */
+ @Override
+ public long getId(String name, KiWiConnection connection) {
+ return generator.generate().getMostSignificantBits();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDTimeIDGenerator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDTimeIDGenerator.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDTimeIDGenerator.java
new file mode 100644
index 0000000..11662a2
--- /dev/null
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/generator/UUIDTimeIDGenerator.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.generator;
+
+import com.fasterxml.uuid.EthernetAddress;
+import com.fasterxml.uuid.Generators;
+import com.fasterxml.uuid.ext.FileBasedTimestampSynchronizer;
+import com.fasterxml.uuid.impl.TimeBasedGenerator;
+import org.apache.marmotta.kiwi.persistence.KiWiConnection;
+import org.apache.marmotta.kiwi.persistence.KiWiPersistence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * Generate a long id using the most significant bits of a time-based UUID.
+ *
+ * @author Sebastian Schaffert (sschaffert@apache.org)
+ */
+public class UUIDTimeIDGenerator implements IDGenerator {
+
+ private static Logger log = LoggerFactory.getLogger(UUIDTimeIDGenerator.class);
+
+ TimeBasedGenerator generator;
+ FileBasedTimestampSynchronizer synchronizer;
+
+ File uuid1, uuid2;
+
+ public UUIDTimeIDGenerator() {
+ try {
+ uuid1 = new File(System.getProperty("java.io.tmpdir") + File.separator + "uuid1.lck");
+ uuid2 = new File(System.getProperty("java.io.tmpdir") + File.separator + "uuid2.lck");
+
+ synchronizer = new FileBasedTimestampSynchronizer(uuid1, uuid2);
+
+ generator = Generators.timeBasedGenerator(EthernetAddress.fromInterface(), synchronizer);
+ } catch (IOException e) {
+ log.error("error initialising time-based UUID generator",e);
+ }
+ }
+
+
+ /**
+ * Initialise the generator for the given persistence and module
+ */
+ @Override
+ public void init(KiWiPersistence persistence, String scriptName) {
+ }
+
+ /**
+ * Commit the current state of memory sequences to the database using the connection passed as second argument.
+ *
+ * @param persistence
+ * @param con
+ * @throws java.sql.SQLException
+ */
+ @Override
+ public void commit(KiWiPersistence persistence, Connection con) throws SQLException {
+ }
+
+
+ /**
+ * Shut down this id generator, performing any cleanups that might be necessary.
+ *
+ * @param persistence
+ */
+ @Override
+ public void shutdown(KiWiPersistence persistence) {
+ try {
+ synchronizer.deactivate();
+
+ uuid1.delete();
+ uuid2.delete();
+ } catch (IOException e) {
+ log.error("error deactivating file synchronizer ...");
+ }
+ }
+
+ /**
+ * Return the next unique id for the type with the given name using the generator's id generation strategy.
+ *
+ * @param name
+ * @return
+ */
+ @Override
+ public synchronized long getId(String name, KiWiConnection connection) {
+ return generator.generate().getMostSignificantBits();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
index 9c7de67..4f0fd4f 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
@@ -17,17 +17,13 @@
*/
package org.apache.marmotta.kiwi.persistence;
+import com.google.common.base.Preconditions;
import info.aduna.iteration.*;
-
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.Element;
import org.apache.marmotta.commons.sesame.model.LiteralCommons;
import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.apache.marmotta.commons.util.DateUtils;
-
-import com.google.common.base.Preconditions;
-
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Element;
-
import org.apache.marmotta.kiwi.caching.KiWiCacheManager;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.model.caching.TripleTable;
@@ -1767,32 +1763,31 @@ public class KiWiConnection {
* @throws SQLException
*/
public long getNextSequence(String sequenceName) throws SQLException {
- if(batchCommit && persistence.getConfiguration().isMemorySequences()) {
- return persistence.incrementAndGetMemorySequence(sequenceName);
- } else {
- requireJDBCConnection();
+ return persistence.getIdGenerator().getId(sequenceName,this);
+ }
- // retrieve a new node id and set it in the node object
+ public long getDatabaseSequence(String sequenceName) throws SQLException {
+ requireJDBCConnection();
- // if there is a preparation needed to update the transaction, run it first
- if(dialect.hasStatement(sequenceName+".prep")) {
- PreparedStatement prepNodeId = getPreparedStatement(sequenceName+".prep");
- prepNodeId.executeUpdate();
- }
+ // retrieve a new node id and set it in the node object
- PreparedStatement queryNodeId = getPreparedStatement(sequenceName);
- ResultSet resultNodeId = queryNodeId.executeQuery();
- try {
- if(resultNodeId.next()) {
- return resultNodeId.getLong(1);
- } else {
- throw new SQLException("the sequence did not return a new value");
- }
- } finally {
- resultNodeId.close();
- }
+ // if there is a preparation needed to update the transaction, run it first
+ if(dialect.hasStatement(sequenceName+".prep")) {
+ PreparedStatement prepNodeId = getPreparedStatement(sequenceName+".prep");
+ prepNodeId.executeUpdate();
}
+ PreparedStatement queryNodeId = getPreparedStatement(sequenceName);
+ ResultSet resultNodeId = queryNodeId.executeQuery();
+ try {
+ if(resultNodeId.next()) {
+ return resultNodeId.getLong(1);
+ } else {
+ throw new SQLException("the sequence did not return a new value");
+ }
+ } finally {
+ resultNodeId.close();
+ }
}
@@ -1988,10 +1983,7 @@ public class KiWiConnection {
execution.execute(connection, new RetryCommand<Void>() {
@Override
public Void run() throws SQLException {
- if(persistence.getConfiguration().isCommitSequencesOnCommit() || numberOfCommits % 100 == 0) {
- commitMemorySequences();
- }
-
+ persistence.getIdGenerator().commit(persistence, getJDBCConnection());
if(tripleBatch != null && tripleBatch.size() > 0) {
flushBatch();
@@ -2010,42 +2002,6 @@ public class KiWiConnection {
}
/**
- * Store the values of all memory sequences back into the database. Should be called at least on repository shutdown
- * but possibly even when a transaction commits.
- */
- public void commitMemorySequences() throws SQLException {
- if(persistence.getMemorySequences() != null) {
- synchronized (persistence.getMemorySequences()) {
- requireJDBCConnection();
-
- Set<String> updated = persistence.getSequencesUpdated();
- persistence.setSequencesUpdated(new HashSet<String>());
-
- try {
- for(Map.Entry<String,Long> entry : persistence.getMemorySequences().asMap().entrySet()) {
- if( updated.contains(entry.getKey()) && entry.getValue() > 0) {
- PreparedStatement updateSequence = getPreparedStatement(entry.getKey()+".set");
- updateSequence.setLong(1, entry.getValue());
- if(updateSequence.execute()) {
- updateSequence.getResultSet().close();
- } else {
- updateSequence.getUpdateCount();
- }
- }
- }
- } catch(SQLException ex) {
- // MySQL deadlock state, in this case we retry anyways
- if(!"40001".equals(ex.getSQLState())) {
- log.error("SQL exception:",ex);
- }
- throw ex;
- }
- }
- }
-
- }
-
- /**
* Undoes all changes made in the current transaction
* and releases any database locks currently held
* by this <code>Connection</code> object. This method should be
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
index 98ff1b9..7ec1109 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java
@@ -17,34 +17,21 @@
*/
package org.apache.marmotta.kiwi.persistence;
-import com.google.common.util.concurrent.AtomicLongMap;
import org.apache.marmotta.kiwi.caching.KiWiCacheManager;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
-import org.apache.marmotta.kiwi.model.rdf.KiWiNode;
-import org.apache.marmotta.kiwi.model.rdf.KiWiResource;
-import org.apache.marmotta.kiwi.model.rdf.KiWiUriResource;
+import org.apache.marmotta.kiwi.generator.*;
import org.apache.marmotta.kiwi.persistence.util.ScriptRunner;
import org.apache.marmotta.kiwi.sail.KiWiValueFactory;
import org.apache.tomcat.jdbc.pool.DataSource;
import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.openrdf.model.Statement;
-import org.openrdf.repository.RepositoryException;
-import org.openrdf.repository.RepositoryResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.StringReader;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.HashSet;
-import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.ReentrantLock;
/**
* Add file description here!
@@ -75,20 +62,14 @@ public class KiWiPersistence {
private KiWiConfiguration configuration;
/**
- * A map holding in-memory sequences to be used for sequence caching in case the appropriate configuration option
- * is configued and batched commits are enabled.
- */
- private AtomicLongMap<String> memorySequences;
-
- private ReentrantLock sequencesLock;
-
-
- /**
* A reference to the value factory used to access this store. Used for notifications when to flush batches.
*/
private KiWiValueFactory valueFactory;
+ private IDGenerator idGenerator;
+
+
/**
* This lock allows setting the backend into maintenance mode (by locking the write lock), which essentially
* grants an exclusive access to the database. This is currently used by the garbage collector, but can also
@@ -100,9 +81,6 @@ public class KiWiPersistence {
private boolean initialized = false;
- // keep track which memory sequences have been updated and need to be written back
- private Set<String> sequencesUpdated;
-
@Deprecated
public KiWiPersistence(String name, String jdbcUrl, String db_user, String db_password, KiWiDialect dialect) {
this(new KiWiConfiguration(name,jdbcUrl,db_user,db_password,dialect));
@@ -111,8 +89,6 @@ public class KiWiPersistence {
public KiWiPersistence(KiWiConfiguration configuration) {
this.configuration = configuration;
this.maintenance = false;
- this.sequencesLock = new ReentrantLock();
- this.sequencesUpdated = new HashSet<>();
}
public void initialise() {
@@ -207,50 +183,26 @@ public class KiWiPersistence {
* Initialise in-memory sequences if the feature is enabled.
*/
public void initSequences(String scriptName) {
- if(configuration.isBatchCommit() && configuration.isMemorySequences()) {
- sequencesLock.lock();
- try {
- if(memorySequences == null) {
- memorySequences = AtomicLongMap.create();
- }
-
- try {
- Connection con = getJDBCConnection(true);
- try {
- for(String sequenceName : getDialect().listSequences(scriptName)) {
-
- // load sequence value from database
- // if there is a preparation needed to update the transaction, run it first
- if(getDialect().hasStatement(sequenceName+".prep")) {
- PreparedStatement prepNodeId = con.prepareStatement(getDialect().getStatement(sequenceName+".prep"));
- prepNodeId.executeUpdate();
- prepNodeId.close();
- }
-
- PreparedStatement queryNodeId = con.prepareStatement(getDialect().getStatement(sequenceName));
- ResultSet resultNodeId = queryNodeId.executeQuery();
- try {
- if(resultNodeId.next()) {
- memorySequences.put(sequenceName,resultNodeId.getLong(1)-1);
- } else {
- throw new SQLException("the sequence did not return a new value");
- }
- } finally {
- resultNodeId.close();
- }
-
- con.commit();
- }
- } finally {
- releaseJDBCConnection(con);
- }
- } catch(SQLException ex) {
- log.warn("database error: could not initialise in-memory sequences",ex);
- }
- } finally {
- sequencesLock.unlock();
- }
+ switch (configuration.getIdGeneratorType()) {
+ case DATABASE_SEQUENCE:
+ idGenerator = new DatabaseSequenceIDGenerator();
+ break;
+ case MEMORY_SEQUENCE:
+ idGenerator = new MemorySequenceIDGenerator();
+ break;
+ case UUID_TIME:
+ idGenerator = new UUIDTimeIDGenerator();
+ break;
+ case UUID_RANDOM:
+ idGenerator = new UUIDRandomIDGenerator();
+ break;
+ case SNOWFLAKE:
+ idGenerator = new SnowflakeIDGenerator();
+ break;
+ default:
+ idGenerator = new DatabaseSequenceIDGenerator();
}
+ idGenerator.init(this,scriptName);
}
public void logPoolInfo() throws SQLException {
@@ -510,29 +462,12 @@ public class KiWiPersistence {
public void shutdown() {
initialized = false;
- if(!droppedDatabase && !configuration.isCommitSequencesOnCommit()) {
- log.info("storing in-memory sequences in database ...");
- try {
- KiWiConnection connection = getConnection();
- try {
- connection.commitMemorySequences();
- connection.commit();
- } finally {
- connection.close();
- }
- } catch (SQLException e) {
- log.error("could not store back values of in-memory sequences", e);
- }
- }
-
-
+ idGenerator.shutdown(this);
garbageCollector.shutdown();
cacheManager.shutdown();
connectionPool.close();
connectionPool = null;
- memorySequences = null;
-
}
/**
@@ -555,20 +490,6 @@ public class KiWiPersistence {
return configuration;
}
- public AtomicLongMap<String> getMemorySequences() {
- return memorySequences;
- }
-
- public long incrementAndGetMemorySequence(String name) {
- sequencesUpdated.add(name);
-
- if(memorySequences != null) {
- return memorySequences.incrementAndGet(name);
- } else {
- return 0;
- }
- }
-
public void garbageCollect() throws SQLException {
this.garbageCollector.garbageCollect();
@@ -578,11 +499,7 @@ public class KiWiPersistence {
return garbageCollector.checkConsistency();
}
- public Set<String> getSequencesUpdated() {
- return sequencesUpdated;
- }
-
- public void setSequencesUpdated(Set<String> sequencesUpdated) {
- this.sequencesUpdated = sequencesUpdated;
+ public IDGenerator getIdGenerator() {
+ return idGenerator;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2bfcc52..61c02e0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -976,6 +976,19 @@
<version>7.0.42</version>
</dependency>
+ <!--Secure Unique IDs -->
+ <dependency>
+ <groupId>com.fasterxml.uuid</groupId>
+ <artifactId>java-uuid-generator</artifactId>
+ <version>3.1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- Test Support -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java
index 29061c3..2684984 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java
@@ -19,14 +19,7 @@ package org.apache.marmotta.platform.core.services.triplestore;
import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
-import org.apache.marmotta.platform.core.api.config.ConfigurationService;
-import org.apache.marmotta.platform.core.api.triplestore.NotifyingSailProvider;
-import org.apache.marmotta.platform.core.api.triplestore.SesameService;
-import org.apache.marmotta.platform.core.api.triplestore.StandardSailProvider;
-import org.apache.marmotta.platform.core.api.triplestore.TransactionalSailProvider;
-import org.apache.marmotta.platform.core.qualifiers.event.transaction.AfterCommit;
-import org.apache.marmotta.platform.core.qualifiers.event.transaction.AfterRollback;
-import org.apache.marmotta.platform.core.qualifiers.event.transaction.BeforeCommit;
+import org.apache.marmotta.kiwi.generator.IDGeneratorType;
import org.apache.marmotta.kiwi.persistence.KiWiDialect;
import org.apache.marmotta.kiwi.persistence.h2.H2Dialect;
import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect;
@@ -36,6 +29,14 @@ import org.apache.marmotta.kiwi.transactions.api.TransactionListener;
import org.apache.marmotta.kiwi.transactions.api.TransactionalSail;
import org.apache.marmotta.kiwi.transactions.model.TransactionData;
import org.apache.marmotta.kiwi.transactions.sail.KiWiTransactionalSail;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.triplestore.NotifyingSailProvider;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
+import org.apache.marmotta.platform.core.api.triplestore.StandardSailProvider;
+import org.apache.marmotta.platform.core.api.triplestore.TransactionalSailProvider;
+import org.apache.marmotta.platform.core.qualifiers.event.transaction.AfterCommit;
+import org.apache.marmotta.platform.core.qualifiers.event.transaction.AfterRollback;
+import org.apache.marmotta.platform.core.qualifiers.event.transaction.BeforeCommit;
import org.openrdf.model.ValueFactory;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
@@ -155,7 +156,17 @@ public class SesameServiceImpl implements SesameService {
configuration.setQueryLoggingEnabled(configurationService.getBooleanConfiguration("database.debug.slowqueries",false));
configuration.setBatchCommit(batchCommit);
configuration.setBatchSize(configurationService.getIntConfiguration("database.batchsize",10000));
- configuration.setMemorySequences(configurationService.getBooleanConfiguration("database.memsequences",true));
+
+ String generatorType = configurationService.getStringConfiguration("database.generator", "uuid-time");
+ if("uuid-time".equals(generatorType)) {
+ configuration.setIdGeneratorType(IDGeneratorType.UUID_TIME);
+ } else if("uuid-random".equals(generatorType)) {
+ configuration.setIdGeneratorType(IDGeneratorType.UUID_RANDOM);
+ } else if("sequence".equals(generatorType)) {
+ configuration.setIdGeneratorType(IDGeneratorType.DATABASE_SEQUENCE);
+ } else if("memory".equals(generatorType)) {
+ configuration.setIdGeneratorType(IDGeneratorType.MEMORY_SEQUENCE);
+ }
store = new KiWiStore(configuration);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/platform/marmotta-core/src/main/resources/config-defaults.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/config-defaults.properties b/platform/marmotta-core/src/main/resources/config-defaults.properties
index 16caabb..8b1c0d9 100644
--- a/platform/marmotta-core/src/main/resources/config-defaults.properties
+++ b/platform/marmotta-core/src/main/resources/config-defaults.properties
@@ -169,9 +169,8 @@ database.batchcommit = true
# the maximum size of a batch before it is committed to the database; only applicable if batchcommit is enabled
database.batchsize = 10000
-# turn on in-memory sequences (EXPERIMENTAL); if enabled, sequences are pre-loaded once and then updated in memory
-# and only written back if a transaction commits
-database.memsequences = true
+# generator to use for creating database IDs; possible values are uuid-time, uuid-random, sequence, memory, snowflake
+database.generator = snowflake
# Hibernate-specific configuration for H2
database.h2.driver = org.h2.Driver
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4b8b8680/platform/marmotta-core/src/main/resources/config-descriptions.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/config-descriptions.properties b/platform/marmotta-core/src/main/resources/config-descriptions.properties
index f0c80c7..4f58780 100644
--- a/platform/marmotta-core/src/main/resources/config-descriptions.properties
+++ b/platform/marmotta-core/src/main/resources/config-descriptions.properties
@@ -173,10 +173,11 @@ database.batchsize.description = the maximum size of a batch before it is commit
batchcommit is enabled
database.batchsize.type = java.lang.Integer(10|0|*)
-database.memsequences.description = turn on in-memory sequences (EXPERIMENTAL); if enabled, sequences are pre-loaded \
- once and then updated in memory and only written back if a transaction commits
-database.memsequences.type = java.lang.Boolean
-
+database.generator.description = generator for creating database identifiers; uuid-time creates unique identifiers based \
+ on time and machine, uuid-random creates random identifiers, sequence uses a database sequence, memory loads a database \
+ sequence and increments in-memory (fast but requires exclusive database access), snowflake uses the Twitter Snowflake \
+ algorithm (fast and reliable)
+database.generator.type = java.lang.Enum("uuid-time"|"uuid-random"|"sequence"|"memory"|"snowflake")
###############################################################################
# LMF importer configuration
[29/50] [abbrv] git commit: wait longer for reasoning to finish,
it usually anyways takes longer than 100ms
Posted by ss...@apache.org.
wait longer for reasoning to finish, it usually anyways takes longer than 100ms
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f4a909a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f4a909a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f4a909a1
Branch: refs/heads/master
Commit: f4a909a1202b9ab99f87a734a8c2f252703d8492
Parents: 6e97cc0
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Sep 13 12:42:12 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Sep 13 12:42:12 2013 +0200
----------------------------------------------------------------------
.../KiWiRDFSchemaRepositoryConnectionTest.java | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f4a909a1/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sesame/KiWiRDFSchemaRepositoryConnectionTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sesame/KiWiRDFSchemaRepositoryConnectionTest.java b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sesame/KiWiRDFSchemaRepositoryConnectionTest.java
index 90bf0f9..c5a0854 100644
--- a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sesame/KiWiRDFSchemaRepositoryConnectionTest.java
+++ b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sesame/KiWiRDFSchemaRepositoryConnectionTest.java
@@ -58,14 +58,14 @@ import static org.junit.Assert.fail;
public class KiWiRDFSchemaRepositoryConnectionTest extends RDFSchemaRepositoryConnectionTest {
public Logger log = LoggerFactory.getLogger(this.getClass());
-
+
private final KiWiConfiguration config;
private KiWiReasoningSail rsail;
public KiWiRDFSchemaRepositoryConnectionTest(KiWiConfiguration config) {
this.config = config;
}
-
+
/* (non-Javadoc)
* @see org.openrdf.repository.RepositoryConnectionTest#createRepository()
*/
@@ -101,15 +101,15 @@ public class KiWiRDFSchemaRepositoryConnectionTest extends RDFSchemaRepositoryCo
@Override
public void commit() throws RepositoryException {
super.commit();
-
+
// wait for the reasoner to finish
try {
- while(rsail.getEngine().isRunning()) {
- log.info("sleeping for 100ms to let engine finish processing ... ");
- Thread.sleep(100);
- }
- Thread.sleep(100);
- log.info("sleeping for 100ms to let engine finish processing ... ");
+ while(rsail.getEngine().isRunning()) {
+ log.info("sleeping for 500ms to let engine finish processing ... ");
+ Thread.sleep(500);
+ }
+ log.info("sleeping for 100ms to let engine finish processing ... ");
+ Thread.sleep(100);
} catch (InterruptedException e) {
throw new RepositoryException("Could not finish reasoning", e);
}
@@ -118,7 +118,7 @@ public class KiWiRDFSchemaRepositoryConnectionTest extends RDFSchemaRepositoryCo
}
};
}
-
+
@Override
@Before
public void setUp() throws Exception {
@@ -127,7 +127,7 @@ public class KiWiRDFSchemaRepositoryConnectionTest extends RDFSchemaRepositoryCo
log.info("Setting up reasoning for RDFS");
rsail.addProgram("rdfs", this.getClass().getResourceAsStream("rdfs.skwrl"));
}
-
+
@Override
@Test
public void testExplicitFlag() throws Exception {
@@ -135,7 +135,7 @@ public class KiWiRDFSchemaRepositoryConnectionTest extends RDFSchemaRepositoryCo
testCon.begin();
testCon.add(bob, RDF.TYPE, RDFS.RESOURCE);
testCon.commit();
-
+
super.testExplicitFlag();
}
@@ -144,7 +144,7 @@ public class KiWiRDFSchemaRepositoryConnectionTest extends RDFSchemaRepositoryCo
@Ignore("in KiWi, inferencing is triggered on commit")
public void testInferencerQueryDuringTransaction() throws Exception {
}
-
+
@Override
@Test
@Ignore("in KiWi, inferencing is triggered on commit")
[31/50] [abbrv] git commit: fix licenses and configuration of RAT
plugin
Posted by ss...@apache.org.
fix licenses and configuration of RAT plugin
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/5088304a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/5088304a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/5088304a
Branch: refs/heads/master
Commit: 5088304a6098fbbcd34009d0c1dd0c2f051635a1
Parents: f4a909a
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Sep 13 13:12:58 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Sep 13 13:12:58 2013 +0200
----------------------------------------------------------------------
.../commons/sesame/model/LiteralKey.java | 17 +++++++++++
.../apache/marmotta/commons/vocabulary/XSD.java | 17 +++++++++++
.../sesame/model/StatementCommonsTest.java | 17 +++++++++++
.../sesame/facading/AbstractFacadingTest.java | 1 +
.../builder/FacadingPredicateBuilderTest.java | 1 +
.../facading/builder/model/ExampleFacade.java | 1 +
.../builder/model/ExamplePropBuilder.java | 1 +
.../collections/CollectionFacadingTest.java | 1 +
.../collections/model/CollectionFacade.java | 1 +
.../concurrent/ConcurrentFacadingTest.java | 17 +++++++++++
.../facading/concurrent/model/FooFacade.java | 17 +++++++++++
.../facading/concurrent/model/TypeFacade.java | 17 +++++++++++
.../sesame/facading/foaf/FacadingFoafTest.java | 1 +
.../facading/foaf/model/OnlineAccount.java | 1 +
.../sesame/facading/foaf/model/Person.java | 1 +
.../facading/locale/LocaleFacadingTest.java | 1 +
.../facading/locale/model/LocaleFacade.java | 1 +
.../facading/primitive/BoxedFacadingTest.java | 1 +
.../primitive/PrimitiveFacadingTest.java | 17 +++++++++++
.../sesame/facading/primitive/model/Boxed.java | 17 +++++++++++
.../facading/primitive/model/Primitive.java | 17 +++++++++++
.../facading/primitive/model/PropBuilder.java | 17 +++++++++++
extras/pom.xml | 10 ++++++
extras/webjars/codemirror/pom.xml | 27 +++++++++++++++++
extras/webjars/pom.xml | 32 ++++++++++++++++++++
extras/webjars/sgvizler/pom.xml | 27 +++++++++++++++++
extras/webjars/snorql/pom.xml | 27 +++++++++++++++++
extras/webjars/strftime/pom.xml | 27 +++++++++++++++++
.../reasoner/test/model/JustificationTest.java | 17 +++++++++++
libraries/kiwi/kiwi-sparql/pom.xml | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query1.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query10.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query11.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query12.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query13.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query14.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query2.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query3.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query4.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query5.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query6.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query7.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query8.sparql | 17 +++++++++++
.../marmotta/kiwi/sparql/test/query9.sparql | 17 +++++++++++
.../persistence/h2/upgrade_base_001_002.sql | 15 +++++++++
.../persistence/mysql/upgrade_base_001_002.sql | 15 +++++++++
.../persistence/pgsql/upgrade_base_001_002.sql | 15 +++++++++
.../marmotta/kiwi/test/ConcurrencyTestBase.java | 17 +++++++++++
.../apache/marmotta/kiwi/test/DialectTest.java | 17 +++++------
.../marmotta/kiwi/test/H2ConcurrencyTest.java | 17 +++++++++++
.../kiwi/test/MySQLConcurrencyTest.java | 17 +++++++++++
.../marmotta/kiwi/test/PersistenceTest.java | 17 +++++------
.../kiwi/test/PostgreSQLConcurrencyTest.java | 17 +++++++++++
.../marmotta/kiwi/test/RepositoryTest.java | 17 +++++------
.../kiwi/test/helper/DBConnectionChecker.java | 15 +++++----
.../kiwi/test/junit/DatabaseRunnerTest1.java | 15 +++++----
.../kiwi/test/junit/DatabaseRunnerTest2.java | 15 +++++----
.../kiwi/test/junit/KiWiDatabaseRunner.java | 15 +++++----
.../kiwi/test/sesame/KiWiLocaleTest.java | 15 +++++----
.../test/sesame/KiWiSailConcurrencyTest.java | 15 +++++----
.../kiwi/test/sesame/KiWiSailInterruptTest.java | 15 +++++----
.../kiwi/test/sesame/KiWiStoreTest.java | 15 +++++----
.../KiWiRepositoryConnectionTest.java | 15 +++++----
.../sesame/repository/KiWiRepositoryTest.java | 1 +
.../kiwi/model/caching/TripleTableTest.java | 17 +++++++++++
.../persistence/h2/upgrade_ldcache_001_002.sql | 15 +++++++++
.../mysql/upgrade_ldcache_001_002.sql | 15 +++++++++
.../pgsql/upgrade_ldcache_001_002.sql | 15 +++++++++
.../backend/sesame/SesameValueBackend.java | 17 +++++++++++
.../ldpath/parser/EmptyTestingBackend.java | 17 +++++------
.../marmotta/ldpath/parser/ParserTest.java | 17 +++++------
.../marmotta/ldpath/parser/ProgramTest.java | 17 +++++++++++
.../marmotta/ldpath/parser/SelectorsTest.java | 17 +++++++++++
.../ldpath/parser/StringTestingBackend.java | 17 +++++++++++
.../marmotta/ldpath/parser/TestsTest.java | 17 +++++++++++
parent/pom.xml | 18 +++--------
.../core/model/template/MenuItemType.java | 17 +++++++++++
.../jaxrs/ExceptionMapperServiceImpl.java | 19 ++++++++++--
.../model/filter/LDCacheIgnoreFilter.java | 17 +++++++++++
platform/marmotta-sparql/pom.xml | 13 ++++++++
80 files changed, 1036 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralKey.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralKey.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralKey.java
index d921073..4a25b78 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralKey.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralKey.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.model;
/**
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/vocabulary/XSD.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/vocabulary/XSD.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/vocabulary/XSD.java
index a4af06c..4d42298 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/vocabulary/XSD.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/vocabulary/XSD.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.vocabulary;
import org.openrdf.model.URI;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/StatementCommonsTest.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/StatementCommonsTest.java b/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/StatementCommonsTest.java
index b23f329..5e286ba 100644
--- a/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/StatementCommonsTest.java
+++ b/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/StatementCommonsTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.model;
import com.google.common.base.Equivalence;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/AbstractFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/AbstractFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/AbstractFacadingTest.java
index 8be89cb..befedc2 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/AbstractFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/AbstractFacadingTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/FacadingPredicateBuilderTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/FacadingPredicateBuilderTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/FacadingPredicateBuilderTest.java
index e48c6c8..88e043b 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/FacadingPredicateBuilderTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/FacadingPredicateBuilderTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.builder;
import static org.hamcrest.CoreMatchers.allOf;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/model/ExampleFacade.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/model/ExampleFacade.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/model/ExampleFacade.java
index 186c9ba..632edce 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/model/ExampleFacade.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/model/ExampleFacade.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.builder.model;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/model/ExamplePropBuilder.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/model/ExamplePropBuilder.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/model/ExamplePropBuilder.java
index 0caf2c7..89baca4 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/model/ExamplePropBuilder.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/model/ExamplePropBuilder.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.builder.model;
import org.apache.marmotta.commons.sesame.facading.model.AbstractNamespacePropBuilder;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/CollectionFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/CollectionFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/CollectionFacadingTest.java
index b3e3101..bebe041 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/CollectionFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/CollectionFacadingTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.collections;
import static org.hamcrest.CoreMatchers.hasItems;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/model/CollectionFacade.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/model/CollectionFacade.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/model/CollectionFacade.java
index 5980e17..72fdf8a 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/model/CollectionFacade.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/model/CollectionFacade.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.collections.model;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
index 03cdc09..241f5f3 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.facading.concurrent;
import java.util.ConcurrentModificationException;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/model/FooFacade.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/model/FooFacade.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/model/FooFacade.java
index c3c7be1..095f6fe 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/model/FooFacade.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/model/FooFacade.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.facading.concurrent.model;
import org.apache.marmotta.commons.sesame.facading.annotations.RDF;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/model/TypeFacade.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/model/TypeFacade.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/model/TypeFacade.java
index d475d16..d08404a 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/model/TypeFacade.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/model/TypeFacade.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.facading.concurrent.model;
import org.apache.marmotta.commons.sesame.facading.annotations.RDF;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/FacadingFoafTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/FacadingFoafTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/FacadingFoafTest.java
index 646d3c1..9d1442e 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/FacadingFoafTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/FacadingFoafTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.foaf;
import static org.hamcrest.CoreMatchers.allOf;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/model/OnlineAccount.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/model/OnlineAccount.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/model/OnlineAccount.java
index d1d316a..12cd744 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/model/OnlineAccount.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/model/OnlineAccount.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.foaf.model;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/model/Person.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/model/Person.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/model/Person.java
index c6298c1..9328f75 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/model/Person.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/foaf/model/Person.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.foaf.model;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/LocaleFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/LocaleFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/LocaleFacadingTest.java
index 24e8666..6dc860e 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/LocaleFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/LocaleFacadingTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.locale;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/model/LocaleFacade.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/model/LocaleFacade.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/model/LocaleFacade.java
index 1db7621..953fb02 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/model/LocaleFacade.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/model/LocaleFacade.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.locale.model;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/BoxedFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/BoxedFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/BoxedFacadingTest.java
index fa15599..5efc18a 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/BoxedFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/BoxedFacadingTest.java
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.marmotta.commons.sesame.facading.primitive;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/PrimitiveFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/PrimitiveFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/PrimitiveFacadingTest.java
index 2a65546..1d1d060 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/PrimitiveFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/PrimitiveFacadingTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.facading.primitive;
import java.util.Random;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/Boxed.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/Boxed.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/Boxed.java
index b15bd16..f540689 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/Boxed.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/Boxed.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.facading.primitive.model;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/Primitive.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/Primitive.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/Primitive.java
index caf5333..05647c9 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/Primitive.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/Primitive.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.facading.primitive.model;
import org.apache.marmotta.commons.sesame.facading.annotations.RDFPropertyBuilder;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/PropBuilder.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/PropBuilder.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/PropBuilder.java
index 8d990ae..98bfc3e 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/PropBuilder.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/primitive/model/PropBuilder.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.facading.primitive.model;
import org.apache.marmotta.commons.sesame.facading.model.AbstractNamespacePropBuilder;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 534adf9..393b2de 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -47,6 +47,16 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <!-- this is a reactor, no checking -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index 9db02e9..132b00d 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -55,6 +72,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!-- these are "extras", so they come from 3rd parties, no RAT check! -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/extras/webjars/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml
index 389d6f3..f6d2ef6 100644
--- a/extras/webjars/pom.xml
+++ b/extras/webjars/pom.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -15,6 +32,21 @@
<artifactId>webjars</artifactId>
<packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- this is a reactor, no checking -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<modules>
<module>snorql</module>
<module>codemirror</module>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index 2b8832d..beaa1c8 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -39,6 +56,16 @@
<output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}/sgvizler.js</output>
</configuration>
</plugin>
+ <plugin>
+ <!-- these are "extras", so they come from 3rd parties, no RAT check! -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index 7565c31..f8f4aeb 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -64,6 +81,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!-- these are "extras", so they come from 3rd parties, no RAT check! -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index be06e32..47834b0 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -40,6 +57,16 @@
<output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${webjar.version}/strftime.js</output>
</configuration>
</plugin>
+ <plugin>
+ <!-- these are "extras", so they come from 3rd parties, no RAT check! -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/model/JustificationTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/model/JustificationTest.java b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/model/JustificationTest.java
index 086f2e8..f3a1cb7 100644
--- a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/model/JustificationTest.java
+++ b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/model/JustificationTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.reasoner.test.model;
import org.apache.commons.lang3.RandomStringUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index f2c6595..754a363 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query1.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query1.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query1.sparql
index bc05292..3916c58 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query1.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query1.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
SELECT ?p1 ?p3 WHERE {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query10.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query10.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query10.sparql
index ef5158c..16fa6fc 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query10.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query10.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query11.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query11.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query11.sparql
index f784eb1..2b6f701 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query11.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query11.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query12.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query12.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query12.sparql
index c025a19..9b075c2 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query12.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query12.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query13.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query13.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query13.sparql
index af9b768..1d4b892 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query13.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query13.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query14.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query14.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query14.sparql
index 36b3555..978115e 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query14.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query14.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query2.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query2.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query2.sparql
index 1030470..612202b 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query2.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query2.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query3.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query3.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query3.sparql
index 4e22987..26b7041 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query3.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query3.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query4.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query4.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query4.sparql
index 3cf4787..6742145 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query4.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query4.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query5.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query5.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query5.sparql
index 791b163..8d0000d 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query5.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query5.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query6.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query6.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query6.sparql
index 5f82b49..5bdfbb1 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query6.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query6.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query7.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query7.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query7.sparql
index 2fbf3bc..151caa2 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query7.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query7.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query8.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query8.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query8.sparql
index 1c94f8f..139e1cd 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query8.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query8.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query9.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query9.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query9.sparql
index a14fded..b07ad16 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query9.sparql
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/query9.sparql
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX dc: <http://purl.org/dc/elements/1.1/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_001_002.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_001_002.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_001_002.sql
index 8a889dd..3143ac3 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_001_002.sql
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_001_002.sql
@@ -1,3 +1,18 @@
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You 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.
+
UPDATE METADATA SET mvalue = '2' WHERE mkey = 'version';
-- drop not null on triples.context
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/upgrade_base_001_002.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/upgrade_base_001_002.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/upgrade_base_001_002.sql
index 9501d52..1dc5df4 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/upgrade_base_001_002.sql
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/upgrade_base_001_002.sql
@@ -1,3 +1,18 @@
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You 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.
+
UPDATE metadata SET mvalue = '2' WHERE mkey = 'version';
-- update nodes.svalue to longtext
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/upgrade_base_001_002.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/upgrade_base_001_002.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/upgrade_base_001_002.sql
index 91c3568..eb794e8 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/upgrade_base_001_002.sql
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/upgrade_base_001_002.sql
@@ -1,3 +1,18 @@
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You 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.
+
UPDATE METADATA SET mvalue = '2' WHERE mkey = 'version';
-- drop not null on triples.context
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/ConcurrencyTestBase.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/ConcurrencyTestBase.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/ConcurrencyTestBase.java
index 87421e3..517efe9 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/ConcurrencyTestBase.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/ConcurrencyTestBase.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.test;
import com.google.code.tempusfugit.concurrency.ConcurrentRule;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/DialectTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/DialectTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/DialectTest.java
index 286d1aa..ed47cee 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/DialectTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/DialectTest.java
@@ -1,13 +1,12 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/H2ConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/H2ConcurrencyTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/H2ConcurrencyTest.java
index 2b2f966..b526a0f 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/H2ConcurrencyTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/H2ConcurrencyTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.test;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java
index aeddeaa..29bfabf 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.test;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
index e79edcd..1f9245e 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
@@ -1,13 +1,12 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java
index cfe352d..7b7b3c1 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.kiwi.test;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5088304a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
index f501985..5627f1b 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
@@ -1,13 +1,12 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ * 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,
[24/50] [abbrv] git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by ss...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/34a2c5c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/34a2c5c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/34a2c5c2
Branch: refs/heads/master
Commit: 34a2c5c2890b44ca25f944972a442589589b0d77
Parents: e53965c 4acdca5
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Thu Sep 12 17:30:39 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Thu Sep 12 17:30:39 2013 +0200
----------------------------------------------------------------------
.../core/api/modules/ModuleService.java | 29 +++
.../core/api/templating/TemplatingService.java | 8 +
.../platform/core/model/template/MenuItem.java | 75 ++++++-
.../core/model/template/MenuItemType.java | 12 ++
.../services/modules/ModuleServiceImpl.java | 160 ++++++++++++--
.../templating/AdminTemplatingServiceImpl.java | 210 +++++--------------
.../src/main/resources/kiwi-module.properties | 42 +++-
.../src/main/resources/templates/admin.ftl | 110 ++++++++--
.../src/main/resources/kiwi-module.properties | 6 +-
.../src/main/resources/kiwi-module.properties | 12 +-
.../src/main/resources/kiwi-module.properties | 6 +-
.../src/main/resources/kiwi-module.properties | 13 +-
.../src/main/resources/kiwi-module.properties | 14 +-
.../src/main/resources/kiwi-module.properties | 8 +-
.../src/main/resources/kiwi-module.properties | 6 +-
15 files changed, 498 insertions(+), 213 deletions(-)
----------------------------------------------------------------------
[11/50] [abbrv] git commit: MARMOTTA-155: Add test for invalid
language and use Locale.Builder
Posted by ss...@apache.org.
MARMOTTA-155: Add test for invalid language and use Locale.Builder
Locale.Builder throws an exception instead of returning a partial representation for illformed BCP47 language tags
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/58baf97f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/58baf97f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/58baf97f
Branch: refs/heads/master
Commit: 58baf97fc49549f4b6fcc149459c5429abd538a9
Parents: 87ec95a
Author: Peter Ansell <p_...@yahoo.com>
Authored: Wed Sep 11 13:01:43 2013 +1000
Committer: Peter Ansell <p_...@yahoo.com>
Committed: Wed Sep 11 13:01:43 2013 +1000
----------------------------------------------------------------------
.../apache/marmotta/kiwi/persistence/KiWiConnection.java | 10 ++++++++--
.../org/apache/marmotta/kiwi/sail/KiWiValueFactory.java | 6 ++++--
.../apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java | 10 ++++++++++
3 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/58baf97f/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
index 81041e3..a8ddbd1 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
@@ -1711,8 +1711,14 @@ public class KiWiConnection {
protected static Locale getLocale(String language) {
Locale locale = localeMap.get(language);
if(locale == null && language != null) {
- locale = Locale.forLanguageTag(language);
- localeMap.put(language, locale);
+ try {
+ Locale.Builder builder = new Locale.Builder();
+ builder.setLanguageTag(language);
+ locale = builder.build();
+ localeMap.put(language, locale);
+ } catch (IllformedLocaleException ex) {
+ throw new IllegalArgumentException("Language was not a valid BCP47 language: " + language, ex);
+ }
}
return locale;
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/58baf97f/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
index 78f630e..9ec70fb 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
@@ -392,8 +392,10 @@ public class KiWiValueFactory implements ValueFactory {
Locale locale;
if(lang != null) {
try {
- locale = Locale.forLanguageTag(lang);
- } catch (IllegalArgumentException ex) {
+ Locale.Builder builder = new Locale.Builder();
+ builder.setLanguageTag(lang);
+ locale = builder.build();
+ } catch (IllformedLocaleException ex) {
log.warn("malformed language literal (language: {})", lang);
locale = null;
lang = null;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/58baf97f/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
index 5c97e59..4ce351b 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
@@ -74,6 +74,16 @@ public class KiWiLocaleTest {
Assert.assertEquals("war", warLiteral.getLanguage());
}
+ /**
+ * Tests creating invalid BCP47 literals (see MARMOTTA-115 for further details)
+ */
+ @Test
+ public void createBCP47LiteralsInvalidTests() {
+ Literal invalidLangLiteral = vf.createLiteral("Hungary", "invalid");
+ Assert.assertEquals("Hungary", invalidLangLiteral.getLabel());
+ Assert.assertNull(invalidLangLiteral.getLanguage());
+ }
+
// /**
// * Tests adding BCP47 literals (see MARMOTTA-115 for further details)
// */
[07/50] [abbrv] git commit: MARMOTTA-155: added unit test to
reproduce the issue
Posted by ss...@apache.org.
MARMOTTA-155: added unit test to reproduce the issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/be890b69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/be890b69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/be890b69
Branch: refs/heads/master
Commit: be890b698d8fa063b1c0ca7b06581a8e5564b233
Parents: 69cc8f3
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Sep 10 14:42:32 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Sep 10 14:42:32 2013 +0200
----------------------------------------------------------------------
.../kiwi/test/sesame/KiWiLocaleTest.java | 101 +++++++++++++++++++
1 file changed, 101 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/be890b69/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
new file mode 100644
index 0000000..5c97e59
--- /dev/null
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.kiwi.test.sesame;
+
+import org.apache.marmotta.kiwi.config.KiWiConfiguration;
+import org.apache.marmotta.kiwi.sail.KiWiStore;
+import org.apache.marmotta.kiwi.sail.KiWiValueFactory;
+import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openrdf.model.Literal;
+import org.openrdf.sail.SailConnection;
+import org.openrdf.sail.SailException;
+
+/**
+ * Tests for testing locales against the KiWi Triple store
+ * (and its implementation of the ValueFactory)
+ *
+ * @author Sergio Fernández <wi...@apache.org>
+ */
+@RunWith(KiWiDatabaseRunner.class)
+public class KiWiLocaleTest {
+
+ private final KiWiConfiguration kiwiConfig;
+ private KiWiStore store;
+ private KiWiValueFactory vf;
+
+ public KiWiLocaleTest(KiWiConfiguration kiwiConfig) {
+ this.kiwiConfig = kiwiConfig;
+ }
+
+ @Before
+ public void initialize() throws SailException {
+ store = new KiWiStore(kiwiConfig);
+ store.initialize();
+ vf = new KiWiValueFactory(store, "http://example.org");
+ }
+
+ @After
+ public void shutdown() throws SailException {
+ store.shutDown();
+ store = null;
+ vf = null;
+ }
+
+ /**
+ * Tests creating BCP47 literals (see MARMOTTA-115 for further details)
+ */
+ @Test
+ public void createBCP47LiteralsTests() {
+ Literal enLiteral = vf.createLiteral("Hungary", "en");
+ Assert.assertEquals("Hungary", enLiteral.getLabel());
+ Assert.assertEquals("en", enLiteral.getLanguage());
+ Literal warLiteral = vf.createLiteral("Hungary", "war");
+ Assert.assertEquals("Hungary", warLiteral.getLabel());
+ Assert.assertEquals("war", warLiteral.getLanguage());
+ }
+
+// /**
+// * Tests adding BCP47 literals (see MARMOTTA-115 for further details)
+// */
+// @Test
+// public void addBCP47LiteralsTests() throws SailException {
+// SailConnection conn = store.getConnection();
+// try {
+// conn.begin();
+// conn.commit();
+// } finally {
+// conn.close();
+// }
+//
+// }
+//
+// /**
+// * Tests importing BCP47 literals (see MARMOTTA-115 for further details)
+// */
+// @Test
+// public void importBCP47LiteralsTests() throws SailException {
+// SailConnection connection = store.getConnection();
+//
+// }
+
+}
[39/50] [abbrv] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Posted by ss...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/81721b1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/81721b1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/81721b1c
Branch: refs/heads/master
Commit: 81721b1cc14f25c5f7a6ee4311a501d6e4f2df45
Parents: e2d9829 b5c3a61
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 24 10:31:27 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 24 10:31:27 2013 +0200
----------------------------------------------------------------------
NOTICE.txt | 144 +--------
.../src/main/resources/META-INF/NOTICE | 6 +-
.../src/main/resources/installer/NOTICE.txt | 309 ++-----------------
.../src/ext/resources/META-INF/NOTICE | 7 +-
.../src/main/resources/META-INF/NOTICE | 10 +-
.../src/main/webapp/META-INF/NOTICE | 266 ++--------------
.../src/main/doc/NOTICE.txt | 101 ------
.../src/main/resources/META-INF/NOTICE | 23 +-
.../src/main/resources/META-INF/NOTICE | 6 +-
.../src/main/resources/META-INF/NOTICE | 27 +-
10 files changed, 77 insertions(+), 822 deletions(-)
----------------------------------------------------------------------
[27/50] [abbrv] git commit: fixing some test errors,
perparing for release
Posted by ss...@apache.org.
fixing some test errors, perparing for release
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/c7563c0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/c7563c0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/c7563c0d
Branch: refs/heads/master
Commit: c7563c0d7d1030dc60b5e7682ac7cae0adf34331
Parents: ec26977
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Sep 13 12:22:55 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Sep 13 12:22:55 2013 +0200
----------------------------------------------------------------------
.../concurrent/ConcurrentFacadingTest.java | 3 +
.../kiwi/reasoner/engine/ReasoningEngine.java | 42 ++++++--
.../test/engine/ReasoningEngineTest.java | 2 +-
.../reasoner/test/sail/ReasoningSailTest.java | 1 +
.../KiWiRDFSchemaRepositoryConnectionTest.java | 2 +-
.../kiwi/persistence/KiWiConnection.java | 108 +++++++++++--------
.../kiwi/persistence/h2/statements.properties | 4 +-
.../kiwi/test/sesame/KiWiLocaleTest.java | 5 +-
8 files changed, 109 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7563c0d/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
index 504699d..03cdc09 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
@@ -1,5 +1,6 @@
package org.apache.marmotta.commons.sesame.facading.concurrent;
+import java.util.ConcurrentModificationException;
import java.util.UUID;
import org.apache.marmotta.commons.sesame.facading.AbstractFacadingTest;
@@ -169,6 +170,8 @@ public class ConcurrentFacadingTest extends AbstractFacadingTest {
subCon_2.close();
}
}
+ } catch (ConcurrentModificationException ex) {
+ // do nothing, H2 locking
} finally {
if (mainCon.isActive()) mainCon.rollback();
mainCon.close();
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7563c0d/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
index 18e0607..47891c6 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
@@ -121,6 +121,7 @@ public class ReasoningEngine implements TransactionListener {
*/
private static long taskCounter = 0;
+ private boolean isshutdown = false;
/**
* The worker thread for the reasoner.
@@ -894,17 +895,44 @@ public class ReasoningEngine implements TransactionListener {
}
public void shutdown() {
- log.info("shutting down reasoning service ...");
+ shutdown(false);
+ }
- for(int i = 0; i<20 && isRunning(); i++) {
- log.warn("reasoner not yet finished, waiting for 1 seconds (try={})", i+1);
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
+ public void shutdown(boolean force) {
+ if(isshutdown)
+ return;
+
+ if(force) {
+ log.warn("forced shutdown of reasoning service initiated, state will be inconsistent ...");
+
+ reasonerThread.shutdown();
+
+ for(int i = 0; i<3 && isRunning(); i++) {
+ log.warn("reasoner not yet finished, waiting for 1 seconds (try={})", i+1);
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
}
+
+ // yes, I know it is unsafe; it is only used when forcefully shutting down on test ends before the database is deleted...
+ reasonerThread.stop();
+
+ } else {
+ log.info("graceful shutdown of reasoning service initiated ...");
+
+ for(int i = 0; i<20 && isRunning(); i++) {
+ log.warn("reasoner not yet finished, waiting for 1 seconds (try={})", i+1);
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ }
+
+ reasonerThread.shutdown();
}
- reasonerThread.shutdown();
+ isshutdown = true;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7563c0d/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/engine/ReasoningEngineTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/engine/ReasoningEngineTest.java b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/engine/ReasoningEngineTest.java
index 75b7cad..fb2c497 100644
--- a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/engine/ReasoningEngineTest.java
+++ b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/engine/ReasoningEngineTest.java
@@ -129,7 +129,7 @@ public class ReasoningEngineTest {
@After
public void dropDatabase() throws Exception {
- engine.shutdown();
+ engine.shutdown(true);
rpersistence.dropDatabase();
persistence.dropDatabase();
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7563c0d/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sail/ReasoningSailTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sail/ReasoningSailTest.java b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sail/ReasoningSailTest.java
index 15f4d8f..64da3c1 100644
--- a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sail/ReasoningSailTest.java
+++ b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sail/ReasoningSailTest.java
@@ -88,6 +88,7 @@ public class ReasoningSailTest {
@After
public void dropDatabase() throws Exception {
+ rsail.getEngine().shutdown(true);
rsail.getPersistence().dropDatabase();
store.getPersistence().dropDatabase();
repository.shutDown();
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7563c0d/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sesame/KiWiRDFSchemaRepositoryConnectionTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sesame/KiWiRDFSchemaRepositoryConnectionTest.java b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sesame/KiWiRDFSchemaRepositoryConnectionTest.java
index 8d959ec..90bf0f9 100644
--- a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sesame/KiWiRDFSchemaRepositoryConnectionTest.java
+++ b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/sesame/KiWiRDFSchemaRepositoryConnectionTest.java
@@ -80,7 +80,7 @@ public class KiWiRDFSchemaRepositoryConnectionTest extends RDFSchemaRepositoryCo
Sail wsail = new SailWrapper(rsail) {
@Override
public void shutDown() throws SailException {
- rsail.getEngine().shutdown();
+ rsail.getEngine().shutdown(true);
try {
rsail.getPersistence().dropDatabase();
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7563c0d/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
index 119256c..9c7de67 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
@@ -28,7 +28,6 @@ import com.google.common.base.Preconditions;
import net.sf.ehcache.Cache;
import net.sf.ehcache.Element;
-import org.apache.commons.lang3.LocaleUtils;
import org.apache.marmotta.kiwi.caching.KiWiCacheManager;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.model.caching.TripleTable;
@@ -46,7 +45,6 @@ import org.slf4j.LoggerFactory;
import java.sql.*;
import java.util.*;
import java.util.Date;
-import java.util.concurrent.Executor;
import java.util.concurrent.locks.ReentrantLock;
/**
@@ -1062,7 +1060,7 @@ public class KiWiConnection {
* @throws NullPointerException in case the subject, predicate, object or context have not been persisted
* @return true in case the update added a new triple to the database, false in case the triple already existed
*/
- public synchronized boolean storeTriple(KiWiTriple triple) throws SQLException {
+ public synchronized boolean storeTriple(final KiWiTriple triple) throws SQLException {
// mutual exclusion: prevent parallel adding and removing of the same triple
synchronized (triple) {
@@ -1104,30 +1102,39 @@ public class KiWiConnection {
try {
- PreparedStatement insertTriple = getPreparedStatement("store.triple");
- insertTriple.setLong(1,triple.getId());
- insertTriple.setLong(2,triple.getSubject().getId());
- insertTriple.setLong(3,triple.getPredicate().getId());
- insertTriple.setLong(4,triple.getObject().getId());
- if(triple.getContext() != null) {
- insertTriple.setLong(5,triple.getContext().getId());
- } else {
- insertTriple.setNull(5, Types.BIGINT);
- }
- insertTriple.setBoolean(6,triple.isInferred());
- insertTriple.setTimestamp(7, new Timestamp(triple.getCreated().getTime()));
- int count = insertTriple.executeUpdate();
+ RetryExecution<Boolean> execution = new RetryExecution<>("STORE");
+ execution.setUseSavepoint(true);
+ execution.execute(connection, new RetryCommand<Boolean>() {
+ @Override
+ public Boolean run() throws SQLException {
+ PreparedStatement insertTriple = getPreparedStatement("store.triple");
+ insertTriple.setLong(1,triple.getId());
+ insertTriple.setLong(2,triple.getSubject().getId());
+ insertTriple.setLong(3,triple.getPredicate().getId());
+ insertTriple.setLong(4,triple.getObject().getId());
+ if(triple.getContext() != null) {
+ insertTriple.setLong(5,triple.getContext().getId());
+ } else {
+ insertTriple.setNull(5, Types.BIGINT);
+ }
+ insertTriple.setBoolean(6,triple.isInferred());
+ insertTriple.setTimestamp(7, new Timestamp(triple.getCreated().getTime()));
+ int count = insertTriple.executeUpdate();
- cacheTriple(triple);
+ cacheTriple(triple);
+
+ return count > 0;
+ }
+ });
+
+ return !hasId;
- return count > 0;
} catch(SQLException ex) {
if("HYT00".equals(ex.getSQLState())) { // H2 table locking timeout
throw new ConcurrentModificationException("the same triple was modified in concurrent transactions (triple="+triple+")");
+ } else {
+ throw ex;
}
- // this is an ugly hack to catch duplicate key errors in some databases (H2)
- // better option could be http://stackoverflow.com/questions/6736518/h2-java-insert-ignore-allow-exception
- return false;
}
}
}
@@ -1192,9 +1199,9 @@ public class KiWiConnection {
RetryExecution execution = new RetryExecution("DELETE");
execution.setUseSavepoint(true);
- execution.execute(connection, new RetryCommand() {
+ execution.execute(connection, new RetryCommand<Void>() {
@Override
- public void run() throws SQLException {
+ public Void run() throws SQLException {
// mutual exclusion: prevent parallel adding and removing of the same triple
synchronized (triple) {
@@ -1202,19 +1209,19 @@ public class KiWiConnection {
triple.setDeleted(true);
triple.setDeletedAt(new Date());
- if(triple.getId() == null) {
+ if (triple.getId() == null) {
log.warn("attempting to remove non-persistent triple: {}", triple);
removeCachedTriple(triple);
} else {
- if(batchCommit) {
+ if (batchCommit) {
// need to remove from triple batch and from database
commitLock.lock();
try {
- if(tripleBatch == null || !tripleBatch.remove(triple)) {
+ if (tripleBatch == null || !tripleBatch.remove(triple)) {
PreparedStatement deleteTriple = getPreparedStatement("delete.triple");
synchronized (deleteTriple) {
- deleteTriple.setLong(1,triple.getId());
+ deleteTriple.setLong(1, triple.getId());
deleteTriple.executeUpdate();
}
deletedStatementsLog.add(triple.getId());
@@ -1227,7 +1234,7 @@ public class KiWiConnection {
PreparedStatement deleteTriple = getPreparedStatement("delete.triple");
synchronized (deleteTriple) {
- deleteTriple.setLong(1,triple.getId());
+ deleteTriple.setLong(1, triple.getId());
deleteTriple.executeUpdate();
}
deletedStatementsLog.add(triple.getId());
@@ -1237,6 +1244,8 @@ public class KiWiConnection {
removeCachedTriple(triple);
}
}
+
+ return null;
}
});
@@ -1789,7 +1798,7 @@ public class KiWiConnection {
private void cacheNode(KiWiNode node) {
if(node.getId() != null) {
- nodeCache.put(new Element(node.getId(),node));
+ nodeCache.put(new Element(node.getId(), node));
}
if(node instanceof KiWiUriResource) {
uriCache.put(new Element(node.stringValue(), node));
@@ -1976,9 +1985,9 @@ public class KiWiConnection {
numberOfCommits++;
RetryExecution execution = new RetryExecution("COMMIT");
- execution.execute(connection, new RetryCommand() {
+ execution.execute(connection, new RetryCommand<Void>() {
@Override
- public void run() throws SQLException {
+ public Void run() throws SQLException {
if(persistence.getConfiguration().isCommitSequencesOnCommit() || numberOfCommits % 100 == 0) {
commitMemorySequences();
}
@@ -1994,6 +2003,8 @@ public class KiWiConnection {
if(connection != null) {
connection.commit();
}
+
+ return null;
}
});
}
@@ -2135,9 +2146,9 @@ public class KiWiConnection {
RetryExecution execution = new RetryExecution("FLUSH BATCH");
execution.setUseSavepoint(true);
- execution.execute(connection, new RetryCommand() {
+ execution.execute(connection, new RetryCommand<Void>() {
@Override
- public void run() throws SQLException {
+ public Void run() throws SQLException {
PreparedStatement insertTriple = getPreparedStatement("store.triple");
insertTriple.clearParameters();
insertTriple.clearBatch();
@@ -2177,6 +2188,7 @@ public class KiWiConnection {
tripleBatch.clear();
+ return null;
}
});
@@ -2189,9 +2201,9 @@ public class KiWiConnection {
}
- protected static interface RetryCommand {
+ protected static interface RetryCommand<T> {
- public void run() throws SQLException;
+ public T run() throws SQLException;
}
/**
@@ -2199,7 +2211,7 @@ public class KiWiConnection {
* and should be retried several times before giving up completely.
*
*/
- protected static class RetryExecution {
+ protected static class RetryExecution<T> {
// counter for current number of retries
private int retries = 0;
@@ -2260,36 +2272,40 @@ public class KiWiConnection {
return sqlStates;
}
- public void execute(Connection connection, RetryCommand command) throws SQLException {
+ public T execute(Connection connection, RetryCommand<T> command) throws SQLException {
Savepoint savepoint = null;
if(useSavepoint) {
savepoint = connection.setSavepoint();
}
try {
- command.run();
+ T result = command.run();
if(useSavepoint && savepoint != null) {
connection.releaseSavepoint(savepoint);
}
+
+ return result;
} catch (SQLException ex) {
if(retries < maxRetries && (sqlStates.size() == 0 || sqlStates.contains(ex.getSQLState()))) {
if(useSavepoint && savepoint != null) {
connection.rollback(savepoint);
}
- log.warn("{}: temporary conflict, retrying in {} ms ... (thread={}, retry={})", name, retryInterval, Thread.currentThread().getName(), retries);
+ Random rnd = new Random();
+ long sleep = retryInterval - 250 + rnd.nextInt(500);
+ log.warn("{}: temporary conflict, retrying in {} ms ... (thread={}, retry={})", name, sleep, Thread.currentThread().getName(), retries);
try {
- Thread.sleep(retryInterval);
+ Thread.sleep(sleep);
} catch (InterruptedException e) {}
retries++;
- execute(connection, command);
+ T result = execute(connection, command);
retries--;
+
+ return result;
} else {
- log.error("{}: temporary conflict could not be solved!", name);
+ log.error("{}: temporary conflict could not be solved! (error: {})", name, ex.getMessage());
- System.err.println("main exception:");
- ex.printStackTrace();
- System.err.println("next exception:");
- ex.getNextException().printStackTrace();
+ log.debug("main exception:",ex);
+ log.debug("next exception:",ex.getNextException());
throw ex;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7563c0d/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
index 130e3e7..092cfcb 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
@@ -60,8 +60,8 @@ store.tliteral = INSERT INTO nodes (id,ntype,svalue,tvalue,ltype,createdAt
store.namespace = INSERT INTO namespaces (id,prefix,uri,createdAt) VALUES (?,?,?,?)
-store.triple = INSERT INTO triples (id,subject,predicate,object,context,inferred,createdAt) VALUES (?,?,?,?,?,?,?)
-#store.triple = MERGE INTO triples (id,subject,predicate,object,context,inferred,createdAt) KEY(id) VALUES (?,?,?,?,?,?,?)
+#store.triple = INSERT INTO triples (id,subject,predicate,object,context,inferred,createdAt) VALUES (?,?,?,?,?,?,?)
+store.triple = MERGE INTO triples (id,subject,predicate,object,context,inferred,createdAt) KEY(id) VALUES (?,?,?,?,?,?,?)
load.triple = SELECT id FROM triples WHERE subject = ? AND predicate = ? AND object = ? AND context = ? AND deleted = false AND inferred = true
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c7563c0d/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
index cbdbee4..487bfde 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
@@ -30,6 +30,8 @@ import org.openrdf.model.Literal;
import org.openrdf.sail.SailConnection;
import org.openrdf.sail.SailException;
+import java.sql.SQLException;
+
/**
* Tests for testing locales against the KiWi Triple store
* (and its implementation of the ValueFactory)
@@ -55,7 +57,8 @@ public class KiWiLocaleTest {
}
@After
- public void shutdown() throws SailException {
+ public void shutdown() throws SailException, SQLException {
+ store.getPersistence().dropDatabase();
store.shutDown();
store = null;
vf = null;
[36/50] [abbrv] git commit: MARMOTTA-213: fixed main source code
notice file
Posted by ss...@apache.org.
MARMOTTA-213: fixed main source code notice file
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/30c02f04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/30c02f04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/30c02f04
Branch: refs/heads/master
Commit: 30c02f04ad5c70bdaf7a82969c1c77cf57b86a0b
Parents: 9cc8d97
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Sep 20 12:44:55 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Sep 20 12:44:55 2013 +0200
----------------------------------------------------------------------
NOTICE.txt | 139 ++++----------------------------------------------------
1 file changed, 9 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/30c02f04/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 544564f..eb3d48e 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -10,135 +10,14 @@ Portions of this software were originally based on the following:
These have been licensed to the Apache Software Foundation under a software grant.
+ * The module extras/webjars/snorql constains a adapted version of the D2R
+ Snorql Library, which was originally created by Richard Cyganaik for the D2R
+ server project (http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/). It is
+ licensed under the Apache Software License 2.0. The source code is available
+ at http://github.com/kurtjx/SNORQL
-==============================================================================
-Javascript Libraries included in Marmotta Platform
-==============================================================================
+ * The module commons/marmotta-commons contains a modified and reduced version
+ of the Javolution library. Javolution has copyright (c) 2012, Javolution and
+ is licensed under BSD license. The original source code is available at
+ http://javolution.org
-D3.js is copyright (c) 2013, Michael Bostock and licensed under New BSD
-License. The source code is available at https://github.com/mbostock/d3
-
-Source Locations:
-- platform/marmotta-core/src/main/resources/web/admin/js/lib/
-- platform/marmotta-sparql/src/main/resources/web/admin/sgvizler/0.5/lib/
-
-
-The Dracula Graph Library is (c) 2010 by Johann Philipp Strathausen
-<st...@gmail.com> and licensed under MIT License. The source code is
-available at https://github.com/strathausen/dracula
-
-Source Locations:
-- platform/marmotta-core/src/main/resources/web/admin/js/lib/
-
-
-The strftime library is copyright (c) 2008, Philip S Tellis
-<ph...@bluesmoon.info> and licensed under New BSD License. The source code
-is available at http://hacks.bluesmoon.info/strftime/files.html
-
-Source Locations:
-- platform/marmotta-core/src/main/resources/web/public/js/lib
-
-
-The JQuery Library is copyright 2013 jQuery Foundation and other contributors,
-and licensed under MIT License. The source code is available at
-https://github.com/jquery/jquery
-
-Source Locations:
-- platform/marmotta-core/src/main/resources/web/public/js/lib
-
-
-The CodeMirror Library is copyright (C) 2013 by Marijn Haverbeke
-<ma...@gmail.com> and licensed under MIT License. The source code is
-available at https://github.com/marijnh/CodeMirror
-
-Source Locations:
-- platform/marmotta-ldpath/src/main/resources/web/cm
-- platform/marmotta-sparql/src/main/resources/web/cm
-- platform/marmotta-sparql/src/main/resources/web/admin/editor/sparql/lib
-
-
-The D2R Snorql Library was originally created by Richard Cyganaik
-(http://richard.cyganiak.de/) for the D2R server project
-(http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/). It is licensed under the
-Apache Software License 2.0. The source code is available at
-https://github.com/kurtjx/SNORQL
-
-Source Locations:
-- platform/marmotta-sparql/src/main/resources/web/admin/snorql
-
-
-The script.aculo.us library is copyright (c) 2005-2010 Thomas Fuchs and is
-licensed under MIT License. The source code is available at
-https://github.com/madrobby/scriptaculous
-
-Source Locations:
-- platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous
-
-
-The Prototype Library is copyright (c) 2005-2010 Sam Stephenson and is
-licensed under MIT License. The source code is available at
-https://github.com/sstephenson/prototype
-
-Source Locations:
-- platform/marmotta-sparql/src/main/resources/web/admin/snorql
-
-
-The SPARQL Flint Editor is copyright (c) 2011 TSO Ltd and is licensed under
-MIT License. The source code is available at
-https://github.com/TSO-Openup/FlintSparqlEditor
-
-Source Locations:
-- platform/marmotta-sparql/src/main/resources/web/admin/editor/
-
-
-The Sgvizler Library is copyright (c) 2011 Martin G. Skjæveland and is
-licensed under MIT License. The source code is available at
-https://code.google.com/p/sgvizler/source
-
-Source Locations:
-- platform/marmotta-core/src/main/resources/web/admin/js/lib
-- platform/marmotta-sparql/src/main/resources/web/admin/sgvizler
-
-
-==============================================================================
-3rd Party Source Code
-==============================================================================
-
-The module launchers/marmotta-splash contains source code from the projects
-MigLayout and SwingBits, which has the following copyrights:
-
-The MigLayout library is copyright (c) 2004, Mikael Grev, MiG InfoCom AB, and
-licensed under a New BSD License. The source code is available at
-http://www.migcalendar.com/miglayout/versions/
-
-The SwingBits library is copyright (C) 2006 Michael Hjembaek, and licensed
-under a New BSD License. The source code is available at
-http://swingbits.sourceforge.net/
-
-The module commons/marmotta-commons contains a modified and reduced version
-of the javolution library. Javolution has copyright (c) 2012, Javolution and
- is licensed under BSD license. The original source code is available at
-http://javolution.org/
-
-The module commons/sesame-tools-rio-rss contains source code from the
-orphaned ROME project. ROME has copyright 2004 Sun Microsystems, Inc.
-and copyright 2011 The ROME Team, and is licensed under Apache License 2.0.
-The source code is available at
-https://rometools.jira.com/source/browse/ROME/trunk
-
-
-The module commons/sesame-tools-rio-jsonld contains source code from the
-JSONLD-Java project. JSONLD-Java is copyright (c) 2012, Deutsches
-Forschungszentrum für Künstliche Intelligenz GmbH and licensed under a
-New BSD License. The source code is available at
-https://github.com/tristan/jsonld-java
-
-
-==============================================================================
-3rd Party Data Files
-==============================================================================
-
-The test sources for commons/sesame-tools-rio-jsonld contain the data files
-from the JSON-LD Test Suite. The JSON-LD Test Suite is published as public
-domain (with a Creative Commons Zero license and without copyright). The
-source code is available at https://github.com/json-ld/json-ld.org
[33/50] [abbrv] git commit: force shutdown of reasoning engine: don't
wait so long
Posted by ss...@apache.org.
force shutdown of reasoning engine: don't wait so long
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/9cc8d973
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/9cc8d973
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/9cc8d973
Branch: refs/heads/master
Commit: 9cc8d9737e15f782b3c99413c18e112519ce6899
Parents: 4ad75ef
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Sep 13 13:29:30 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Sep 13 13:29:30 2013 +0200
----------------------------------------------------------------------
.../apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/9cc8d973/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
index 0e86f8d..69d6cde 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
@@ -908,10 +908,10 @@ public class ReasoningEngine implements TransactionListener {
reasoningQueue.clear();
reasonerThread.shutdown(true);
- for(int i = 0; i<3 && isRunning(); i++) {
- log.warn("reasoner not yet finished, waiting for 1 seconds (try={})", i+1);
+ for(int i = 0; i<5 && isRunning(); i++) {
+ log.warn("reasoner not yet finished, waiting for 100 ms (try={})", i+1);
try {
- Thread.sleep(1000);
+ Thread.sleep(100);
} catch (InterruptedException e) {
}
}
[46/50] [abbrv] git commit: [maven-release-plugin] prepare release
3.1.0-incubating
Posted by ss...@apache.org.
[maven-release-plugin] prepare release 3.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/c66a4eb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/c66a4eb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/c66a4eb5
Branch: refs/heads/master
Commit: c66a4eb5743820c89fcf0446efab60a50965c6de
Parents: 5ee1483
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 24 16:30:29 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 24 16:30:29 2013 +0200
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 2 +-
build/archetypes/marmotta-archetype-webapp/pom.xml | 2 +-
build/archetypes/pom.xml | 2 +-
build/checkstyle-resources/pom.xml | 2 +-
build/dependency-resource-supplement/pom.xml | 2 +-
build/plugins/buildinfo-maven-plugin/pom.xml | 2 +-
build/plugins/marmotta-maven-plugin/pom.xml | 2 +-
build/plugins/pom.xml | 2 +-
build/plugins/refpack-maven-plugin/pom.xml | 2 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 2 +-
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 2 +-
extras/webjars/codemirror/pom.xml | 2 +-
extras/webjars/pom.xml | 2 +-
extras/webjars/sgvizler/pom.xml | 2 +-
extras/webjars/snorql/pom.xml | 2 +-
extras/webjars/strftime/pom.xml | 2 +-
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-splash/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 2 +-
libraries/kiwi/kiwi-sparql/pom.xml | 2 +-
libraries/kiwi/kiwi-transactions/pom.xml | 2 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 2 +-
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
libraries/kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-api/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-file/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-core/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-facebook/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-html/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-ldap/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdf/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdfa/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-vimeo/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-xml/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-youtube/pom.xml | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
libraries/ldpath/ldpath-core/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
libraries/ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 6 +++++-
platform/marmotta-core/pom.xml | 2 +-
platform/marmotta-ldcache/pom.xml | 2 +-
platform/marmotta-ldpath/pom.xml | 2 +-
platform/marmotta-reasoner/pom.xml | 2 +-
platform/marmotta-security/pom.xml | 2 +-
platform/marmotta-sparql/pom.xml | 2 +-
platform/marmotta-user/pom.xml | 2 +-
platform/marmotta-versioning/pom.xml | 2 +-
platform/pom.xml | 2 +-
pom.xml | 4 ++--
88 files changed, 93 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index 15ab89d..8cc13ff 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index dde1896..bfb2aba 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index bb1c01b..dea4e2a 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>archetypes-reactor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index 2a55e83..0ef41ed 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index d9eb75a..92d77a4 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index df5c3aa..e363329 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index 5126b17..fc86edf 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
<artifactId>plugins-reactor</artifactId>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index d25196d..3a11349 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 4f129c1..0ab97f5 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<artifactId>plugins-reactor</artifactId>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index 3da02ac..c1982b4 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>plugins-reactor</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
<!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>23</version> <relativePath /> -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index b6b8359..a3bd4de 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index b79125f..07ef981 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index 2213ba3..f636502 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index f63e640..0eac626 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index a672ec2..a84fbaf 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 182338c..06ba1eb 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index 1e318d5..36be4ae 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index c7d7532..9dfd8a5 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index 18c3eee..475ae41 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index 3414eed..8ec3e73 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 5dd8f40..0f4a8d8 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index 6d88340..25de2c0 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 393b2de..0be1aef 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index 1a8e2dd..1605757 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/extras/webjars/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml
index 927b81b..2450243 100644
--- a/extras/webjars/pom.xml
+++ b/extras/webjars/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index 8a7a862..a611271 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index 832e8aa..0f8831e 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index 79f8730..6f337ab 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 11b8ec7..5db3648 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index 0d8d859..aea7c89 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 444f55f..60d6f86 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 01fc15b..8aa8a8d 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index ce9fda9..c4bcf84 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index cdc67aa..e76b396 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index 9187873..3ddd37d 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index c76886e..07d3b2d 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index 493383a..ac82859 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index 9f98878..2c8a49d 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
</parent>
<artifactId>kiwi-tripletable</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index 7a3dc74..81c2a4c 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 323b311..665f70d 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index 5cc7128..13dbd08 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index f4db276..0df8bea 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldcache/ldcache-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml
index b613fb8..881b2bf 100644
--- a/libraries/ldcache/ldcache-backend-file/pom.xml
+++ b/libraries/ldcache/ldcache-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldcache/ldcache-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
index a67f0a5..1fab347 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldcache/ldcache-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml
index f406705..6b2c713 100644
--- a/libraries/ldcache/ldcache-core/pom.xml
+++ b/libraries/ldcache/ldcache-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldcache/ldcache-sail-generic/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/pom.xml b/libraries/ldcache/ldcache-sail-generic/pom.xml
index 6556e5b..8ed617e 100644
--- a/libraries/ldcache/ldcache-sail-generic/pom.xml
+++ b/libraries/ldcache/ldcache-sail-generic/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldcache/ldcache-sail-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/pom.xml b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
index e05681f..8c755ea 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml
index b7d126d..26dee79 100644
--- a/libraries/ldcache/pom.xml
+++ b/libraries/ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 22eb397..6873d92 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index 17dd713..de02401 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index 7b044f3..e1526d5 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-provider-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml
index efa9821..8b4a77d 100644
--- a/libraries/ldclient/ldclient-provider-html/pom.xml
+++ b/libraries/ldclient/ldclient-provider-html/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-provider-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml
index 4736c8f..539209e 100644
--- a/libraries/ldclient/ldclient-provider-ldap/pom.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
index a97c354..c2d2d9f 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index c67862f..6719feb 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index ab3355a..fd75822 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-provider-rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdfa/pom.xml b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
index eb1e264..8dcd4b3 100644
--- a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index 541bd79..d1e38fa 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-provider-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml
index 0ff9206..12ebc32 100644
--- a/libraries/ldclient/ldclient-provider-xml/pom.xml
+++ b/libraries/ldclient/ldclient-provider-xml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index 062ce27..43ebc06 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldclient/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml
index a35912e..084786b 100644
--- a/libraries/ldclient/pom.xml
+++ b/libraries/ldclient/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index faacf31..d97b08f 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index a8ebdae..236ff61 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index 30028ce..6338891 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 030d560..5be1f7e 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index b500bc4..da8f536 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index 70738f8..95dd222 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index b2f6704..ac7553a 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index dea27be..62e6fe7 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index d49d490..dc031ad 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index ae8abfa..333fbcc 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 0e9612e..42823a3 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index 0ce6361..57a840d 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index 818b73e..d2a227d 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index a4c680a..a2f5a15 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 99568d2..42eaaa3 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/libraries/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/pom.xml b/libraries/pom.xml
index a3dbffd..9c1079c 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fe6ea61..84f3600 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<packaging>pom</packaging>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<name>Apache Marmotta Parent</name>
<description>Parent POM for the Apache Marmotta project</description>
@@ -1585,4 +1585,8 @@
<tag>3.0.0-incubating</tag>
</scm>
-->
+
+ <scm>
+ <tag>3.1.0-incubating</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index 6ebaaf8..f27b855 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index b73049a..2fac3fb 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index 19a16a0..9178ee7 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index 861a38c..0b0cee3 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 183e65d..3e6f337 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 2e7a6d3..fbe950b 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index a6ac0fb..c8279ec 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index aa64a16..35a0868 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index 8c7a027..3713bab 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c66a4eb5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aaa9f22..ee0fec8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating</version>
<relativePath>parent</relativePath>
</parent>
@@ -124,7 +124,7 @@
<url>https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</url>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>3.1.0-incubating</tag>
</scm>
<issueManagement>
[32/50] [abbrv] git commit: reasoner force shutdown: make sure there
are no more tasks in the queue
Posted by ss...@apache.org.
reasoner force shutdown: make sure there are no more tasks in the queue
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/4ad75ef7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/4ad75ef7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/4ad75ef7
Branch: refs/heads/master
Commit: 4ad75ef7e7b30d3416afb2b8f5e9fafc5cea5204
Parents: 5088304
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Sep 13 13:27:38 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Sep 13 13:27:38 2013 +0200
----------------------------------------------------------------------
.../org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4ad75ef7/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
index 1b189d8..0e86f8d 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
@@ -905,6 +905,7 @@ public class ReasoningEngine implements TransactionListener {
if(force) {
log.warn("forced shutdown of reasoning service initiated, state will be inconsistent ...");
+ reasoningQueue.clear();
reasonerThread.shutdown(true);
for(int i = 0; i<3 && isRunning(); i++) {
[47/50] [abbrv] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by ss...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/c576351a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/c576351a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/c576351a
Branch: refs/heads/master
Commit: c576351a57b4de9d75f6cb8f5eec631666c2a5c2
Parents: c66a4eb
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 24 16:30:30 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 24 16:30:30 2013 +0200
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 2 +-
build/archetypes/marmotta-archetype-webapp/pom.xml | 2 +-
build/archetypes/pom.xml | 2 +-
build/checkstyle-resources/pom.xml | 2 +-
build/dependency-resource-supplement/pom.xml | 2 +-
build/plugins/buildinfo-maven-plugin/pom.xml | 2 +-
build/plugins/marmotta-maven-plugin/pom.xml | 2 +-
build/plugins/pom.xml | 2 +-
build/plugins/refpack-maven-plugin/pom.xml | 2 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 2 +-
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 2 +-
extras/webjars/codemirror/pom.xml | 2 +-
extras/webjars/pom.xml | 2 +-
extras/webjars/sgvizler/pom.xml | 2 +-
extras/webjars/snorql/pom.xml | 2 +-
extras/webjars/strftime/pom.xml | 2 +-
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-splash/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 2 +-
libraries/kiwi/kiwi-sparql/pom.xml | 2 +-
libraries/kiwi/kiwi-transactions/pom.xml | 2 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 2 +-
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
libraries/kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-api/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-file/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-core/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-facebook/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-html/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-ldap/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdf/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdfa/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-vimeo/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-xml/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-youtube/pom.xml | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
libraries/ldpath/ldpath-core/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
libraries/ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 6 +-----
platform/marmotta-core/pom.xml | 2 +-
platform/marmotta-ldcache/pom.xml | 2 +-
platform/marmotta-ldpath/pom.xml | 2 +-
platform/marmotta-reasoner/pom.xml | 2 +-
platform/marmotta-security/pom.xml | 2 +-
platform/marmotta-sparql/pom.xml | 2 +-
platform/marmotta-user/pom.xml | 2 +-
platform/marmotta-versioning/pom.xml | 2 +-
platform/pom.xml | 2 +-
pom.xml | 4 ++--
88 files changed, 89 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index 8cc13ff..f0fd540 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index bfb2aba..b7a424c 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index dea4e2a..8e0a159 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>archetypes-reactor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index 0ef41ed..b3a6a3a 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index 92d77a4..c8f01c2 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index e363329..7b37981 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index fc86edf..ccbf2c7 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<artifactId>plugins-reactor</artifactId>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index 3a11349..9b81934 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 0ab97f5..097efe3 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<artifactId>plugins-reactor</artifactId>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index c1982b4..95fafb3 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>plugins-reactor</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>23</version> <relativePath /> -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index a3bd4de..58d17db 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index 07ef981..fb27410 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index f636502..ff5a67c 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 0eac626..3959563 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index a84fbaf..4e7e229 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 06ba1eb..7104ebe 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index 36be4ae..d228916 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index 9dfd8a5..b490c5a 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index 475ae41..ccde248 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index 8ec3e73..9115052 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 0f4a8d8..619db50 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index 25de2c0..b7a194e 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 0be1aef..281e334 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index 1605757..004f5bd 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/extras/webjars/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml
index 2450243..98034fc 100644
--- a/extras/webjars/pom.xml
+++ b/extras/webjars/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index a611271..30ad9f1 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index 0f8831e..bb286d5 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index 6f337ab..bbf66df 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 5db3648..d2e7902 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index aea7c89..edcd041 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 60d6f86..fb30987 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 8aa8a8d..95fa064 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index c4bcf84..b28547d 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index e76b396..5785642 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index 3ddd37d..f824894 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index 07d3b2d..41fc742 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index ac82859..b8e880a 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index 2c8a49d..c0b297c 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>kiwi-tripletable</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index 81c2a4c..ebed513 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 665f70d..f219e8b 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index 13dbd08..be4cb03 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index 0df8bea..e3270ac 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldcache/ldcache-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml
index 881b2bf..7a6cd94 100644
--- a/libraries/ldcache/ldcache-backend-file/pom.xml
+++ b/libraries/ldcache/ldcache-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
index 1fab347..f638d16 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldcache/ldcache-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml
index 6b2c713..7499cc7 100644
--- a/libraries/ldcache/ldcache-core/pom.xml
+++ b/libraries/ldcache/ldcache-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldcache/ldcache-sail-generic/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/pom.xml b/libraries/ldcache/ldcache-sail-generic/pom.xml
index 8ed617e..b43d08c 100644
--- a/libraries/ldcache/ldcache-sail-generic/pom.xml
+++ b/libraries/ldcache/ldcache-sail-generic/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/pom.xml b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
index 8c755ea..428fe07 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml
index 26dee79..d8de48e 100644
--- a/libraries/ldcache/pom.xml
+++ b/libraries/ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 6873d92..250f7fd 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index de02401..93e5f65 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index e1526d5..17f40b5 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-provider-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml
index 8b4a77d..a78e4d5 100644
--- a/libraries/ldclient/ldclient-provider-html/pom.xml
+++ b/libraries/ldclient/ldclient-provider-html/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-provider-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml
index 539209e..6d0b934 100644
--- a/libraries/ldclient/ldclient-provider-ldap/pom.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
index c2d2d9f..08e8437 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index 6719feb..9a09b52 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index fd75822..5b6df79 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdfa/pom.xml b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
index 8dcd4b3..247df46 100644
--- a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index d1e38fa..f2fc4d7 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-provider-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml
index 12ebc32..5d8deae 100644
--- a/libraries/ldclient/ldclient-provider-xml/pom.xml
+++ b/libraries/ldclient/ldclient-provider-xml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index 43ebc06..1a79aa4 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldclient/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml
index 084786b..e0e2a21 100644
--- a/libraries/ldclient/pom.xml
+++ b/libraries/ldclient/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index d97b08f..f1eff45 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index 236ff61..a5d5c02 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index 6338891..24e946f 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 5be1f7e..978d1af 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index da8f536..ac9b6b9 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index 95dd222..b68926d 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index ac7553a..150c0da 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index 62e6fe7..cecc3cc 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index dc031ad..83a77ed 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index 333fbcc..a7c844c 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 42823a3..39cca2b 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index 57a840d..22d1c42 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index d2a227d..d317f1f 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index a2f5a15..b5a6723 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 42eaaa3..2981dce 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/libraries/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 9c1079c..8c2f6cf 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 84f3600..2bfcc52 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<packaging>pom</packaging>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<name>Apache Marmotta Parent</name>
<description>Parent POM for the Apache Marmotta project</description>
@@ -1585,8 +1585,4 @@
<tag>3.0.0-incubating</tag>
</scm>
-->
-
- <scm>
- <tag>3.1.0-incubating</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index f27b855..a3c5ca4 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index 2fac3fb..b9c52e9 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index 9178ee7..abb6788 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index 0b0cee3..a58c1ee 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 3e6f337..5b47e3c 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index fbe950b..37189dd 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index c8279ec..23b1870 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index 35a0868..77590aa 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index 3713bab..6f1264b 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/c576351a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee0fec8..ae48672 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
@@ -124,7 +124,7 @@
<url>https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</url>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</developerConnection>
- <tag>3.1.0-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
[20/50] [abbrv] git commit: MARMOTTA-155 : Switch to an ill-formed
language tag
Posted by ss...@apache.org.
MARMOTTA-155 : Switch to an ill-formed language tag
The language tag "invalid" is not ill-formed according to BCP47, although it is not registered.
The underlying issue that caused the test to fail was due to the SQL database scheme restriction VARCHAR(5) on the language tag field.
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/a2de373b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/a2de373b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/a2de373b
Branch: refs/heads/master
Commit: a2de373bd4f4c937cae38a59747cce1951b3b10b
Parents: 647cbae
Author: Peter Ansell <p_...@yahoo.com>
Authored: Thu Sep 12 17:06:24 2013 +1000
Committer: Peter Ansell <p_...@yahoo.com>
Committed: Thu Sep 12 17:06:24 2013 +1000
----------------------------------------------------------------------
.../java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/a2de373b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
index 4ce351b..cbdbee4 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/KiWiLocaleTest.java
@@ -79,7 +79,7 @@ public class KiWiLocaleTest {
*/
@Test
public void createBCP47LiteralsInvalidTests() {
- Literal invalidLangLiteral = vf.createLiteral("Hungary", "invalid");
+ Literal invalidLangLiteral = vf.createLiteral("Hungary", "invalid-bcp47-languagetag");
Assert.assertEquals("Hungary", invalidLangLiteral.getLabel());
Assert.assertNull(invalidLangLiteral.getLanguage());
}
[50/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Posted by ss...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/a9bf7e4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/a9bf7e4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/a9bf7e4f
Branch: refs/heads/master
Commit: a9bf7e4fa56f00e26e09a5fae002686eb65631df
Parents: be31f8a cdb3223
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Sep 30 18:41:26 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Sep 30 18:41:26 2013 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/50] [abbrv] git commit: add an additional test to verity that the
error described in MARMOTTA-283 does not happen anymore (or at least cannot
reproduced)
Posted by ss...@apache.org.
add an additional test to verity that the error described in MARMOTTA-283 does not happen anymore (or at least cannot reproduced)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/213495cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/213495cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/213495cc
Branch: refs/heads/master
Commit: 213495ccd5846b2c6a130bad9bb5eabb3d9cd1af
Parents: 58baf97
Author: tkurz <tk...@apache.org>
Authored: Wed Sep 11 11:12:54 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Wed Sep 11 11:12:54 2013 +0200
----------------------------------------------------------------------
.../marmotta/kiwi/test/RepositoryTest.java | 80 ++++++++++++++++++++
1 file changed, 80 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/213495cc/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
index 9d2fd3d..f18413f 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
@@ -672,4 +672,84 @@ public class RepositoryTest {
}
}
+ /**
+ * This test is for a strange bug that happens when running SPARQL updates that delete and reinsert a triple in
+ * the same transaction. It is similar to #testMARMOTTA283, but simulates the issue in more detail.
+ * See https://issues.apache.org/jira/browse/MARMOTTA-283
+ */
+ @Test
+ public void testMARMOTTA283_2() throws RepositoryException, RDFParseException, IOException, MalformedQueryException, UpdateExecutionException {
+
+ //insert quadruples
+ String insert =
+ "WITH <http://resource.org/video>" +
+ "INSERT {" +
+ " <http://resource.org/video> <http://ontology.org#hasFragment> <http://resource.org/fragment1>." +
+ " <http://resource.org/annotation1> <http://ontology.org#hasTarget> <http://resource.org/fragment1>." +
+ " <http://resource.org/annotation1> <http://ontology.org#hasBody> <http://resource.org/subject1>." +
+ " <http://resource.org/fragment1> <http://ontology.org#shows> <http://resource.org/subject1>." +
+ "} WHERE {}";
+
+ RepositoryConnection connectionInsert = repository.getConnection();
+ try {
+ Update u = connectionInsert.prepareUpdate(QueryLanguage.SPARQL, insert);
+ u.execute();
+ connectionInsert.commit();
+ } finally {
+ connectionInsert.close();
+ }
+
+ //update quadruples
+ String update =
+ "WITH <http://resource.org/video>" +
+ "DELETE { " +
+ " ?annotation ?p ?v." +
+ " ?fragment ?r ?s." +
+ " <http://resource.org/video> <http://ontology.org#hasFragment> ?fragment." +
+ "} INSERT {" +
+ " <http://resource.org/video> <http://ontology.org#hasFragment> <http://resource.org/fragment1>." +
+ " <http://resource.org/annotation1> <http://ontology.org#hasTarget> <http://resource.org/fragment1>." +
+ " <http://resource.org/annotation1> <http://ontology.org#hasBody> <http://resource.org/subject1>." +
+ " <http://resource.org/fragment1> <http://ontology.org#shows> <http://resource.org/subject1>." +
+ "} WHERE {" +
+ " ?annotation <http://ontology.org#hasTarget> ?fragment." +
+ " ?annotation ?p ?v." +
+ " OPTIONAL {" +
+ " ?fragment ?r ?s" +
+ " }" +
+ " FILTER (?fragment = <http://resource.org/fragment1>)" +
+ "} ";
+
+ RepositoryConnection connectionUpdate = repository.getConnection();
+ try {
+ Update u = connectionUpdate.prepareUpdate(QueryLanguage.SPARQL, update);
+ u.execute();
+ connectionUpdate.commit();
+ } finally {
+ connectionUpdate.close();
+ }
+
+ //check quadruples
+ RepositoryConnection connectionVerify = repository.getConnection();
+ try {
+ URI video = repository.getValueFactory().createURI("http://resource.org/video");
+ URI hasFragment = repository.getValueFactory().createURI("http://ontology.org#hasFragment");
+ URI fragment = repository.getValueFactory().createURI("http://resource.org/fragment1");
+ URI annotation = repository.getValueFactory().createURI("http://resource.org/annotation1");
+ URI hasTarget = repository.getValueFactory().createURI("http://ontology.org#hasTarget");
+ URI hasBody = repository.getValueFactory().createURI("http://ontology.org#hasBody");
+ URI subject = repository.getValueFactory().createURI("http://resource.org/subject1");
+ URI shows = repository.getValueFactory().createURI("http://ontology.org#shows");
+
+ Assert.assertTrue(connectionVerify.hasStatement(video,hasFragment,fragment,true,video));
+ Assert.assertTrue(connectionVerify.hasStatement(annotation,hasTarget,fragment,true,video));
+ Assert.assertTrue(connectionVerify.hasStatement(annotation,hasBody,subject,true,video));
+ Assert.assertTrue(connectionVerify.hasStatement(fragment,shows,subject,true,video));
+
+ connectionVerify.commit();
+ } finally {
+ connectionVerify.close();
+ }
+ }
+
}
[49/50] [abbrv] git commit: with the new ID generators the assumption
that the first created object always has ID 1 no longer holds,
so updated the tests
Posted by ss...@apache.org.
with the new ID generators the assumption that the first created object always has ID 1 no longer holds, so updated the tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/be31f8a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/be31f8a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/be31f8a7
Branch: refs/heads/master
Commit: be31f8a736c8ae7b42ff194992b503b7ae0159a4
Parents: 4b8b868
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Sep 30 18:26:01 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Sep 30 18:26:01 2013 +0200
----------------------------------------------------------------------
.../test/VersioningPersistenceTest.java | 24 ++++++------------
.../test/VersioningRepositoryTest.java | 26 ++++++++------------
2 files changed, 17 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/be31f8a7/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
index 49277a2..6697704 100644
--- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
+++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
@@ -17,13 +17,7 @@
*/
package org.apache.marmotta.kiwi.versioning.test;
-import static org.hamcrest.Matchers.hasItems;
import info.aduna.iteration.Iterations;
-
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
-
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.model.rdf.KiWiStringLiteral;
@@ -38,15 +32,17 @@ import org.apache.marmotta.kiwi.versioning.persistence.KiWiVersioningPersistence
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
+import static org.hamcrest.Matchers.hasItems;
+
/**
* This test checks if the database persistence for the versioning functionality works properly.
*
@@ -136,13 +132,11 @@ public class VersioningPersistenceTest {
List<Version> list1 = Iterations.asList(connection.listVersions());
Assert.assertEquals("there should be exactly one version",1,list1.size());
Assert.assertEquals("contents of version differ", version1, list1.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)list1.get(0).getId());
// check if listVersions with subject1 now gives exactly one version
List<Version> listr1 = Iterations.asList(connection.listVersions(subject1));
Assert.assertEquals("there should be exactly one version", 1, listr1.size());
Assert.assertEquals("contents of version differ", version1, listr1.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)listr1.get(0).getId());
Version version2 = new Version();
@@ -162,7 +156,6 @@ public class VersioningPersistenceTest {
List<Version> listr2 = Iterations.asList(connection.listVersions(subject1));
Assert.assertEquals("there should be exactly one version", 2, listr2.size());
Assert.assertEquals("contents of version differ", version1, listr2.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)listr2.get(0).getId());
connection.commit();
} finally {
@@ -239,7 +232,6 @@ public class VersioningPersistenceTest {
List<Version> list1 = Iterations.asList(connection.listVersions(date1,date2));
Assert.assertEquals("there should be exactly one version from "+date1+" to "+date2,1,list1.size());
Assert.assertEquals("contents of version differ", version1, list1.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)list1.get(0).getId());
// check if getLatestVersion at date2 works
Version latest2 = connection.getLatestVersion(subject,date2);
@@ -250,13 +242,12 @@ public class VersioningPersistenceTest {
List<Version> listr1 = Iterations.asList(connection.listVersions(subject,date1,date2));
Assert.assertEquals("there should be exactly one version", 1, listr1.size());
Assert.assertEquals("contents of version differ", version1, listr1.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)listr1.get(0).getId());
List<Version> list2 = Iterations.asList(connection.listVersions(date2,date3));
Assert.assertEquals("there should be exactly one version from "+date2+" to "+date3,1,list2.size());
Assert.assertEquals("contents of version differ", version2, list2.get(0));
- Assert.assertEquals("version id is not 2", 2L, (long)list2.get(0).getId());
+ Assert.assertTrue("order of versions is not correct", version1.getId() < (long) list2.get(0).getId());
List<Version> list3 = Iterations.asList(connection.listVersions(date3,new Date()));
Assert.assertEquals("there should be no version from "+date3+" to now",0,list3.size());
@@ -313,7 +304,6 @@ public class VersioningPersistenceTest {
List<Version> list1 = Iterations.asList(connection.listVersions());
Assert.assertEquals("there should be exactly one version",1,list1.size());
Assert.assertEquals("contents of version differ", version1, list1.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)list1.get(0).getId());
Version version2 = new Version();
version2.setCommitTime(new Date());
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/be31f8a7/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java
index 76f8375..a1830f7 100644
--- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java
+++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java
@@ -17,15 +17,7 @@
*/
package org.apache.marmotta.kiwi.versioning.test;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assume.assumeThat;
import info.aduna.iteration.Iterations;
-
-import java.io.InputStream;
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
-
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect;
import org.apache.marmotta.kiwi.sail.KiWiStore;
@@ -36,10 +28,7 @@ import org.apache.marmotta.kiwi.versioning.sail.KiWiVersioningSail;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
import org.junit.runner.RunWith;
import org.openrdf.model.URI;
import org.openrdf.repository.Repository;
@@ -51,6 +40,14 @@ import org.openrdf.rio.RDFFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.InputStream;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assume.assumeThat;
+
/**
* This test checks if the versioning functionality itself works, i.e. the system properly creates versions on
* transaction commits.
@@ -152,16 +149,14 @@ public class VersioningRepositoryTest {
// list all versions
List<Version> versions = asList(vsail.listVersions());
Assert.assertEquals("expected 3 versions!", 3, versions.size());
- Assert.assertEquals(1, (long)versions.get(0).getId());
- Assert.assertEquals(2, (long)versions.get(1).getId());
- Assert.assertEquals(3, (long)versions.get(2).getId());
+ Assert.assertTrue("version order is not correct", versions.get(0).getId() < versions.get(1).getId());
+ Assert.assertTrue("version order is not correct", versions.get(1).getId() < versions.get(2).getId());
Assert.assertEquals(3, (long)versions.get(0).getAddedTriples().size());
Assert.assertEquals(3, (long)versions.get(1).getAddedTriples().size());
Assert.assertEquals(1, (long)versions.get(2).getAddedTriples().size());
List<Version> versions1 = asList(vsail.listVersions(date1,date2));
Assert.assertEquals("expected 1 version!", 1, versions1.size());
- Assert.assertEquals(1, (long)versions1.get(0).getId());
Assert.assertEquals(3, (long)versions1.get(0).getAddedTriples().size());
}
@@ -224,7 +219,6 @@ public class VersioningRepositoryTest {
// list all versions
List<Version> versions = asList(vsail.listVersions());
Assert.assertEquals("expected 3 versions!", 3, versions.size());
- Assert.assertEquals(1, (long)versions.get(0).getId());
URI subject = repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/R1");
URI predicate = repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/P2");
[06/50] [abbrv] git commit: renamed RdfPathParser to LdPathParser
Posted by ss...@apache.org.
renamed RdfPathParser to LdPathParser
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/6591259a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/6591259a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/6591259a
Branch: refs/heads/master
Commit: 6591259a44ba5ec66f71ef1c8ac47791a5d43d29
Parents: 55e05ef
Author: Jakob Frank <ja...@apache.org>
Authored: Mon Sep 9 15:57:12 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Sep 10 12:30:34 2013 +0200
----------------------------------------------------------------------
.../ldpath/backend/file/ParserTest.java | 6 ++--
.../java/org/apache/marmotta/ldpath/LDPath.java | 12 ++++----
.../at/newmedialab/ldpath/parser/rdfpath.jj | 22 +++++++-------
.../BinaryNumericTestFunctionsTest.java | 4 +--
.../ldpath/model/functions/FunctionsTest.java | 16 +++++------
.../marmotta/ldpath/parser/ParserTest.java | 10 +++----
.../marmotta/ldpath/parser/ProgramTest.java | 2 +-
.../marmotta/ldpath/parser/SelectorsTest.java | 2 +-
.../marmotta/ldpath/parser/TestsTest.java | 2 +-
.../marmotta/ldpath/test/AbstractTestBase.java | 14 ++++-----
.../model/functions/date/DateFunctionsTest.java | 6 ++--
.../model/functions/html/HtmlFunctionsTest.java | 8 +++---
.../model/functions/math/MathFunctionTest.java | 30 ++++++++++----------
.../tests/functions/text/StringTestTest.java | 4 +--
.../xml/RemoveXmlTagsFunctionTest.java | 4 +--
.../model/functions/xml/XPathFunctionTest.java | 4 +--
16 files changed, 73 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java b/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java
index 6872c4c..11d96f5 100644
--- a/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java
+++ b/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java
@@ -30,7 +30,7 @@ import org.apache.marmotta.ldpath.model.selectors.TestingSelector;
import org.apache.marmotta.ldpath.model.selectors.UnionSelector;
import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -83,7 +83,7 @@ public class ParserTest {
}
private NodeSelector<Value> parseSelector(String selector, Map<String,String> namespaces) throws ParseException {
- return new RdfPathParser<Value>(backend,new StringReader(selector)).parseSelector(namespaces);
+ return new LdPathParser<Value>(backend,new StringReader(selector)).parseSelector(namespaces);
}
@Test
@@ -114,7 +114,7 @@ public class ParserTest {
}
private Program<Value> parseProgram(String selector) throws ParseException {
- return new RdfPathParser<Value>(backend,new StringReader(selector)).parseProgram();
+ return new LdPathParser<Value>(backend,new StringReader(selector)).parseProgram();
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
index bc46c41..29cf999 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
@@ -36,7 +36,7 @@ import org.apache.marmotta.ldpath.model.programs.Program;
import org.apache.marmotta.ldpath.parser.Configuration;
import org.apache.marmotta.ldpath.parser.DefaultConfiguration;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -104,7 +104,7 @@ public class LDPath<Node> {
* @throws LDPathParseException when the path passed as argument is not valid
*/
public Collection<Node> pathQuery(Node context, String path, Map<String, String> namespaces) throws LDPathParseException {
- RdfPathParser<Node> parser = new RdfPathParser<Node>(backend,config,new StringReader(path));
+ LdPathParser<Node> parser = new LdPathParser<Node>(backend,config,new StringReader(path));
for(SelectorFunction<Node> function : functions) {
parser.registerFunction(function);
}
@@ -150,7 +150,7 @@ public class LDPath<Node> {
* @throws LDPathParseException when the path passed as argument is not valid
*/
public Collection<Node> pathQuery(Node context, String path, Map<String, String> namespaces, Map<Node,List<Node>> paths) throws LDPathParseException {
- RdfPathParser<Node> parser = new RdfPathParser<Node>(backend,config,new StringReader(path));
+ LdPathParser<Node> parser = new LdPathParser<Node>(backend,config,new StringReader(path));
for(SelectorFunction<Node> function : functions) {
parser.registerFunction(function);
}
@@ -194,7 +194,7 @@ public class LDPath<Node> {
* @throws LDPathParseException when the path passed as argument is not valid
*/
public <T> Collection<T> pathTransform(Node context, String path, Map<String, String> namespaces) throws LDPathParseException {
- RdfPathParser<Node> parser = new RdfPathParser<Node>(backend,config,new StringReader(path));
+ LdPathParser<Node> parser = new LdPathParser<Node>(backend,config,new StringReader(path));
for(SelectorFunction<Node> function : functions) {
parser.registerFunction(function);
}
@@ -223,7 +223,7 @@ public class LDPath<Node> {
* @throws LDPathParseException
*/
public Map<String,Collection<?>> programQuery(Node context, Reader program) throws LDPathParseException {
- RdfPathParser<Node> parser = new RdfPathParser<Node>(backend,config,program);
+ LdPathParser<Node> parser = new LdPathParser<Node>(backend,config,program);
for(SelectorFunction<Node> function : functions) {
parser.registerFunction(function);
}
@@ -255,7 +255,7 @@ public class LDPath<Node> {
* @throws LDPathParseException
*/
public Program<Node> parseProgram(Reader program) throws LDPathParseException {
- RdfPathParser<Node> parser = new RdfPathParser<Node>(backend,config,program);
+ LdPathParser<Node> parser = new LdPathParser<Node>(backend,config,program);
for(SelectorFunction<Node> function : functions) {
parser.registerFunction(function);
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-core/src/main/javacc/at/newmedialab/ldpath/parser/rdfpath.jj
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/javacc/at/newmedialab/ldpath/parser/rdfpath.jj b/libraries/ldpath/ldpath-core/src/main/javacc/at/newmedialab/ldpath/parser/rdfpath.jj
index 0fd1c44..bd0e133 100644
--- a/libraries/ldpath/ldpath-core/src/main/javacc/at/newmedialab/ldpath/parser/rdfpath.jj
+++ b/libraries/ldpath/ldpath-core/src/main/javacc/at/newmedialab/ldpath/parser/rdfpath.jj
@@ -26,7 +26,7 @@ options
// DEBUG_LOOKAHEAD=true;
}
-PARSER_BEGIN(RdfPathParser)
+PARSER_BEGIN(LdPathParser)
package org.apache.marmotta.ldpath.parser;
import org.apache.marmotta.ldpath.model.Constants;
@@ -65,12 +65,12 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("all")
-public class RdfPathParser<Node> {
+public class LdPathParser<Node> {
private enum Mode { RULE, SELECTOR, TEST, PROGRAM, PREFIX };
- private static final Logger log = LoggerFactory.getLogger(RdfPathParser.class);
+ private static final Logger log = LoggerFactory.getLogger(LdPathParser.class);
/**
* A map mapping from namespace prefix to namespace URI
@@ -83,11 +83,11 @@ public class RdfPathParser<Node> {
private Mode mode = Mode.PROGRAM;
- public RdfPathParser(NodeBackend<Node> backend, Reader in) {
+ public LdPathParser(NodeBackend<Node> backend, Reader in) {
this(backend,null,in);
}
- public RdfPathParser(NodeBackend<Node> backend, Configuration config, Reader in) {
+ public LdPathParser(NodeBackend<Node> backend, Configuration config, Reader in) {
this(in);
this.backend = backend;
if(config == null) {
@@ -99,11 +99,11 @@ public class RdfPathParser<Node> {
initialise();
}
- public RdfPathParser(NodeBackend<Node> backend, InputStream in) {
+ public LdPathParser(NodeBackend<Node> backend, InputStream in) {
this(backend,null,in);
}
- public RdfPathParser(NodeBackend<Node> backend, Configuration config, InputStream in) {
+ public LdPathParser(NodeBackend<Node> backend, Configuration config, InputStream in) {
this(in);
this.backend = backend;
if(config == null) {
@@ -115,11 +115,11 @@ public class RdfPathParser<Node> {
initialise();
}
- public RdfPathParser(NodeBackend<Node> backend, InputStream in, String encoding) {
+ public LdPathParser(NodeBackend<Node> backend, InputStream in, String encoding) {
this(backend,null,in,encoding);
}
- public RdfPathParser(NodeBackend<Node> backend, Configuration config, InputStream in, String encoding) {
+ public LdPathParser(NodeBackend<Node> backend, Configuration config, InputStream in, String encoding) {
this(in,encoding);
this.backend = backend;
if(config == null) {
@@ -290,7 +290,7 @@ public class RdfPathParser<Node> {
private Map<String, SelectorFunction<Node>> xsdNodeFunctionMap;
- private Map<String, TestFunction<Node>> xsdNodeTestMap;
+ private Map<String, TestFunction<Node>> xsdNodeTestMap;
private void initFunctionMappings() {
Map<String, SelectorFunction<Node>> functionMap = new HashMap<String, SelectorFunction<Node>>();
@@ -334,7 +334,7 @@ public class RdfPathParser<Node> {
}
}
-PARSER_END(RdfPathParser)
+PARSER_END(LdPathParser)
SKIP :
{
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/model/functions/BinaryNumericTestFunctionsTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/model/functions/BinaryNumericTestFunctionsTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/model/functions/BinaryNumericTestFunctionsTest.java
index b471e30..948d5c4 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/model/functions/BinaryNumericTestFunctionsTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/model/functions/BinaryNumericTestFunctionsTest.java
@@ -29,7 +29,7 @@ import java.util.List;
import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import org.apache.marmotta.ldpath.test.AbstractTestBase;
import org.junit.Before;
import org.junit.Test;
@@ -96,7 +96,7 @@ public class BinaryNumericTestFunctionsTest extends AbstractTestBase {
}
- final RdfPathParser<Value> parser = createParserFromString("ex:hasItem[" + fkt + "(foo:left, foo:right)]");
+ final LdPathParser<Value> parser = createParserFromString("ex:hasItem[" + fkt + "(foo:left, foo:right)]");
final NodeSelector<Value> sel = parser.parseSelector(NSS);
final Collection<Value> result = sel.select(backend, start, null, null);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/model/functions/FunctionsTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/model/functions/FunctionsTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/model/functions/FunctionsTest.java
index 8caced2..7df1621 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/model/functions/FunctionsTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/model/functions/FunctionsTest.java
@@ -29,7 +29,7 @@ import java.util.Collection;
import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
import org.apache.marmotta.ldpath.model.fields.FieldMapping;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import org.apache.marmotta.ldpath.test.AbstractTestBase;
import org.hamcrest.CoreMatchers;
import org.junit.Before;
@@ -53,7 +53,7 @@ public class FunctionsTest extends AbstractTestBase {
@Test
public void testConcat() throws ParseException {
- RdfPathParser<Value> parser = createParserFromString("fn:concat(foo:title, \" \", foo:subtitle) :: xsd:string; ");
+ LdPathParser<Value> parser = createParserFromString("fn:concat(foo:title, \" \", foo:subtitle) :: xsd:string; ");
final URI context = repository.getValueFactory().createURI("http://www.example.com/1");
final FieldMapping<Object, Value> field = parser.parseRule(NSS);
@@ -67,7 +67,7 @@ public class FunctionsTest extends AbstractTestBase {
final URI ctx1 = repository.getValueFactory().createURI("http://www.example.com/1");
final URI ctx2 = repository.getValueFactory().createURI("http://www.example.com/2");
- RdfPathParser<Value> parser = createParserFromString("fn:first(foo:not_valid, foo:title, foo:subtitle, foo:not_valid2) :: xsd:string; ");
+ LdPathParser<Value> parser = createParserFromString("fn:first(foo:not_valid, foo:title, foo:subtitle, foo:not_valid2) :: xsd:string; ");
final FieldMapping<Object, Value> field = parser.parseRule(NSS);
final Collection<Object> result = field.getValues(backend, ctx1);
@@ -84,7 +84,7 @@ public class FunctionsTest extends AbstractTestBase {
final URI ctx1 = repository.getValueFactory().createURI("http://www.example.com/1");
final URI ctx2 = repository.getValueFactory().createURI("http://www.example.com/2");
- RdfPathParser<Value> parser = createParserFromString("fn:first(foo:i) :: xsd:int; ");
+ LdPathParser<Value> parser = createParserFromString("fn:first(foo:i) :: xsd:int; ");
final FieldMapping<Object, Value> field = parser.parseRule(NSS);
final Collection<Object> result = field.getValues(backend, ctx1);
@@ -101,7 +101,7 @@ public class FunctionsTest extends AbstractTestBase {
final URI ctx1 = repository.getValueFactory().createURI("http://www.example.com/1");
final URI ctx2 = repository.getValueFactory().createURI("http://www.example.com/2");
- RdfPathParser<Value> parser = createParserFromString("fn:last(foo:not_valid, foo:title, foo:subtitle, foo:not_valid2) :: xsd:string; ");
+ LdPathParser<Value> parser = createParserFromString("fn:last(foo:not_valid, foo:title, foo:subtitle, foo:not_valid2) :: xsd:string; ");
final FieldMapping<Object, Value> field = parser.parseRule(NSS);
final Collection<Object> result = field.getValues(backend, ctx1);
@@ -118,7 +118,7 @@ public class FunctionsTest extends AbstractTestBase {
final URI ctx1 = repository.getValueFactory().createURI("http://www.example.com/1");
final URI ctx2 = repository.getValueFactory().createURI("http://www.example.com/2");
- RdfPathParser<Value> parser = createParserFromString("fn:last(foo:i, ex:not_here) :: xsd:int; ");
+ LdPathParser<Value> parser = createParserFromString("fn:last(foo:i, ex:not_here) :: xsd:int; ");
final FieldMapping<Object, Value> field = parser.parseRule(NSS);
final Collection<Object> result = field.getValues(backend, ctx1);
@@ -136,14 +136,14 @@ public class FunctionsTest extends AbstractTestBase {
final URI ex1 = repository.getValueFactory().createURI("http://www.example.com/1");
final URI ex2 = repository.getValueFactory().createURI("http://www.example.com/2");
- final RdfPathParser<Value> parser = createParserFromString("ex:hasItem[fn:eq(foo:i, foo:j)]");
+ final LdPathParser<Value> parser = createParserFromString("ex:hasItem[fn:eq(foo:i, foo:j)]");
final NodeSelector<Value> sel = parser.parseSelector(NSS);
final Collection<Value> result = sel.select(backend, start, null, null);
assertEquals(1, result.size());
assertThat(result, allOf(hasItem(ex2), not(hasItem(ex1))));
- final RdfPathParser<Value> parseri = createParserFromString("ex:hasItem[! fn:eq(foo:i, foo:j)]");
+ final LdPathParser<Value> parseri = createParserFromString("ex:hasItem[! fn:eq(foo:i, foo:j)]");
final NodeSelector<Value> seli = parseri.parseSelector(NSS);
final Collection<Value> resulti = seli.select(backend, start, null, null);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
index 8d2c13f..d7b401a 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ParserTest.java
@@ -66,7 +66,7 @@ public class ParserTest {
@Test
public void testParseProgram() throws IOException {
- RdfPathParser<String> parser = createParser("program.ldpath");
+ LdPathParser<String> parser = createParser("program.ldpath");
try {
Program<String> program = parser.parseProgram();
assertNotNull(program.getField("path"));
@@ -86,7 +86,7 @@ public class ParserTest {
@Test
public void testParseTest() throws IOException {
- RdfPathParser<String> parser = createParser("test.ldpath");
+ LdPathParser<String> parser = createParser("test.ldpath");
try {
NodeTest<String> test = parser.parseTest(NAMESPACES);
assertNotNull(test);
@@ -98,7 +98,7 @@ public class ParserTest {
@Test
public void testParsePrefixes() throws IOException {
- RdfPathParser<String> parser = createParser("namespaces.ldpath");
+ LdPathParser<String> parser = createParser("namespaces.ldpath");
try {
Map<String, String> prefixes = parser.parsePrefixes();
assertTrue(prefixes.containsKey("test"));
@@ -113,11 +113,11 @@ public class ParserTest {
}
- private RdfPathParser<String> createParser(String input) throws IOException {
+ private LdPathParser<String> createParser(String input) throws IOException {
final URL resource = ParserTest.class.getResource("/parse/"+input);
assertThat("Could not load test input data '" + input + "'", resource, CoreMatchers.notNullValue());
- RdfPathParser<String> rdfPathParser = new RdfPathParser<String>(backend,new StringReader(IOUtils.toString(resource)));
+ LdPathParser<String> rdfPathParser = new LdPathParser<String>(backend,new StringReader(IOUtils.toString(resource)));
rdfPathParser.registerTransformer(NS_TEST + "type", new NodeTransformer<String, String>() {
@Override
public String transform(RDFBackend<String> backend, String node, Map<String,String> configuration)
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
index 0ee7311..ff7e6d1 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/ProgramTest.java
@@ -39,7 +39,7 @@ public class ProgramTest {
expr = IOUtils.toString(resource);
- RdfPathParser<String> rdfPathParser = new RdfPathParser<String>(backend,new StringReader(expr));
+ LdPathParser<String> rdfPathParser = new LdPathParser<String>(backend,new StringReader(expr));
rdfPathParser.registerTransformer("http://example.com/type", new NodeTransformer<String, String>() {
@Override
public String transform(RDFBackend<String> backend, String node, Map<String,String> configuration)
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/SelectorsTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/SelectorsTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/SelectorsTest.java
index 321705b..4ac44b5 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/SelectorsTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/SelectorsTest.java
@@ -58,7 +58,7 @@ public class SelectorsTest {
@Before
public void before() throws ParseException {
- RdfPathParser<String> rdfPathParser = new RdfPathParser<String>(backend,new StringReader(expr));
+ LdPathParser<String> rdfPathParser = new LdPathParser<String>(backend,new StringReader(expr));
selector = rdfPathParser.parseSelector(Collections.<String,String>emptyMap());
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/TestsTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/TestsTest.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/TestsTest.java
index df5410a..1b2ce9d 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/TestsTest.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/parser/TestsTest.java
@@ -53,7 +53,7 @@ public class TestsTest {
@Before
public void before() throws ParseException {
- RdfPathParser<String> rdfPathParser = new RdfPathParser<String>(backend,new StringReader(expr));
+ LdPathParser<String> rdfPathParser = new LdPathParser<String>(backend,new StringReader(expr));
test = rdfPathParser.parseTest(Collections.<String,String>emptyMap());
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/test/AbstractTestBase.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/test/AbstractTestBase.java b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/test/AbstractTestBase.java
index 2fac58d..e1acd89 100644
--- a/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/test/AbstractTestBase.java
+++ b/libraries/ldpath/ldpath-core/src/test/java/org/apache/marmotta/ldpath/test/AbstractTestBase.java
@@ -35,7 +35,7 @@ import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
import org.apache.marmotta.ldpath.backend.sesame.SesameRepositoryBackend;
import org.apache.marmotta.ldpath.model.fields.FieldMapping;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import org.hamcrest.CoreMatchers;
import org.junit.After;
import org.junit.Assert;
@@ -108,18 +108,18 @@ public abstract class AbstractTestBase {
};
- protected RdfPathParser<Value> createParserFromResource(String input) throws IOException {
+ protected LdPathParser<Value> createParserFromResource(String input) throws IOException {
final URL resource = this.getClass().getResource(input);
assertThat("Could not load test input data '" + input + "'", resource, CoreMatchers.notNullValue());
- RdfPathParser<Value> parser = new RdfPathParser<Value>(backend, resource.openStream());
+ LdPathParser<Value> parser = new LdPathParser<Value>(backend, resource.openStream());
assertThat("Could not parse ldPath", parser, CoreMatchers.notNullValue());
return parser;
}
- protected RdfPathParser<Value> createParserFromString(String program) {
- final RdfPathParser<Value> parser = new RdfPathParser<Value>(backend, new StringReader(program));
+ protected LdPathParser<Value> createParserFromString(String program) {
+ final LdPathParser<Value> parser = new LdPathParser<Value>(backend, new StringReader(program));
assertThat("Could not parse ldPath", parser, CoreMatchers.notNullValue());
return parser;
@@ -146,7 +146,7 @@ public abstract class AbstractTestBase {
}
protected Collection<Object> evaluateRule(final String ldPath, URI context) throws ParseException {
- final RdfPathParser<Value> parser = createParserFromString(ldPath);
+ final LdPathParser<Value> parser = createParserFromString(ldPath);
final FieldMapping<Object, Value> rule = parser.parseRule(NSS);
final Collection<Object> values = rule.getValues(backend, context);
return values;
@@ -166,7 +166,7 @@ public abstract class AbstractTestBase {
}
protected Collection<Value> evaluateSelector(final String ldPath, URI context) throws ParseException {
- final RdfPathParser<Value> parser = createParserFromString(ldPath);
+ final LdPathParser<Value> parser = createParserFromString(ldPath);
final NodeSelector<Value> sel = parser.parseSelector(NSS);
final Collection<Value> nodes = sel.select(backend, context, null, null);
return nodes;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java b/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
index 69dc472..ea8c9e8 100644
--- a/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
+++ b/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
@@ -24,7 +24,7 @@ import java.util.Random;
import org.apache.marmotta.ldpath.model.fields.FieldMapping;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import org.apache.marmotta.ldpath.test.AbstractTestBase;
import org.junit.Assert;
import org.junit.Before;
@@ -76,7 +76,7 @@ public class DateFunctionsTest extends AbstractTestBase {
@Test
public void testEarliest() throws ParseException {
- final RdfPathParser<Value> parser = createParserFromString("fn:earliest(<" + prop.stringValue() + ">) :: xsd:dateTime");
+ final LdPathParser<Value> parser = createParserFromString("fn:earliest(<" + prop.stringValue() + ">) :: xsd:dateTime");
final FieldMapping<Object, Value> rule = parser.parseRule(NSS);
final Collection<Object> result = rule.getValues(backend, uri);
@@ -88,7 +88,7 @@ public class DateFunctionsTest extends AbstractTestBase {
@Test
public void testLatest() throws ParseException {
- final RdfPathParser<Value> parser = createParserFromString("fn:latest(<" + prop.stringValue() + ">) :: xsd:dateTime");
+ final LdPathParser<Value> parser = createParserFromString("fn:latest(<" + prop.stringValue() + ">) :: xsd:dateTime");
final FieldMapping<Object, Value> rule = parser.parseRule(NSS);
final Collection<Object> result = rule.getValues(backend, uri);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-functions-html/src/test/java/org/apache/marmotta/ldpath/model/functions/html/HtmlFunctionsTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/src/test/java/org/apache/marmotta/ldpath/model/functions/html/HtmlFunctionsTest.java b/libraries/ldpath/ldpath-functions-html/src/test/java/org/apache/marmotta/ldpath/model/functions/html/HtmlFunctionsTest.java
index d663924..29f5426 100644
--- a/libraries/ldpath/ldpath-functions-html/src/test/java/org/apache/marmotta/ldpath/model/functions/html/HtmlFunctionsTest.java
+++ b/libraries/ldpath/ldpath-functions-html/src/test/java/org/apache/marmotta/ldpath/model/functions/html/HtmlFunctionsTest.java
@@ -27,7 +27,7 @@ import java.util.Collection;
import org.apache.marmotta.ldpath.model.fields.FieldMapping;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import org.apache.marmotta.ldpath.test.AbstractTestBase;
import org.hamcrest.CoreMatchers;
import org.junit.Before;
@@ -50,7 +50,7 @@ public class HtmlFunctionsTest extends AbstractTestBase {
public void testCleanHtmlFunction() throws ParseException {
URI uri = repository.getValueFactory().createURI(NSS.get("ex") + "Simple");
- final RdfPathParser<Value> parser = createParserFromString("fn:cleanHtml(foo:html) :: xsd:string");
+ final LdPathParser<Value> parser = createParserFromString("fn:cleanHtml(foo:html) :: xsd:string");
final FieldMapping<Object, Value> rule = parser.parseRule(NSS);
final Collection<Object> result = rule.getValues(backend, uri);
@@ -67,7 +67,7 @@ public class HtmlFunctionsTest extends AbstractTestBase {
public void testCssSelectFunction() throws ParseException {
URI uri = repository.getValueFactory().createURI(NSS.get("ex") + "Simple");
- final RdfPathParser<Value> parser = createParserFromString("fn:css(\"p\", foo:html) :: xsd:string");
+ final LdPathParser<Value> parser = createParserFromString("fn:css(\"p\", foo:html) :: xsd:string");
final FieldMapping<Object, Value> rule = parser.parseRule(NSS);
final Collection<Object> result = rule.getValues(backend, uri);
@@ -79,7 +79,7 @@ public class HtmlFunctionsTest extends AbstractTestBase {
assertThat("String end", s, CoreMatchers.endsWith("</p>"));
}
- final RdfPathParser<Value> parser2 = createParserFromString("fn:css(\"p#p2\", foo:html) :: xsd:string");
+ final LdPathParser<Value> parser2 = createParserFromString("fn:css(\"p#p2\", foo:html) :: xsd:string");
final FieldMapping<Object, Value> rule2 = parser2.parseRule(NSS);
final Collection<Object> result2 = rule2.getValues(backend, uri);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-functions-math/src/test/java/org/apache/marmotta/ldpath/model/functions/math/MathFunctionTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/test/java/org/apache/marmotta/ldpath/model/functions/math/MathFunctionTest.java b/libraries/ldpath/ldpath-functions-math/src/test/java/org/apache/marmotta/ldpath/model/functions/math/MathFunctionTest.java
index 1696341..0018de9 100644
--- a/libraries/ldpath/ldpath-functions-math/src/test/java/org/apache/marmotta/ldpath/model/functions/math/MathFunctionTest.java
+++ b/libraries/ldpath/ldpath-functions-math/src/test/java/org/apache/marmotta/ldpath/model/functions/math/MathFunctionTest.java
@@ -22,7 +22,7 @@ import java.util.Random;
import org.apache.marmotta.ldpath.model.fields.FieldMapping;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import org.apache.marmotta.ldpath.test.AbstractTestBase;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
@@ -100,7 +100,7 @@ public class MathFunctionTest extends AbstractTestBase {
dMin = Math.min(dMin, dData[i]);
}
- final RdfPathParser<Value> intParser = createParserFromString("fn:min(<" + iProp.stringValue() + ">) :: xsd:int");
+ final LdPathParser<Value> intParser = createParserFromString("fn:min(<" + iProp.stringValue() + ">) :: xsd:int");
final FieldMapping<Object, Value> intRule = intParser.parseRule(NSS);
final Collection<Object> intResult = intRule.getValues(backend, subject);
@@ -109,7 +109,7 @@ public class MathFunctionTest extends AbstractTestBase {
Assert.assertTrue("Integer (type)", intNext instanceof Integer);
Assert.assertEquals("Integer (result)", iMin, intNext);
- final RdfPathParser<Value> longParser = createParserFromString("fn:min(<" + lProp.stringValue() + ">) :: xsd:long");
+ final LdPathParser<Value> longParser = createParserFromString("fn:min(<" + lProp.stringValue() + ">) :: xsd:long");
final FieldMapping<Object, Value> longRule = longParser.parseRule(NSS);
final Collection<Object> longResult = longRule.getValues(backend, subject);
@@ -118,7 +118,7 @@ public class MathFunctionTest extends AbstractTestBase {
Assert.assertTrue("Long (type)", longNext instanceof Long);
Assert.assertEquals("Long (result)", lMin, longNext);
- final RdfPathParser<Value> floatParser = createParserFromString("fn:min(<" + fProp.stringValue() + ">) :: xsd:float");
+ final LdPathParser<Value> floatParser = createParserFromString("fn:min(<" + fProp.stringValue() + ">) :: xsd:float");
final FieldMapping<Object, Value> floatRule = floatParser.parseRule(NSS);
final Collection<Object> floatResult = floatRule.getValues(backend, subject);
@@ -127,7 +127,7 @@ public class MathFunctionTest extends AbstractTestBase {
Assert.assertTrue("Float (type)", floatNext instanceof Float);
Assert.assertEquals("Float (result)", fMin, floatNext);
- final RdfPathParser<Value> doubleParser = createParserFromString("fn:min(<" + dProp.stringValue() + ">) :: xsd:double");
+ final LdPathParser<Value> doubleParser = createParserFromString("fn:min(<" + dProp.stringValue() + ">) :: xsd:double");
final FieldMapping<Object, Value> doubleRule = doubleParser.parseRule(NSS);
final Collection<Object> doubleResult = doubleRule.getValues(backend, subject);
@@ -150,7 +150,7 @@ public class MathFunctionTest extends AbstractTestBase {
dMax = Math.max(dMax, dData[i]);
}
- final RdfPathParser<Value> intParser = createParserFromString("fn:max(<" + iProp.stringValue() + ">) :: xsd:int");
+ final LdPathParser<Value> intParser = createParserFromString("fn:max(<" + iProp.stringValue() + ">) :: xsd:int");
final FieldMapping<Object, Value> intRule = intParser.parseRule(NSS);
final Collection<Object> intResult = intRule.getValues(backend, subject);
@@ -159,7 +159,7 @@ public class MathFunctionTest extends AbstractTestBase {
Assert.assertTrue("Integer (type)", intNext instanceof Integer);
Assert.assertEquals("Integer (result)", iMax, intNext);
- final RdfPathParser<Value> longParser = createParserFromString("fn:max(<" + lProp.stringValue() + ">) :: xsd:long");
+ final LdPathParser<Value> longParser = createParserFromString("fn:max(<" + lProp.stringValue() + ">) :: xsd:long");
final FieldMapping<Object, Value> longRule = longParser.parseRule(NSS);
final Collection<Object> longResult = longRule.getValues(backend, subject);
@@ -168,7 +168,7 @@ public class MathFunctionTest extends AbstractTestBase {
Assert.assertTrue("Long (type)", longNext instanceof Long);
Assert.assertEquals("Long (result)", lMax, longNext);
- final RdfPathParser<Value> floatParser = createParserFromString("fn:max(<" + fProp.stringValue() + ">) :: xsd:float");
+ final LdPathParser<Value> floatParser = createParserFromString("fn:max(<" + fProp.stringValue() + ">) :: xsd:float");
final FieldMapping<Object, Value> floatRule = floatParser.parseRule(NSS);
final Collection<Object> floatResult = floatRule.getValues(backend, subject);
@@ -177,7 +177,7 @@ public class MathFunctionTest extends AbstractTestBase {
Assert.assertTrue("Float (type)", floatNext instanceof Float);
Assert.assertEquals("Float (result)", fMax, floatNext);
- final RdfPathParser<Value> doubleParser = createParserFromString("fn:max(<" + dProp.stringValue() + ">) :: xsd:double");
+ final LdPathParser<Value> doubleParser = createParserFromString("fn:max(<" + dProp.stringValue() + ">) :: xsd:double");
final FieldMapping<Object, Value> doubleRule = doubleParser.parseRule(NSS);
final Collection<Object> doubleResult = doubleRule.getValues(backend, subject);
@@ -196,7 +196,7 @@ public class MathFunctionTest extends AbstractTestBase {
dMin = Math.min(dMin, dData[i]);
}
- final RdfPathParser<Value> floatParser = createParserFromString("fn:round(<" + fProp.stringValue() + ">) :: xsd:int");
+ final LdPathParser<Value> floatParser = createParserFromString("fn:round(<" + fProp.stringValue() + ">) :: xsd:int");
final FieldMapping<Object, Value> floatRule = floatParser.parseRule(NSS);
final Collection<Object> floatResult = floatRule.getValues(backend, subject);
@@ -205,7 +205,7 @@ public class MathFunctionTest extends AbstractTestBase {
Assert.assertThat("round[Float] (result)", floatResult, CoreMatchers.hasItem(Math.round(element)));
}
- final RdfPathParser<Value> doubleParser = createParserFromString("fn:round(<" + dProp.stringValue() + ">) :: xsd:long");
+ final LdPathParser<Value> doubleParser = createParserFromString("fn:round(<" + dProp.stringValue() + ">) :: xsd:long");
final FieldMapping<Object, Value> doubleRule = doubleParser.parseRule(NSS);
final Collection<Object> doubleResult = doubleRule.getValues(backend, subject);
@@ -230,7 +230,7 @@ public class MathFunctionTest extends AbstractTestBase {
dSum += dData[i];
}
- final RdfPathParser<Value> intParser = createParserFromString("fn:sum(<" + iProp.stringValue() + ">) :: xsd:int");
+ final LdPathParser<Value> intParser = createParserFromString("fn:sum(<" + iProp.stringValue() + ">) :: xsd:int");
final FieldMapping<Object, Value> intRule = intParser.parseRule(NSS);
final Collection<Object> intResult = intRule.getValues(backend, subject);
@@ -239,7 +239,7 @@ public class MathFunctionTest extends AbstractTestBase {
Assert.assertTrue("Integer (type)", intNext instanceof Integer);
Assert.assertEquals("Integer (result)", iSum, intNext);
- final RdfPathParser<Value> longParser = createParserFromString("fn:sum(<" + lProp.stringValue() + ">) :: xsd:long");
+ final LdPathParser<Value> longParser = createParserFromString("fn:sum(<" + lProp.stringValue() + ">) :: xsd:long");
final FieldMapping<Object, Value> longRule = longParser.parseRule(NSS);
final Collection<Object> longResult = longRule.getValues(backend, subject);
@@ -248,7 +248,7 @@ public class MathFunctionTest extends AbstractTestBase {
Assert.assertTrue("Long (type)", longNext instanceof Long);
Assert.assertEquals("Long (result)", lSum, longNext);
- final RdfPathParser<Value> floatParser = createParserFromString("fn:sum(<" + fProp.stringValue() + ">) :: xsd:float");
+ final LdPathParser<Value> floatParser = createParserFromString("fn:sum(<" + fProp.stringValue() + ">) :: xsd:float");
final FieldMapping<Object, Value> floatRule = floatParser.parseRule(NSS);
final Collection<Object> floatResult = floatRule.getValues(backend, subject);
@@ -257,7 +257,7 @@ public class MathFunctionTest extends AbstractTestBase {
Assert.assertTrue("Float (type)", floatNext instanceof Float);
Assert.assertEquals("Float (result)", fSum, floatNext);
- final RdfPathParser<Value> doubleParser = createParserFromString("fn:sum(<" + dProp.stringValue() + ">) :: xsd:double");
+ final LdPathParser<Value> doubleParser = createParserFromString("fn:sum(<" + dProp.stringValue() + ">) :: xsd:double");
final FieldMapping<Object, Value> doubleRule = doubleParser.parseRule(NSS);
final Collection<Object> doubleResult = doubleRule.getValues(backend, subject);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-functions-text/src/test/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringTestTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/test/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringTestTest.java b/libraries/ldpath/ldpath-functions-text/src/test/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringTestTest.java
index 713508f..2da31a7 100644
--- a/libraries/ldpath/ldpath-functions-text/src/test/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringTestTest.java
+++ b/libraries/ldpath/ldpath-functions-text/src/test/java/org/apache/marmotta/ldpath/model/tests/functions/text/StringTestTest.java
@@ -24,7 +24,7 @@ import java.util.UUID;
import org.apache.marmotta.ldpath.api.tests.NodeTest;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import org.apache.marmotta.ldpath.test.AbstractTestBase;
import org.junit.After;
import org.junit.AfterClass;
@@ -101,7 +101,7 @@ public class StringTestTest extends AbstractTestBase {
}
private boolean checkTest(String ldPathTest, URI context) throws ParseException {
- final RdfPathParser<Value> parser = createParserFromString(ldPathTest);
+ final LdPathParser<Value> parser = createParserFromString(ldPathTest);
final NodeTest<Value> test = parser.parseTest(NSS);
return test.accept(backend, context, context);
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-functions-xml/src/test/java/org/apache/marmotta/ldpath/model/functions/xml/RemoveXmlTagsFunctionTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/src/test/java/org/apache/marmotta/ldpath/model/functions/xml/RemoveXmlTagsFunctionTest.java b/libraries/ldpath/ldpath-functions-xml/src/test/java/org/apache/marmotta/ldpath/model/functions/xml/RemoveXmlTagsFunctionTest.java
index b4b2e7c..070d22b 100644
--- a/libraries/ldpath/ldpath-functions-xml/src/test/java/org/apache/marmotta/ldpath/model/functions/xml/RemoveXmlTagsFunctionTest.java
+++ b/libraries/ldpath/ldpath-functions-xml/src/test/java/org/apache/marmotta/ldpath/model/functions/xml/RemoveXmlTagsFunctionTest.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import org.apache.marmotta.ldpath.model.fields.FieldMapping;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import org.apache.marmotta.ldpath.test.AbstractTestBase;
import org.junit.Assert;
import org.junit.Before;
@@ -47,7 +47,7 @@ public class RemoveXmlTagsFunctionTest extends AbstractTestBase {
final URI context = repository.getValueFactory().createURI(NSS.get("ex") + "Text");
- final RdfPathParser<Value> parser = createParserFromString("fn:removeTags(foo:formatted) :: xsd:string");
+ final LdPathParser<Value> parser = createParserFromString("fn:removeTags(foo:formatted) :: xsd:string");
final FieldMapping<Object, Value> rule = parser.parseRule(NSS);
final Collection<Object> values = rule.getValues(backend, context);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6591259a/libraries/ldpath/ldpath-functions-xml/src/test/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunctionTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/src/test/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunctionTest.java b/libraries/ldpath/ldpath-functions-xml/src/test/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunctionTest.java
index 613d1ad..87eaa6c 100644
--- a/libraries/ldpath/ldpath-functions-xml/src/test/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunctionTest.java
+++ b/libraries/ldpath/ldpath-functions-xml/src/test/java/org/apache/marmotta/ldpath/model/functions/xml/XPathFunctionTest.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.marmotta.ldpath.model.fields.FieldMapping;
import org.apache.marmotta.ldpath.parser.ParseException;
-import org.apache.marmotta.ldpath.parser.RdfPathParser;
+import org.apache.marmotta.ldpath.parser.LdPathParser;
import org.apache.marmotta.ldpath.test.AbstractTestBase;
import org.junit.Assert;
import org.junit.Before;
@@ -73,7 +73,7 @@ public class XPathFunctionTest extends AbstractTestBase {
public void testXpathFunction() throws ParseException {
final URI ctx = repository.getValueFactory().createURI(NSS.get("ex") + "Quiz");
- final RdfPathParser<Value> parser = createParserFromString("fn:xpath(\"/quiz/question[" +
+ final LdPathParser<Value> parser = createParserFromString("fn:xpath(\"/quiz/question[" +
index +
"]/answers/answer[@correct='true']/text()\", foo:xml) :: xsd:string");
final FieldMapping<Object, Value> rule = parser.parseRule(NSS);
[18/50] [abbrv] git commit: merge
Posted by ss...@apache.org.
merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/49ddd164
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/49ddd164
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/49ddd164
Branch: refs/heads/master
Commit: 49ddd1645d2e88a824812085c5cd339435fd7ab4
Parents: 5f777a1 0c21ac9
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Wed Sep 11 17:20:52 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Wed Sep 11 17:20:52 2013 +0200
----------------------------------------------------------------------
.../marmotta/kiwi/model/rdf/KiWiLiteral.java | 15 +--
.../kiwi/persistence/KiWiConnection.java | 15 ++-
.../marmotta/kiwi/sail/KiWiValueFactory.java | 14 ++-
.../marmotta/kiwi/test/RepositoryTest.java | 80 +++++++++++++
.../kiwi/test/junit/DatabaseRunnerTest1.java | 50 ++++++++-
.../kiwi/test/junit/DatabaseRunnerTest2.java | 49 +++++++-
.../kiwi/test/junit/KiWiDatabaseRunner.java | 24 +++-
.../kiwi/test/sesame/KiWiLocaleTest.java | 111 +++++++++++++++++++
.../ldpath/api/functions/NodeFunction.java | 2 +-
.../marmotta/ldpath/api/tests/NodeTest.java | 1 +
.../api/transformers/NodeTransformer.java | 5 +-
.../ldpath/backend/file/ParserTest.java | 6 +-
.../java/org/apache/marmotta/ldpath/LDPath.java | 12 +-
.../ldpath/model/fields/FieldMapping.java | 23 +++-
.../model/functions/ConcatenateFunction.java | 3 +-
.../ldpath/model/functions/CountFunction.java | 3 +-
.../ldpath/model/functions/FirstFunction.java | 5 +-
.../ldpath/model/functions/LastFunction.java | 5 +-
.../ldpath/model/functions/SortFunction.java | 3 +-
.../marmotta/ldpath/model/programs/Program.java | 53 ++++++---
.../ldpath/model/tests/LiteralTypeTest.java | 15 ++-
.../tests/functions/BinaryNumericTest.java | 1 +
.../marmotta/ldpath/util/Collections.java | 3 +
.../at/newmedialab/ldpath/parser/rdfpath.jj | 77 +++++++------
.../BinaryNumericTestFunctionsTest.java | 4 +-
.../ldpath/model/functions/FunctionsTest.java | 16 +--
.../marmotta/ldpath/parser/ParserTest.java | 10 +-
.../marmotta/ldpath/parser/ProgramTest.java | 61 ++++++++++
.../marmotta/ldpath/parser/SelectorsTest.java | 2 +-
.../marmotta/ldpath/parser/TestsTest.java | 2 +-
.../marmotta/ldpath/test/AbstractTestBase.java | 14 +--
.../ldpath-core/src/test/resources/logback.xml | 2 +
.../src/test/resources/parse/program.ldpath | 20 ++--
.../model/functions/date/DateFunctionsTest.java | 6 +-
.../model/functions/html/HtmlFunctionsTest.java | 8 +-
.../model/functions/math/MathFunctionTest.java | 30 ++---
.../tests/functions/text/StringTestTest.java | 4 +-
.../xml/RemoveXmlTagsFunctionTest.java | 4 +-
.../model/functions/xml/XPathFunctionTest.java | 4 +-
.../js/widgets/configurator/configurator.coffee | 15 ++-
.../config/ConfigurationWebService.java | 2 +-
.../src/main/resources/web/admin/about.html | 18 +--
.../src/main/resources/web/admin/about.html | 41 ++++++-
43 files changed, 654 insertions(+), 184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/49ddd164/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/49ddd164/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
----------------------------------------------------------------------
diff --cc libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
index 8568b51,f18413f..f501985
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
@@@ -674,44 -673,83 +674,124 @@@ public class RepositoryTest
}
/**
+ * This test is for a strange bug that happens when running SPARQL updates that delete and reinsert a triple in
+ * the same transaction. It is similar to #testMARMOTTA283, but simulates the issue in more detail.
+ * See https://issues.apache.org/jira/browse/MARMOTTA-283
+ */
+ @Test
+ public void testMARMOTTA283_2() throws RepositoryException, RDFParseException, IOException, MalformedQueryException, UpdateExecutionException {
+
+ //insert quadruples
+ String insert =
+ "WITH <http://resource.org/video>" +
+ "INSERT {" +
+ " <http://resource.org/video> <http://ontology.org#hasFragment> <http://resource.org/fragment1>." +
+ " <http://resource.org/annotation1> <http://ontology.org#hasTarget> <http://resource.org/fragment1>." +
+ " <http://resource.org/annotation1> <http://ontology.org#hasBody> <http://resource.org/subject1>." +
+ " <http://resource.org/fragment1> <http://ontology.org#shows> <http://resource.org/subject1>." +
+ "} WHERE {}";
+
+ RepositoryConnection connectionInsert = repository.getConnection();
+ try {
+ Update u = connectionInsert.prepareUpdate(QueryLanguage.SPARQL, insert);
+ u.execute();
+ connectionInsert.commit();
+ } finally {
+ connectionInsert.close();
+ }
+
+ //update quadruples
+ String update =
+ "WITH <http://resource.org/video>" +
+ "DELETE { " +
+ " ?annotation ?p ?v." +
+ " ?fragment ?r ?s." +
+ " <http://resource.org/video> <http://ontology.org#hasFragment> ?fragment." +
+ "} INSERT {" +
+ " <http://resource.org/video> <http://ontology.org#hasFragment> <http://resource.org/fragment1>." +
+ " <http://resource.org/annotation1> <http://ontology.org#hasTarget> <http://resource.org/fragment1>." +
+ " <http://resource.org/annotation1> <http://ontology.org#hasBody> <http://resource.org/subject1>." +
+ " <http://resource.org/fragment1> <http://ontology.org#shows> <http://resource.org/subject1>." +
+ "} WHERE {" +
+ " ?annotation <http://ontology.org#hasTarget> ?fragment." +
+ " ?annotation ?p ?v." +
+ " OPTIONAL {" +
+ " ?fragment ?r ?s" +
+ " }" +
+ " FILTER (?fragment = <http://resource.org/fragment1>)" +
+ "} ";
+
+ RepositoryConnection connectionUpdate = repository.getConnection();
+ try {
+ Update u = connectionUpdate.prepareUpdate(QueryLanguage.SPARQL, update);
+ u.execute();
+ connectionUpdate.commit();
+ } finally {
+ connectionUpdate.close();
+ }
+
+ //check quadruples
+ RepositoryConnection connectionVerify = repository.getConnection();
+ try {
+ URI video = repository.getValueFactory().createURI("http://resource.org/video");
+ URI hasFragment = repository.getValueFactory().createURI("http://ontology.org#hasFragment");
+ URI fragment = repository.getValueFactory().createURI("http://resource.org/fragment1");
+ URI annotation = repository.getValueFactory().createURI("http://resource.org/annotation1");
+ URI hasTarget = repository.getValueFactory().createURI("http://ontology.org#hasTarget");
+ URI hasBody = repository.getValueFactory().createURI("http://ontology.org#hasBody");
+ URI subject = repository.getValueFactory().createURI("http://resource.org/subject1");
+ URI shows = repository.getValueFactory().createURI("http://ontology.org#shows");
+
+ Assert.assertTrue(connectionVerify.hasStatement(video,hasFragment,fragment,true,video));
+ Assert.assertTrue(connectionVerify.hasStatement(annotation,hasTarget,fragment,true,video));
+ Assert.assertTrue(connectionVerify.hasStatement(annotation,hasBody,subject,true,video));
+ Assert.assertTrue(connectionVerify.hasStatement(fragment,shows,subject,true,video));
+
+ connectionVerify.commit();
+ } finally {
+ connectionVerify.close();
+ }
+ }
+
++ /**
+ * Test the concurrent connection problem reported in MARMOTTA-236 for facading:
+ * - get two parallel connections
+ * - add triple in connection 1; should be available in connection 1 and not in connection 2
+ * - add same triple in connection 2; should be available in both, connection 1 and connection 2 or
+ * fail-fast by throwing a ConcurrentModificationException
+ * @throws Exception
+ */
+ @Test
+ public void testMARMOTTA236() throws Exception {
+ RepositoryConnection con1 = repository.getConnection();
+ RepositoryConnection con2 = repository.getConnection();
+
+ try {
+ URI r1 = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
+ URI r2 = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
+ URI r3 = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
+
+ con1.begin();
+ con1.add(r1,r2,r3);
+
+ Assert.assertTrue(con1.hasStatement(r1,r2,r3,true));
+
+ con2.begin();
+ Assert.assertFalse(con2.hasStatement(r1,r2,r3,true));
+
+ con2.add(r1,r2,r3);
+
+ Assert.assertTrue(con2.hasStatement(r1,r2,r3,true));
+
+ con2.rollback();
+ con1.commit();
+ } catch (ConcurrentModificationException ex) {
+
+ } finally {
+ con1.close();
+ con2.close();
+ }
+
+
+ }
}
[23/50] [abbrv] git commit: added a test for the Linked Data Service;
currently fails because the webservice seems broken!
Posted by ss...@apache.org.
added a test for the Linked Data Service; currently fails because the webservice seems broken!
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/e53965c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/e53965c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/e53965c6
Branch: refs/heads/master
Commit: e53965c6a569b96a8ea7986e01cb19a86ac9de66
Parents: a2de373
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Thu Sep 12 17:30:28 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Thu Sep 12 17:30:28 2013 +0200
----------------------------------------------------------------------
.../marmotta/kiwi/model/caching/IntArray.java | 13 +-
.../kiwi/model/caching/TripleTable.java | 2 +-
.../platform/core/test/ld/LinkedDataTest.java | 163 +++++++++++++++++++
3 files changed, 173 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e53965c6/libraries/kiwi/kiwi-tripletable/src/main/java/org/apache/marmotta/kiwi/model/caching/IntArray.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/src/main/java/org/apache/marmotta/kiwi/model/caching/IntArray.java b/libraries/kiwi/kiwi-tripletable/src/main/java/org/apache/marmotta/kiwi/model/caching/IntArray.java
index 594e2e1..549bddf 100644
--- a/libraries/kiwi/kiwi-tripletable/src/main/java/org/apache/marmotta/kiwi/model/caching/IntArray.java
+++ b/libraries/kiwi/kiwi-tripletable/src/main/java/org/apache/marmotta/kiwi/model/caching/IntArray.java
@@ -44,12 +44,16 @@ public final class IntArray implements Comparable<IntArray> {
public IntArray(int[] data) {
this.data = data;
+ }
- Hasher hasher = hashFunction.newHasher();
- for(int i : data) {
- hasher.putInt(i);
+ private void ensureHashCode() {
+ if(goodHashCode == null) {
+ Hasher hasher = hashFunction.newHasher();
+ for(int i : data) {
+ hasher.putInt(i);
+ }
+ goodHashCode = hasher.hash();
}
- goodHashCode = hasher.hash();
}
public static final IntArray createSPOCKey(Resource subject, URI property, Value object, Resource context){
@@ -165,6 +169,7 @@ public final class IntArray implements Comparable<IntArray> {
@Override
public int hashCode() {
+ ensureHashCode();
return goodHashCode.hashCode();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e53965c6/libraries/kiwi/kiwi-tripletable/src/main/java/org/apache/marmotta/kiwi/model/caching/TripleTable.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/src/main/java/org/apache/marmotta/kiwi/model/caching/TripleTable.java b/libraries/kiwi/kiwi-tripletable/src/main/java/org/apache/marmotta/kiwi/model/caching/TripleTable.java
index 6a6a261..d05b644 100644
--- a/libraries/kiwi/kiwi-tripletable/src/main/java/org/apache/marmotta/kiwi/model/caching/TripleTable.java
+++ b/libraries/kiwi/kiwi-tripletable/src/main/java/org/apache/marmotta/kiwi/model/caching/TripleTable.java
@@ -63,7 +63,7 @@ public class TripleTable<Triple extends Statement> implements Set<Triple>, Seria
public TripleTable(Collection<Triple> triples) {
- data = new EquivalenceHashSet<Triple>(StatementCommons.quadrupleEquivalence());
+ data = StatementCommons.newQuadrupleSet();
indexSPOC = new TreeMap<IntArray, Triple>();
indexCSPO = new TreeMap<IntArray, Triple>();
addAll(triples);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e53965c6/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
new file mode 100644
index 0000000..85cbed9
--- /dev/null
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.platform.core.test.ld;
+
+import com.google.common.collect.Sets;
+import com.jayway.restassured.RestAssured;
+import org.apache.commons.io.IOUtils;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
+import org.apache.marmotta.platform.core.test.base.JettyMarmotta;
+import org.apache.marmotta.platform.core.webservices.config.ConfigurationWebService;
+import org.apache.marmotta.platform.core.webservices.resource.ContentWebService;
+import org.apache.marmotta.platform.core.webservices.resource.MetaWebService;
+import org.apache.marmotta.platform.core.webservices.resource.ResourceWebService;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openrdf.model.Statement;
+import org.openrdf.model.URI;
+import org.openrdf.repository.Repository;
+import org.openrdf.repository.RepositoryConnection;
+import org.openrdf.repository.RepositoryException;
+import org.openrdf.repository.RepositoryResult;
+import org.openrdf.repository.sail.SailRepository;
+import org.openrdf.rio.RDFFormat;
+import org.openrdf.rio.RDFParseException;
+import org.openrdf.sail.memory.MemoryStore;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import static com.jayway.restassured.RestAssured.expect;
+import static com.jayway.restassured.RestAssured.form;
+import static com.jayway.restassured.RestAssured.given;
+
+/**
+ * This test verifies the functionality of the Linked Data endpoint
+ *
+ * @author Sebastian Schaffert (sschaffert@apache.org)
+ */
+public class LinkedDataTest {
+
+ private static JettyMarmotta marmotta;
+ private static SesameService sesameService;
+
+ private static ObjectMapper mapper = new ObjectMapper();
+
+
+ @BeforeClass
+ public static void setUp() throws RepositoryException, IOException, RDFParseException {
+ marmotta = new JettyMarmotta("/marmotta", ResourceWebService.class, MetaWebService.class, ContentWebService.class);
+ sesameService = marmotta.getService(SesameService.class);
+
+ RestAssured.baseURI = "http://localhost";
+ RestAssured.port = marmotta.getPort();
+ RestAssured.basePath = marmotta.getContext();
+
+ // import some test data
+
+ // 1. read into string
+ String data = IOUtils.toString(LinkedDataTest.class.getResourceAsStream("/org/apache/marmotta/platform/core/test/sesame/demo-data.foaf"));
+ StringReader in = new StringReader(data.replaceAll("http://localhost:8080/LMF", RestAssured.baseURI + ":" + RestAssured.port + RestAssured.basePath));
+
+
+ RepositoryConnection connection = sesameService.getConnection();
+ try {
+ connection.add(in, RestAssured.baseURI + ":" + RestAssured.port + RestAssured.basePath, RDFFormat.RDFXML);
+
+ URI sepp = createResourceURI("sepp_huber");
+
+ Assert.assertTrue(connection.hasStatement(sepp,null,null,true));
+ } finally {
+ connection.close();
+ }
+
+ }
+
+ @AfterClass
+ public static void tearDown() {
+ marmotta.shutdown();
+ }
+
+ /**
+ * Test if we can retrieve Linked Data resources as RDF/XML.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testGetRDFXML() throws Exception {
+ testGetBase(RDFFormat.RDFXML);
+ }
+
+ /**
+ * Test if we can retrieve Linked Data resources as RDF/XML.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testGetTurtle() throws Exception {
+ testGetBase(RDFFormat.TURTLE);
+ }
+
+
+ private void testGetBase(RDFFormat format) throws Exception {
+ String data = given().header("Accept",format.getDefaultMIMEType()).expect().statusCode(200).when().get(createResourceURI("sepp_huber").stringValue()).asString();
+
+ Repository mem = new SailRepository(new MemoryStore());
+ mem.initialize();
+
+ RepositoryConnection con = mem.getConnection();
+ RepositoryConnection icon = sesameService.getConnection();
+ try {
+ con.begin();
+
+ con.add(new StringReader(data), RestAssured.baseURI + ":" + RestAssured.port + RestAssured.basePath, format);
+
+ Assert.assertTrue(con.hasStatement(createResourceURI("sepp_huber"),null,null,true));
+
+ RepositoryResult<Statement> statements = icon.getStatements(createResourceURI("sepp_huber"), null,null,true);
+ while(statements.hasNext()) {
+ Assert.assertTrue(con.hasStatement(statements.next(),true));
+ }
+
+ con.commit();
+ icon.commit();
+ } finally {
+ con.close();
+ icon.close();
+ }
+
+
+ String invalid = given().header("Accept",format.getDefaultMIMEType()).expect().statusCode(404).when().get(createResourceURI("xyz").stringValue()).asString();
+ System.err.println(invalid);
+ }
+
+
+ private static URI createResourceURI(String id) {
+ return sesameService.getRepository().getValueFactory().createURI(RestAssured.baseURI + ":" + RestAssured.port + RestAssured.basePath + "/resource/" + id);
+ }
+
+ private static URI createURI(String id) {
+ return sesameService.getRepository().getValueFactory().createURI(id);
+ }
+
+}
[44/50] [abbrv] git commit: added missing LICENSE/NOTICE files
Posted by ss...@apache.org.
added missing LICENSE/NOTICE files
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f2083168
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f2083168
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f2083168
Branch: refs/heads/master
Commit: f2083168210b9e025eeeff49a044796b6c38ab06
Parents: f314321
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 24 15:46:59 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 24 15:46:59 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/META-INF/LICENSE | 234 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 18 ++
.../src/main/doc/LICENSE.txt | 31 +++
.../src/main/doc/NOTICE.txt | 7 +
4 files changed, 290 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f2083168/commons/marmotta-commons/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/resources/META-INF/LICENSE b/commons/marmotta-commons/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000..8a179ca
--- /dev/null
+++ b/commons/marmotta-commons/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,234 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
+
+This module includes source code from the Javolution project, licensed under
+BSD license:
+
+ Javolution - Java(tm) Solution for Real-Time and Embedded Systems
+ Copyright (c) 2012, Javolution (http://javolution.org/)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f2083168/commons/marmotta-commons/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/resources/META-INF/NOTICE b/commons/marmotta-commons/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..06ee0eb
--- /dev/null
+++ b/commons/marmotta-commons/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,18 @@
+Apache Marmotta Commons
+Copyright 2012-2013 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were originally based on the following:
+
+ Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
+
+These have been licensed to the Apache Software Foundation under a software grant.
+
+This product also includes some third-party source components:
+
+ * The module commons/marmotta-commons contains a modified and reduced version
+ of the Javolution library. Javolution has copyright (c) 2012, Javolution and
+ is licensed under BSD license. The original source code is available from
+ http://javolution.org
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f2083168/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt
index 147194e..6b85159 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt
+++ b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt
@@ -702,4 +702,35 @@ For the JSONLD-Java component,
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
+For the Marmotta Commons component,
+
+ located at commons/marmotta-commons/src/ext/java
+
+ Javolution - Java(tm) Solution for Real-Time and Embedded Systems
+ Copyright (c) 2012, Javolution (http://javolution.org/)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f2083168/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
index 96a77bb..e54d3d5 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
+++ b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
@@ -9,3 +9,10 @@ Portions of this software were originally based on the following:
Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
These have been licensed to the Apache Software Foundation under a software grant.
+
+This product also includes some third-party source components:
+
+ * The module commons/marmotta-commons contains a modified and reduced version
+ of the Javolution library. Javolution has copyright (c) 2012, Javolution and
+ is licensed under BSD license. The original source code is available from
+ http://javolution.org
[16/50] [abbrv] git commit: refactored admin templating (for
MARMOTTA-228)
Posted by ss...@apache.org.
refactored admin templating (for MARMOTTA-228)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/4e767a74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/4e767a74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/4e767a74
Branch: refs/heads/master
Commit: 4e767a740abf395f826c133548b6e6dd744a3f48
Parents: 0c21ac9
Author: tkurz <tk...@apache.org>
Authored: Wed Sep 11 17:00:00 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Wed Sep 11 17:00:00 2013 +0200
----------------------------------------------------------------------
.../core/api/modules/ModuleService.java | 29 +++
.../core/api/templating/TemplatingService.java | 8 +
.../platform/core/model/template/MenuItem.java | 75 ++++++-
.../core/model/template/MenuItemType.java | 12 ++
.../services/modules/ModuleServiceImpl.java | 160 ++++++++++++--
.../templating/AdminTemplatingServiceImpl.java | 210 +++++--------------
.../src/main/resources/kiwi-module.properties | 5 +-
.../src/main/resources/templates/admin.ftl | 80 +++++--
8 files changed, 382 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4e767a74/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/modules/ModuleService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/modules/ModuleService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/modules/ModuleService.java
index 0739abe..173c34f 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/modules/ModuleService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/modules/ModuleService.java
@@ -17,11 +17,13 @@
*/
package org.apache.marmotta.platform.core.api.modules;
+import org.apache.commons.configuration.Configuration;
import org.apache.marmotta.platform.core.model.module.ModuleConfiguration;
import javax.enterprise.inject.spi.InjectionPoint;
import java.net.URL;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
/**
@@ -129,4 +131,31 @@ public interface ModuleService {
*/
public int getWeight(String moduleName);
+ /**
+ * returns more complex admin page description
+ * @param moduleName
+ * @return
+ */
+ public List<HashMap<String,String>> getAdminPageObjects(String moduleName);
+
+ /**
+ * returns the icon (if set), null otherwise
+ * @param moduleName
+ * @return
+ */
+ public String getIcon(String moduleName);
+
+ /**
+ * list modules for container sorted on weight
+ * @param container
+ * @return
+ */
+ public List<String> listSortedModules(String container);
+
+ /**
+ * list containers sorted on weight
+ * @return
+ */
+ public List<String> listSortedContainers();
+
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4e767a74/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java
index 2e6c770..7a17f87 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java
@@ -33,10 +33,18 @@ import freemarker.template.TemplateException;
public interface TemplatingService {
final static String PATH = "/templates/";
+
+ public final static String DEFAULT_REST_PATH = "/doc/rest/";
+
+ public final static String DEFAULT_REST_FILE = "overview-index.html";
static final String DEFAULT_PROJECT = "marmotta";
static final String DEFAULT_STYLE = "blue";
+
+ static final String ADMIN_TPL = "admin.ftl";
+
+ public final static String DEFAULT_WEBSERVICE_TITLE = "Webservice";
void initDataModel();
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4e767a74/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItem.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItem.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItem.java
index 883d01e..1e04adf 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItem.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItem.java
@@ -17,6 +17,8 @@
*/
package org.apache.marmotta.platform.core.model.template;
+import org.apache.marmotta.platform.core.api.templating.TemplatingService;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -31,19 +33,76 @@ import java.util.Map;
*/
public class MenuItem {
- private Map<String,Object> properties;
- private List<MenuItem> submenu;
+ private boolean initialized = false;
+ public final static String DEFAULT_MENU_ICON = "icon-asterisk";
+
+ private HashMap<String,Object> properties;
+ private List<MenuItem> items;
+ private MenuItemType type;
+
+ public MenuItem(String label, MenuItemType type) {
+ this.properties = new HashMap<String, Object>();
+ this.type = type;
+ this.items = new ArrayList<MenuItem>();
- public MenuItem() {
- properties = new HashMap<String, Object>();
- submenu = new ArrayList<MenuItem>();
+ properties.put("items",items);
+ properties.put("label",label);
+ properties.put("isActive",false);
+ properties.put("icon",DEFAULT_MENU_ICON);
}
- public Map<String, Object> getProperties() {
+ public HashMap<String,Object> getProperties() {
+ if(properties.get("items") != null) {
+ List<Object> os = new ArrayList<Object>();
+ for(MenuItem item : items) {
+ os.add(item.getProperties());
+ }
+ properties.put("items",os);
+ }
return properties;
}
- public List<MenuItem> getSubmenu() {
- return submenu;
+ public void set(String name, Object value) {
+ properties.put(name,value);
+ }
+
+ public Object get(String name) {
+ return properties.get(name);
+ }
+
+ public void addItem(MenuItem item) {
+ items.add(item);
+ }
+
+ public boolean setActive(String path) {
+ boolean isActive = false;
+ switch(type) {
+ case ROOT:
+ case CONTAINER:
+ case MODULE:
+ for(MenuItem item : items) {
+ if(item.setActive(path)) {
+ isActive = true;
+ }
+ }
+ break;
+ case PAGE:
+ isActive = get("path").equals(path);
+ break;
+ case WEBSERVICE:
+ String s = (String)properties.get("path");
+ isActive = (
+ path.startsWith(s.substring(0,s.lastIndexOf("/"))) &&
+ path.contains(TemplatingService.DEFAULT_REST_PATH));
+ break;
+ default:
+ isActive = false;
+ }
+ set("isActive",isActive);
+ return isActive;
+ }
+
+ public boolean isEmpty() {
+ return items.isEmpty();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4e767a74/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItemType.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItemType.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItemType.java
new file mode 100644
index 0000000..524db52
--- /dev/null
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/model/template/MenuItemType.java
@@ -0,0 +1,12 @@
+package org.apache.marmotta.platform.core.model.template;
+
+/**
+ * ...
+ * <p/>
+ * Author: Thomas Kurz (tkurz@apache.org)
+ */
+public enum MenuItemType {
+
+ ROOT,CONTAINER,MODULE,PAGE,WEBSERVICE
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4e767a74/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/ModuleServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/ModuleServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/ModuleServiceImpl.java
index b7e4d63..c54ffa1 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/ModuleServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/ModuleServiceImpl.java
@@ -37,13 +37,7 @@ import java.net.JarURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
/**
* Add file description here!
@@ -53,16 +47,29 @@ import java.util.Set;
@ApplicationScoped
public class ModuleServiceImpl implements ModuleService {
+ private String default_container_name = "Others";
+
private Logger log = LoggerFactory.getLogger(ModuleServiceImpl.class);
private Set<String> modules;
+ private HashMap<String,ArrayList<String>> containers;
+
+ private HashMap<String,Integer> container_weight;
+
private Map<String,Configuration> configurationMap;
private Map<String, Configuration> jarURLs;
@PostConstruct
public void initialize() {
+
+ //default_container_name = configurationService.getStringConfiguration("kiwi.pages.default_container.name",default_container_name);
+ //default_container_number = configurationService.getIntConfiguration("kiwi.pages.default_container.number",default_container_number);
+
modules = new HashSet<String>();
+ containers = new HashMap<String,ArrayList<String>>();
+ container_weight = new HashMap<String, Integer>();
+
configurationMap = new HashMap<String, Configuration>();
jarURLs = new HashMap<String, Configuration>();
@@ -83,6 +90,20 @@ public class ModuleServiceImpl implements ModuleService {
String moduleName = moduleProperties.getString("name");
modules.add(moduleName);
+ String c_name = moduleProperties.getString("container") != null ? moduleProperties.getString("container") : default_container_name;
+
+ if(containers.get(c_name) == null) {
+ containers.put(c_name, new ArrayList<String>());
+ }
+ containers.get(c_name).add(moduleName);
+
+ if(container_weight.get(c_name) == null ) {
+ container_weight.put(c_name,-1);
+ }
+
+ if(moduleProperties.getString("container.weight") != null) {
+ container_weight.put(c_name,Math.max(container_weight.get(c_name),moduleProperties.getInt("container.weight",-1)));
+ }
URLConnection urlConnection = moduleUrl.openConnection();
URL jarUrl;
@@ -112,8 +133,6 @@ public class ModuleServiceImpl implements ModuleService {
} catch(ConfigurationException ex) {
}
-
-
// create runtime configuration
MapConfiguration runtimeConfiguration = new MapConfiguration(new HashMap<String, Object>());
runtimeConfiguration.setProperty("runtime.jarfile", jarUrl.toString());
@@ -130,6 +149,7 @@ public class ModuleServiceImpl implements ModuleService {
}
+ //TODO container should be sortable
} catch (IOException ex) {
log.error("I/O error while trying to retrieve kiwi-module.properties file",ex);
}
@@ -173,6 +193,7 @@ public class ModuleServiceImpl implements ModuleService {
* @param moduleName
* @return
*/
+ @Deprecated
@Override
public Collection<String> getEntities(String moduleName) {
Configuration config = getModuleConfiguration(moduleName).getConfiguration();
@@ -191,6 +212,64 @@ public class ModuleServiceImpl implements ModuleService {
return modules;
}
+ public List<String> listSortedModules() {
+ return sortModules(modules);
+ }
+
+ /**
+ * returns all modules within a container
+ * @param container
+ * @return
+ */
+ public Collection<String> listModules(String container) {
+ if(containers.containsKey(container)) {
+ return containers.get(container);
+ } else return null;
+ }
+
+ @Override
+ public List<String> listSortedModules(String container) {
+ if(containers.containsKey(container)) {
+ return sortModules(containers.get(container));
+ } else return null;
+ }
+
+ /**
+ * sort modules
+ * @param m
+ * @return
+ */
+ private List<String> sortModules(Collection<String> m) {
+ List<String> sorted = new ArrayList<String>(m);
+ Collections.sort(sorted,new Comparator<String>() {
+ @Override
+ public int compare(String o, String o2) {
+ return ((Integer) getWeight(o)).compareTo(getWeight(o2));
+ }
+ });
+ return sorted;
+ }
+
+ /**
+ * Lists containers and underlying modules
+ * @return
+ */
+ public Collection<String> listContainers() {
+ return containers.keySet();
+ }
+
+ @Override
+ public List<String> listSortedContainers() {
+ List sorted = new ArrayList(containers.keySet());
+ Collections.sort(sorted,new Comparator<String>() {
+ @Override
+ public int compare(String o, String o2) {
+ return container_weight.get(o2).compareTo(container_weight.get(o));
+ }
+ });
+ return sorted;
+ }
+
/**
* Return the configuration for the module identified by the name given as argument. Returns an
* immutable Apache Commons Configuration object, or null if the module is not found.
@@ -269,18 +348,73 @@ public class ModuleServiceImpl implements ModuleService {
}
/**
- * Return a list of admin pages (paths)
+ * returns the icon (if set), null otherwise
* @param moduleName
* @return
*/
@Override
- public List<String> getAdminPages(String moduleName) {
+ public String getIcon(String moduleName) {
Configuration config = getModuleConfiguration(moduleName).getConfiguration();
- if(config != null) return ImmutableList.copyOf(config.getStringArray("adminpages"));
+ if(config != null) return config.getString("icon");
else
return null;
}
+ /**
+ * Return a list of admin pages (links)
+ * @param moduleName
+ * @return
+ */
+ @Override
+ public List<String> getAdminPages(String moduleName) {
+ Configuration config = getModuleConfiguration(moduleName).getConfiguration();
+ if(config != null) {
+ if(!config.subset("adminpage.").isEmpty()) {
+ ArrayList<String> l = new ArrayList<String>();
+ while(config.getString("adminpage."+l.size()+".link") != null) {
+ l.add(config.getString("adminpage."+l.size()+".link"));
+ }
+ return l;
+ } else return ImmutableList.copyOf(config.getStringArray("adminpages"));
+ } else
+ return null;
+ }
+
+ /**
+ * returns more complex admin page description
+ * @param moduleName
+ * @return
+ */
+ @Override
+ public List<HashMap<String,String>> getAdminPageObjects(String moduleName) {
+ Configuration config = getModuleConfiguration(moduleName).getConfiguration();
+ if(config != null) {
+ ArrayList<HashMap<String,String>> l = new ArrayList<HashMap<String,String>>();
+ if(!config.subset("adminpage").isEmpty()) {
+ while(config.getString("adminpage."+l.size()+".link") != null) {
+ HashMap<String,String> map = new HashMap<String, String>();
+ map.put("link",config.getString("baseurl")+config.getString("adminpage."+l.size()+".link"));
+ map.put("title",config.getString("adminpage."+l.size()+".title"));
+ l.add(map);
+ }
+ } else {
+ for(String path : config.getStringArray("adminpages")) {
+ HashMap<String,String> map = new HashMap<String, String>();
+ map.put("link",config.getString("baseurl")+path);
+ String title;
+ if(path.lastIndexOf(".") > path.lastIndexOf("/")+1)
+ title = path.substring(path.lastIndexOf("/")+1,path.lastIndexOf(".")).replaceAll("_"," ");
+ else
+ title = path.substring(path.lastIndexOf("/")+1);
+ map.put("title",title);
+ l.add(map);
+ }
+ }
+ return l;
+ } else
+ return null;
+ }
+
@Override
public int getWeight(String moduleName) {
Configuration config = getModuleConfiguration(moduleName).getConfiguration();
@@ -290,4 +424,4 @@ public class ModuleServiceImpl implements ModuleService {
return 50;
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4e767a74/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/AdminTemplatingServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/AdminTemplatingServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/AdminTemplatingServiceImpl.java
index 293b1e6..86c3d4e 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/AdminTemplatingServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/AdminTemplatingServiceImpl.java
@@ -38,6 +38,7 @@ import org.apache.marmotta.platform.core.api.templating.AdminInterfaceService;
import org.apache.marmotta.platform.core.api.templating.TemplatingService;
import org.apache.marmotta.platform.core.exception.TemplatingException;
import org.apache.marmotta.platform.core.model.template.MenuItem;
+import org.apache.marmotta.platform.core.model.template.MenuItemType;
/**
* User: Thomas Kurz
@@ -53,7 +54,7 @@ public class AdminTemplatingServiceImpl implements AdminInterfaceService {
@Inject
private ModuleService moduleService;
-
+
@Inject
private TemplatingService templatingService;
@@ -61,15 +62,11 @@ public class AdminTemplatingServiceImpl implements AdminInterfaceService {
private ConfigurationService configurationService;
//some statics
- private static final String TEMPLATE_STRING = "admin.ftl";
- private static final String DEFAULT_REST_PATH = "/doc/rest/";
- private static final String DEFAULT_REST_FILE = "overview-summary.html";
- private static final String DEFAULT_TITLE_FOR_WEBSERVICES = "webservices";
-
+ private static final String DEFAULT_ICON = "icon-beaker";
//pattern to filter comments content
private static final Pattern PATTERN = Pattern.compile("\\<!--###BEGIN_([^#]+)###--\\>(.+)\\<!--###END_\\1###--\\>",Pattern.DOTALL);
- private Menu menu;
+ private MenuItem menu;
/**
* inits a freemarker template service with a servlet context
@@ -77,32 +74,17 @@ public class AdminTemplatingServiceImpl implements AdminInterfaceService {
*/
@Override
public void init(ServletContext context) throws TemplatingException {
- menu = new Menu();
+ menu = buildMenu();
this.context = context;
try {
- //try-run to check it from the very beginning
- // sschaffert: disabled the call because it requires the host name
- //templatingService.getTemplate(TEMPLATE_STRING);
+ //try-run to check it from the very beginning
+ templatingService.getTemplate(TemplatingService.ADMIN_TPL);
} catch (Exception e) {
throw new TemplatingException("Severe Error: admin template cannot be found: " + e.getMessage());
}
}
/**
- * Check whether the templating service considers the resource passed in the path as a menu entry it is
- * responsible for.
- *
- * @param path a url path
- * @return if the give path points to an admin page
- */
- @Override
- public boolean isMenuEntry(String path) {
- if(menu.path_titles.keySet().contains(configurationService.getPath()+path)) return true;
- if(path.contains(DEFAULT_REST_PATH)) return true;
- else return false;
- }
-
- /**
* this method wraps a file with a specified admin template. If the file is not a admin page,
* the bytes are returned unprocessed
* @param bytes content represented in a byte array
@@ -114,21 +96,21 @@ public class AdminTemplatingServiceImpl implements AdminInterfaceService {
if(!configurationService.getBooleanConfiguration("templating.cache.enabled",true) && context!=null) {
init(context);
}
- //apply template
- if(!isMenuEntry(path)) return bytes;
- //activate
- String module = menu.getCurrentModule(configurationService.getPath() + path);
+
+ //set active
+ menu.setActive(path);
+
//fill data model
Map<String, Object> datamodel = new HashMap<String,Object>();
- for(Properties p : Properties.values()) {
- datamodel.put(p.name(),"<!-- "+p.name()+" not defined -->");
- }
+ for(Properties p : Properties.values()) {
+ datamodel.put(p.name(),"<!-- "+p.name()+" not defined -->");
+ }
//begin hack!!!
datamodel.put("USER_MODULE_IS_ACTIVE", moduleService.listModules().contains("Users"));
//end hack!!!
- datamodel.put("MODULE_MENU",menu.menuItems);
- datamodel.put("CURRENT_TITLE", getNameFromPath(path));
- datamodel.put("CURRENT_MODULE", module);
+
+ //add menu
+ datamodel.put("MENU",menu.getProperties());
try {
String s = new String(bytes);
Matcher m = PATTERN.matcher(s);
@@ -142,7 +124,7 @@ public class AdminTemplatingServiceImpl implements AdminInterfaceService {
//make magic happen
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- templatingService.process(TEMPLATE_STRING, datamodel, new OutputStreamWriter(bos));
+ templatingService.process(TemplatingService.ADMIN_TPL, datamodel, new OutputStreamWriter(bos));
bytes = bos.toByteArray();
bos.flush();
bos.close();
@@ -152,133 +134,49 @@ public class AdminTemplatingServiceImpl implements AdminInterfaceService {
return bytes;
}
+ @Override
+ public boolean isMenuEntry(String path) {
+ return menu.setActive(path);
+ }
+
/**
- * This object represents a menu for the admin interface. It is build using the ModuleService.
+ * build menu
+ * @return
*/
- class Menu {
-
- public List<MenuItem> menuItems;
- public Map<String,String> path_titles;
-
- public Menu() {
- //instantiate
- menuItems = new ArrayList<MenuItem>();
- path_titles = new HashMap<String, String>();
- //sort menu
- ArrayList<String> menuSorted = new ArrayList<String>(moduleService.listModules());
- if(configurationService.getBooleanConfiguration("templating.sort_by_weight", true)) {
- Collections.sort(menuSorted, new Comparator<String>() {
- @Override
- public int compare(String o1, String o2) {
- final int w1 = moduleService.getWeight(o1), w2 = moduleService.getWeight(o2);
- if (w1 == w2) return o1.compareTo(o2);
- return w1 - w2;
- }
- });
- } else {
- Collections.sort(menuSorted);
- }
-
- //build structure
- for(String module : menuSorted) {
- String path = configurationService.getPath() + moduleService.getModuleWeb(module);
- if(moduleHasAdminPages(module)) {
- MenuItem menu_item = new MenuItem();
- menu_item.getProperties().put("title",module);
- menu_item.getProperties().put("baseurl",moduleService.getModuleConfiguration(module).getConfiguration().getString("baseurl","/"+module));
- for(String page : moduleService.getAdminPages(module)) {
- if(page.equals("")) {
- continue;
- }
- MenuItem submenu = new MenuItem();
- submenu.getProperties().put("title",getNameFromPath(page));
- submenu.getProperties().put("path",path+page);
- //test if it is active
- menu_item.getSubmenu().add(submenu);
- path_titles.put(path+page,page);
- }
- if(moduleService.getWebservices(module)!=null &&
- !moduleService.getWebservices(module).isEmpty() &&
- !moduleService.getWebservices(module).iterator().next().equals("")) {
- MenuItem submenu = new MenuItem();
- submenu.getProperties().put("title",DEFAULT_TITLE_FOR_WEBSERVICES);
- submenu.getProperties().put("path",path+DEFAULT_REST_PATH+DEFAULT_REST_FILE);
- //test if it is active
- menu_item.getSubmenu().add(submenu);
- path_titles.put(path+DEFAULT_REST_PATH+DEFAULT_REST_FILE,DEFAULT_TITLE_FOR_WEBSERVICES);
- }
- menuItems.add(menu_item);
+ private MenuItem buildMenu() {
+ MenuItem menu = new MenuItem("MENU", MenuItemType.ROOT);
+
+ for(String container_string : moduleService.listSortedContainers()) {
+ MenuItem container = new MenuItem(container_string, MenuItemType.CONTAINER);
+
+ //add modules
+ for(String module_string : moduleService.listSortedModules(container_string)) {
+ MenuItem module = new MenuItem(module_string, MenuItemType.MODULE);
+ module.set("path",moduleService.getModuleWeb(module_string));
+ if(moduleService.getIcon(module_string) != null)
+ module.set("icon",moduleService.getIcon(module_string));
+
+ //add pages
+ for(HashMap<String,String> page_object : moduleService.getAdminPageObjects(module_string)) {
+ MenuItem page = new MenuItem(page_object.get("title"), MenuItemType.PAGE);
+ page.set("path",page_object.get("link"));
+ module.addItem(page);
}
- }
- }
- /**
- * get current module and set submenu to active
- * @param path the current system path
- * @return current module name
- */
- public String getCurrentModule(String path) {
- String module = "";
- boolean active = false;
- //test with module and submenu must be active
- for(MenuItem menuItem : menuItems) {
- if(path.startsWith((String)menuItem.getProperties().get("baseurl"))) {
- module = (String)menuItem.getProperties().get("title");
- }
- menuItem.getProperties().put("active",false);
- for(MenuItem submenu : menuItem.getSubmenu()) {
- if(submenu.getProperties().get("path").equals(path)) {
- submenu.getProperties().put("active",true);
- menuItem.getProperties().put("active",true);
- module = (String)menuItem.getProperties().get("title");
- active = true;
- } else {
- submenu.getProperties().put("active",false);
- }
- }
- }
- //workaround for webservices (autogenerated pages that are nit fix stored in the menu structure)
- if(!active) {
- for(MenuItem menuItem : menuItems) {
- if(module.equals(menuItem.getProperties().get("title"))) {
- for(MenuItem submenu : menuItem.getSubmenu()) {
- if(submenu.getProperties().get("title").equals(DEFAULT_TITLE_FOR_WEBSERVICES)) {
- submenu.getProperties().put("active",true);
- menuItem.getProperties().put("active",true);
- }
- }
- }
+ //add webservice
+ if(!moduleService.getWebservices(module_string).isEmpty()) {
+ MenuItem page = new MenuItem(TemplatingService.DEFAULT_WEBSERVICE_TITLE, MenuItemType.WEBSERVICE);
+ page.set("path",module.get("path")+TemplatingService.DEFAULT_REST_PATH+TemplatingService.DEFAULT_REST_FILE);
+ module.addItem(page);
}
- }
- return module;
- }
- /**
- * Tests if a module should appear in the menu
- * @param module a module name
- * @return true is module should appear, false if not
- */
- private boolean moduleHasAdminPages(String module) {
- if(moduleService.getAdminPages(module)!=null &&
- !moduleService.getAdminPages(module).isEmpty() &&
- !moduleService.getAdminPages(module).get(0).equals(""))
- return true;
- else if(moduleService.getWebservices(module)!=null &&
- !moduleService.getWebservices(module).isEmpty() &&
- !moduleService.getWebservices(module).iterator().next().equals("")) return true;
- return false;
+ //add if there are pages to display
+ if(!module.isEmpty()) container.addItem(module);
+ }
+ menu.addItem(container);
}
+ return menu;
}
- /**
- * returns a proper name for a path by using the filename.
- * @param path
- * @return
- */
- private String getNameFromPath(String path) {
- if(path.contains(DEFAULT_REST_PATH)) return DEFAULT_TITLE_FOR_WEBSERVICES;
- return path.substring(path.lastIndexOf("/")).replaceAll("/"," ").replaceAll("_"," ").replaceAll(".html","").replaceAll(".jsp","");
- }
-
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4e767a74/platform/marmotta-core/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/kiwi-module.properties b/platform/marmotta-core/src/main/resources/kiwi-module.properties
index 30703e7..c3e2c28 100644
--- a/platform/marmotta-core/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-core/src/main/resources/kiwi-module.properties
@@ -18,6 +18,9 @@
name=Core Services
+container=Admin
+container.weight = 10
+
subtitle = Configure LMF Core
weight = 10
@@ -35,7 +38,7 @@ adminpages=/admin/about.html,\
/admin/contexts.html,\
/admin/prefixes.html,\
/admin/system.html,\
- /admin/database.html,
+ /admin/database.html
webservices=org.apache.marmotta.platform.core.webservices.config.ConfigurationWebService,\
org.apache.marmotta.platform.core.webservices.config.DependenciesWebService,\
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4e767a74/platform/marmotta-core/src/main/resources/templates/admin.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/admin.ftl b/platform/marmotta-core/src/main/resources/templates/admin.ftl
index 7d8d7a1..3352942 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -47,7 +47,31 @@
</#if>
${HEAD}
-
+ <style type="text/css">
+ div.menu_heading {
+ color: white;
+ font-weight: bold;
+ }
+ ul.center_submenu {
+ margin:0;
+ padding:0;
+ }
+ ul.center_submenu li {
+ list-style: none;
+ display: inline;
+ margin-bottom: -1px;
+ padding: 5px 0 0;
+ margin-bottom: 10px;
+ background-color: white;
+ border: 1px solid black;
+ }
+ ul.center_submenu li.active {
+ margin-bottom:-1px;
+ }
+ ul.center_submenu a {
+ padding:10px;
+ }
+ </style>
</head>
<body>
@@ -57,7 +81,6 @@
<a id="logo" href="${SERVER_URL}" title="${PROJECT}">
<img src="${SERVER_URL}${LOGO}" alt="${PROJECT} logo" />
</a>
- <h1>${CURRENT_MODULE} - ${CURRENT_TITLE}</h1>
<#if USER_MODULE_IS_ACTIVE>
<div id="login_logout"></div>
</#if>
@@ -65,29 +88,48 @@
<div class="clear"></div>
<div id="left">
<ul id="menu">
- <#list MODULE_MENU as menu>
- <li
- <#if menu.properties["active"]>
- class="menu_item active"
- <#else>
- class="menu_item"
- </#if>
- >
- <div class="menu_heading"><a href="${menu.submenu[0].properties["path"]}">${menu.properties["title"]}</a></div>
+ <#list MENU["items"] as menu>
+ <li class="menu_item">
+ <div class="menu_heading">${menu.label}</div>
<ul class="submenu">
- <#list menu.submenu as submenu>
- <li
- <#if submenu.properties["active"]> class="active" </#if>
- >
- <a href="${submenu.properties["path"]}">${submenu.properties["title"]}</a>
- </li>
- </#list>
+ <#list menu["items"] as submenu>
+ <li
+ <#if submenu["isActive"]> class="menu_item active" </#if>
+ >
+ <#if submenu["items"]?has_content>
+ <a href="${SERVER_URL}${submenu["items"][0]["path"]?substring(1)}">
+ <#else>
+ <a href="${SERVER_URL}doc/rest/index.html">
+ </#if>
+ <!-- <i class="${submenu["icon"]}"></i> <!-- TODO icon -->
+ <span>${submenu["label"]}</span>
+ </a>
+ </li>
+ </#list>
</ul>
</li>
- </#list>
+ </#list>
+
</ul>
</div>
<div id="center">
+ <ul class="center_submenu">
+ <#list MENU["items"] as menu>
+ <#if menu["isActive"]>
+ <#list menu["items"] as submenu>
+ <#if submenu["isActive"]>
+ <#list submenu["items"] as pages>
+ <li
+ <#if pages["isActive"]> class="active" </#if>
+ >
+ <a href="${SERVER_URL}${pages["path"]?substring(1)}">${pages["label"]}</a>
+ </li>
+ </#list>
+ </#if>
+ </#list>
+ </#if>
+ </#list>
+ </ul>
<div id="content">
${CONTENT}
</div>
[15/50] [abbrv] git commit: set content from marmotta webpage to
security about page (partly fixes MARMOTTA-149)
Posted by ss...@apache.org.
set content from marmotta webpage to security about page (partly fixes MARMOTTA-149)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/0c21ac9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/0c21ac9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/0c21ac9e
Branch: refs/heads/master
Commit: 0c21ac9e66e515b4957c935317c692ed2bf43c76
Parents: 3ee0977
Author: tkurz <tk...@apache.org>
Authored: Wed Sep 11 15:17:44 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Wed Sep 11 15:17:44 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/web/admin/about.html | 41 +++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/0c21ac9e/platform/marmotta-security/src/main/resources/web/admin/about.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/src/main/resources/web/admin/about.html b/platform/marmotta-security/src/main/resources/web/admin/about.html
index ad3186c..5681932 100644
--- a/platform/marmotta-security/src/main/resources/web/admin/about.html
+++ b/platform/marmotta-security/src/main/resources/web/admin/about.html
@@ -27,7 +27,46 @@
<!--###BEGIN_CONTENT###-->
<h1>Marmotta Security</h1>
<p>
- This module provide security mechanisms for Apache Marmotta
+ This module provide security mechanisms for Apache Marmotta, which implements its own authentication and authorization mechanism.
+</p>
+<h2>Users and roles</h2>
+ <p>There are two default users in Marmotta: anonymous and admin. The first one is not an actual user, but the user all anonymous requests use. The second is the user with administration rights on the system.
+ </p>
+ <p>At the same time, users are group in roles for simplifying permission management. The system comes with three groups (manager, editor and user) by default, but this could be customized as preferred.
+ </p>
+ <p>For instance, by default the admin user is part of manager, editor and user groups.
+ </p>
+<h2>Profiles</h2>
+ <p>There are three pre-defined profiles, <i>simple</i>, <i>standard</i>, and <i>restricted</i>:
+ </p>
+ <ul>
+ <li><b>simple</b> allows read access from everywhere and write access only from localhost or other local interfaces.</li>
+ <li><b>standard</b> allows read access from everywhere and write access only for authenticated users of the “manager” role.
+ <li><b>restricted</b> allows access only for authenticated users.</li>
+ </ul>
+ <p>By default, Marmotta will use the simple profile, allowing only access from localhost. If you want to change the profile, you can set the configuration property security.profile to standard, e.g. via the configuration interface in “Core Services” or “Security”. If your instance is running on a remote server, you can e.g. log in using SSH and run the following command:
+ </p>
+ <pre>
+ curl -X POST -H "Content-Type: application/json" -d '["standard"]' http://<HOST>:<PORT>/marmotta/config/data/security.profile</pre>
+ <p>
+ Afterwards, you can log in with the default admin user and password (“admin” and “pass123”). Needless to say you should change this password.
+ </p>
+ <h2>Rules</h2>
+ <p>The configuration is based on ACL rules such as:
+ </p>
+ <pre>
+ security.{TYPE}.{NAME}.pattern = {PATTERN}
+ security.{TYPE}.{NAME}.methods = {METHOD}
+ security.{TYPE}.{NAME}.priority = {PRIORITY}</pre>
+ <p>Where:</p>
+ <ul>
+ <li><b>{TYPE}</b> is the type of control, which can be <i>permission</i> for granting permission the requests matching this rule or <i>restriction</i> for restricting.</li>
+ <li><b>{NAME}</b> is an arbitrary label for naming the rule, which should be unique in combination with the type.</li>
+ <li><b>{PATTERN}</b> is the regular expression pattern which this rule matches.</li>
+ <li><b>{METHOD}</b> is the HTTP method this rule applies (<i>HEAD</i>, <i>OPTIONS</i>, <i>GET</i>, <i>POST</i>, <i>PUT</i> or <i>DELETE</i>). If the rules applies to more than one method, you can add all methods separated by commas or add additional property lines for each method, both options are valid.</li>
+ <li><b>{PRIORITY}</b> is the the priority of this rule in the access control list.</li>
+ </ul>
+ <p>The system evaluates the rules ordered by priority, allowing or rejecting access whenever a rule matches each request to the system. The adminnistration user interface provides an overview page for the status of the current rules applied to the system.
</p>
<!--###END_CONTENT###-->
[38/50] [abbrv] git commit: MARMOTTA-213: carefully reviewed all
NOTICE files,
cleanning up all not necessary references (mainly MIT and three-clause BSD
licenses)
Posted by ss...@apache.org.
MARMOTTA-213: carefully reviewed all NOTICE files, cleanning up all not necessary references (mainly MIT and three-clause BSD licenses)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/b5c3a614
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/b5c3a614
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/b5c3a614
Branch: refs/heads/master
Commit: b5c3a61486af6b2ec341050e88a573d034ce04b0
Parents: 08fac27
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Sep 20 14:00:33 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Sep 20 14:00:33 2013 +0200
----------------------------------------------------------------------
NOTICE.txt | 6 +-
.../src/main/resources/META-INF/NOTICE | 6 +-
.../src/main/resources/installer/NOTICE.txt | 309 ++-----------------
.../src/ext/resources/META-INF/NOTICE | 7 +-
.../src/main/resources/META-INF/NOTICE | 10 +-
.../src/main/webapp/META-INF/NOTICE | 266 ++--------------
.../src/main/doc/NOTICE.txt | 101 ------
.../src/main/resources/META-INF/NOTICE | 23 +-
.../src/main/resources/META-INF/NOTICE | 6 +-
.../src/main/resources/META-INF/NOTICE | 27 +-
10 files changed, 69 insertions(+), 692 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b5c3a614/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index f527a32..8a419b1 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -10,13 +10,15 @@ Portions of this software were originally based on the following:
These have been licensed to the Apache Software Foundation under a software grant.
+This product also includes some third-party source components:
+
* The module extras/webjars/snorql constains a adapted version of the D2R
Snorql library, which was originally created by Richard Cyganaik for the D2R
Server project (http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/). It is
licensed under the Apache Software License 2.0. The source code is available
- at http://github.com/kurtjx/SNORQL
+ from http://github.com/kurtjx/SNORQL
* The module commons/marmotta-commons contains a modified and reduced version
of the Javolution library. Javolution has copyright (c) 2012, Javolution and
- is licensed under BSD license. The original source code is available at
+ is licensed under BSD license. The original source code is available from
http://javolution.org
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b5c3a614/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE b/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE
index 57eae48..9893868 100644
--- a/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE
+++ b/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE
@@ -4,6 +4,8 @@ Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Additionally, it includes the following 3rd party modules:
+Portions of this software were originally based on the following:
- rometools licensed under the Apache License 2.0
+ Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
+
+These have been licensed to the Apache Software Foundation under a software grant.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b5c3a614/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
index f88874c..3e23da2 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
@@ -10,298 +10,33 @@ Portions of this software were originally based on the following:
These have been licensed to the Apache Software Foundation under a software grant.
-This product also includes the following third-party components:
+This product also includes some third-party binary components:
-* Apache Tomcat, http://tomcat.apache.org
+ * H2 Database, Copyright (c) 2013 H2 Group, is licensed under the Eclipse Public
+ License (EPL) 1.0. The original software is available from http://www.h2database.com
- Copyright (c) 2013 The Apache Software Foundation
+ * Logback, Copyright (C) 2012 QOS.ch, is licensed under the Eclipse Public
+ License (EPL) 1.0. The original software is available from http://logback.qos.ch
- Java compilation software for JSP pages is provided by Eclipse,
- which is open source software. The original software and
- related information is available at http://www.eclipse.org.
+ * Javassist, Copyright (c) 2013 Shigeru Chiba, is licensed under the Mozilla
+ Public License (MPL) 1.1. The original software is available from
+ http://www.jboss.org/javassist
- The bayeux implementation is derivative work originating at
- the Dojo Foundation
- * Copyright 2007-2008 Guy Molinari
- * Copyright 2007-2008 Filip Hanik
- * Copyright 2007 Dojo Foundation
- * Copyright 2007 Mort Bay Consulting Pty. Ltd.
+ * Java Activation, Copyright (c) 2012 Oracle Corporation, is licensed under the
+ Common Development and Distribution License (CDDL) v1.0. The original software
+ is available from http://www.oracle.com
- The original XML Schemas for Java EE Deployment Descriptors:
- - javaee_5.xsd
- - javaee_web_services_1_2.xsd
- - javaee_web_services_client_1_2.xsd
- - javaee_6.xsd
- - javaee_web_services_1_3.xsd
- - javaee_web_services_client_1_3.xsd
- - jsp_2_2.xsd
- - web-app_3_0.xsd
- - web-common_3_0.xsd
- - web-fragment_3_0.xsd
- may be obtained from http://java.sun.com/xml/ns/javaee/
+ * Java Servlet API, Copyright (c) 2012 Oracle Corporation, is licensed under the
+ Common Development and Distribution License (CDDL) v1.0. The original software
+ is available from http://www.oracle.com
-* H2, http://www.h2database.com
+ * Common Annotations (JSR-250), Copyright (c) 2012 Oracle Corporation, is licensed
+ under the Common Development and Distribution License (CDDL) v1.0. The original
+ software is available from http://www.oracle.com
- Copyright (c) 2013 H2 Group
+ * Expression Language, Copyright (c) 2012 Oracle Corporation, is licensed under
+ the Common Development and Distribution License (CDDL) v1.0. The original
+ software is available from http://www.oracle.com
-* Logback, http://logback.qos.ch
-
- Copyright (C) 2012 QOS.ch
-
-* JDOM, http://www.jdom.org
-
- Copyright (c) 2012 Jason Hunter & Brett McLaughlin
-
-* Freemarker, http://freemarker.org
-
- Copyright (c) 2003 The Visigoth Software Society
-
-* CAL10N, http://cal10n.qos.ch
-
- Copyright (c) 2009 QOS.ch
-
-* Guava, http://guava-libraries.googlecode.com
-
- Copyright (c) 2013 Google Inc.
-
-* Jackson, http://jackson.codehaus.org
-
- Copyright (c) 2010 FasterXML LLC.
-
-* MimeUtil, http://mime-util.sourceforge.net
-
- Copyright (c) 2010 Medsea Business Solutions S.L.
-
-* IzPack, http://izpack.org
-
- Copyright (c) 2012 Julien Ponge
-
-* Apache Ant, http://ant.apache.org
-
- Copyright (c) 2012 The Apache Software Foundation
-
- This product includes also software developed by:
- - the W3C consortium, http://www.w3.org
- - the SAX project, http://www.saxproject.org
-
- Please read the different LICENSE files present in the
- root directory of this distribution.
-
-* OpenCSV, http://opencsv.sourceforge.net
-
- Copyright (c) 2005 Bytecode Pty Ltd.
-
-* OpenRDF Sesame, http://www.openrdf.org
-
- Copyright (c) 2013 Aduna
-
- This software includes code developed by Aduna
- (http://www.aduna-software.com/).
-
- This software includes code developed by Ontotext AD
- (http://www.ontotext.com/).
-
- This software includes code developed by 3 Round Stones
- (http://www.3roundstones.com/).
-
- This software includes code developed by Fluid Operations
- (http://www.fluidops.com/).
-
- This software includes code developed by the Information Management Group at
- Food & Biobased Research, Wageningen University (http://www.fbr.wur.nl/).
-
- This software includes code developed by Clark & Parsia
- (http://clarkparsia.com/).
-
- This software includes code developed by the Institute for Defense Analyses
- (IDA) (http://www.ida.org/).
-
- This software includes code developed by Atos (http://www.atos.net/).
-
- This software includes code developed by Peter Ansell.
-
- The above parties have licensed their code contributions to Aduna under the
- terms of a contributor license agreement (CLA).
-
- This product includes software developed by the JUnit project
- (http://www.junit.org). License: http://junit.sourceforge.net/cpl-v10.html
-
- Parts of this product use software developed by JSON.org
- (http://www.json.org). License: http://www.json.org/license.html
-
- Parts of this product use software developed by the Mockito project
- (http://mockito.googlecode.com). License: https://github.com/mockito/mockito/blob/master/LICENSE
-
-* PostgreSQL JDBC, http://jdbc.postgresql.org
-
- Copyright (c) 2011 PostgreSQL Global Development Group
-
-* Scannotation, http://scannotation.sourceforge.net
-
- Copyright (c) 2011 Bill Burke
-
-* SLF4J, http://www.slf4j.org
-
- Copyright (c) 2013 QOS.ch
-
-* Semargl, http://semarglproject.org
-
- Copyright (c) 2012 Lev Khomich
-
- This product uses software developed by The Apache Software Foundation:
- Clerezza, Jena, IO Commons (http://www.apache.org/).
-
- This product includes/uses test suite developed by Hewlett-Packard
- (http://hp.com/). Copyright (c) 2002, Hewlett-Packard Company.
-
- This product includes/uses test suite developed by W3C Consortium.
-
- This product includes/uses RDFa test harness developed by RDF Web Applications
- Working Group (http://www.w3.org/2010/02/rdfa/).
-
-* Janino, http://janino.codehaus.org
-
- Copyright (c) 2010 Arno Unkrig
-
-* Java Injection API, http://atinject.googlecode.com
-
- Copyright (c) 2009 The JSR-330 Expert Group
-
-* Javassist, http://www.jboss.org/javassist
-
- Copyright (c) 2013 Shigeru Chiba
-
-* Jaxen, http://jaxen.codehaus.org
-
- Copyright (c) 2006 The Werken Company
-
-* JSoup, http://jsoup.org
-
- Copyright (c) 2013 Jonathan Hedley
-
-* EHCache, http://ehcache.org
-
- Copyright (c) 2010 Terracotta, Inc.
-
-* CDI, http://github.com/jboss/cdi
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Weld, http://github.com/weld
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Bean Validation, http://github.com/hibernate/hibernate-validator
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* JBoss EJB Common Interceptor, http://github.com/jbossinterceptors/jbossinterceptors
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* RESTEasy, http://www.jboss.org/resteasy
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Java Activation, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Java Servlet API, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Common Annotations (JSR-250), http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Expression Language, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Apache Xerces, http://xerces.apache.org
-
- Copyright (c) 2013 The Apache Software Foundation
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation, http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems, http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at
- iClick, Inc., software copyright (c) 1999.
-
-* "Java Concurrency in Practice" book annotations component, http://jcip.net
-
- Copyright (c) 2005 Brian Goetz and Tim Peierls
-
-* Hamcrest, http://www.hamcrest.org
-
- Copyright (c) 2000-2006 Joe Walnes, Nat Pryce, Steve Freeman
-
-* D3.js, http://d3js.org
-
- Copyright (c) 2013 Michael Bostock
-
-* Dracula Graph Library, http://www.graphdracula.net
-
- Copyright (c) 2013 Johann Philipp Strathausen
-
-* strftime, http://hacks.bluesmoon.info/strftime
-
- Copyright (c) 2008 Philip S Tellis
-
-* jQuery, http://jquery.com
-
- Copyright (c) 2013 jQuery Foundation
-
-* CodeMirror, http://codemirror.net
-
- Copyright (c) 2013 Marijn Haverbeke
-
-* D2R Snorql, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/,
-
- Copyright (c) 2007 Richard Cyganiak
-
-* script.aculo.us, http://script.aculo.us
-
- Copyright (c) 2010 Thomas Fuchs
-
-* Prototype, http://prototypejs.org
-
- Copyright (c) 2010 Sam Stephenson
-
-* SPARQL Flint Editor, http://github.com/TSO-Openup/FlintSparqlEditor
-
- Copyright (c) 2011 TSO Ltd
-
-* Sgvizler, http://sgvizler.googlecode.com
-
- Copyright (c) 2011 Martin G. Skjæveland
-
-* MigLayout, http://www.migcalendar.com/miglayout
-
- Copyright (c) 2004 MiG InfoCom AB
-
-* SwingBits, http://swingbits.sourceforge.net
-
- Copyright (c) 2006 EzWare
-
-* ROME, http://rometools.jira.com
-
- Copyright (c) 2004 Sun Microsystems
-
-* JSONLD-Java, http://github.com/tristan/jsonld-java
-
- Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz GmbH
-
-* JSON-LD Test Suite, http://json-ld.org/test-suite
-
- Public Domain (Creative Commons Zero license) without copyright
-
-* ical4j test suite, http://ical4j.googlecode.com
-
- Copyright (c) 2011 Ben Fortuna
-
-* Javolution, http://javolution.org/
-
- Copyright (c) 2012 Javolution
+ * Javolution, Copyright (c) 2012 Javolution, is licensed under BSD license. The
+ original source code is available from http://javolution.org
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b5c3a614/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE b/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE
index 4916965..22b650e 100644
--- a/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE
+++ b/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE
@@ -4,7 +4,8 @@ Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Additionally, it includes the following 3rd party modules:
+Portions of this software were originally based on the following:
- MigLayout licensed under New BSD License
- SwingBits licensed under New BSD License
+ Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
+
+These have been licensed to the Apache Software Foundation under a software grant.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b5c3a614/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE b/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE
index bb5f700..da32381 100644
--- a/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE
+++ b/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE
@@ -4,12 +4,8 @@ Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Additionally, it includes the following 3rd party modules:
+Portions of this software were originally based on the following:
-* MigLayout, http://www.migcalendar.com/miglayout
+ Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
- Copyright (c) 2004 MiG InfoCom AB
-
-* SwingBits, http://swingbits.sourceforge.net
-
- Copyright (c) 2006 EzWare
+These have been licensed to the Apache Software Foundation under a software grant.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b5c3a614/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
index cf429e7..f2b7b92 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
@@ -10,255 +10,33 @@ Portions of this software were originally based on the following:
These have been licensed to the Apache Software Foundation under a software grant.
-This product also includes the following third-party components:
+This product also includes some third-party binary components:
-* H2, http://www.h2database.com
+ * H2 Database, Copyright (c) 2013 H2 Group, is licensed under the Eclipse Public
+ License (EPL) 1.0. The original software is available from http://www.h2database.com
- Copyright (c) 2013 H2 Group
+ * Logback, Copyright (C) 2012 QOS.ch, is licensed under the Eclipse Public
+ License (EPL) 1.0. The original software is available from http://logback.qos.ch
-* Logback, http://logback.qos.ch
+ * Javassist, Copyright (c) 2013 Shigeru Chiba, is licensed under the Mozilla
+ Public License (MPL) 1.1. The original software is available from
+ http://www.jboss.org/javassist
- Copyright (C) 2012 QOS.ch
+ * Java Activation, Copyright (c) 2012 Oracle Corporation, is licensed under the
+ Common Development and Distribution License (CDDL) v1.0. The original software
+ is available from http://www.oracle.com
-* JDOM, http://www.jdom.org
+ * Java Servlet API, Copyright (c) 2012 Oracle Corporation, is licensed under the
+ Common Development and Distribution License (CDDL) v1.0. The original software
+ is available from http://www.oracle.com
- Copyright (c) 2012 Jason Hunter & Brett McLaughlin
+ * Common Annotations (JSR-250), Copyright (c) 2012 Oracle Corporation, is licensed
+ under the Common Development and Distribution License (CDDL) v1.0. The original
+ software is available from http://www.oracle.com
-* Freemarker, http://freemarker.org
+ * Expression Language, Copyright (c) 2012 Oracle Corporation, is licensed under
+ the Common Development and Distribution License (CDDL) v1.0. The original
+ software is available from http://www.oracle.com
- Copyright (c) 2003 The Visigoth Software Society
-
-* CAL10N, http://cal10n.qos.ch
-
- Copyright (c) 2009 QOS.ch
-
-* Guava, http://guava-libraries.googlecode.com
-
- Copyright (c) 2013 Google Inc.
-
-* Jackson, http://jackson.codehaus.org
-
- Copyright (c) 2010 FasterXML LLC.
-
-* MimeUtil, http://mime-util.sourceforge.net
-
- Copyright (c) 2010 Medsea Business Solutions S.L.
-
-* OpenCSV, http://opencsv.sourceforge.net
-
- Copyright (c) 2005 Bytecode Pty Ltd.
-
-* OpenRDF Sesame, http://www.openrdf.org
-
- Copyright (c) 2013 Aduna
-
- This software includes code developed by Aduna
- (http://www.aduna-software.com/).
-
- This software includes code developed by Ontotext AD
- (http://www.ontotext.com/).
-
- This software includes code developed by 3 Round Stones
- (http://www.3roundstones.com/).
-
- This software includes code developed by Fluid Operations
- (http://www.fluidops.com/).
-
- This software includes code developed by the Information Management Group at
- Food & Biobased Research, Wageningen University (http://www.fbr.wur.nl/).
-
- This software includes code developed by Clark & Parsia
- (http://clarkparsia.com/).
-
- This software includes code developed by the Institute for Defense Analyses
- (IDA) (http://www.ida.org/).
-
- This software includes code developed by Atos (http://www.atos.net/).
-
- This software includes code developed by Peter Ansell.
-
- The above parties have licensed their code contributions to Aduna under the
- terms of a contributor license agreement (CLA).
-
- This product includes software developed by the JUnit project
- (http://www.junit.org). License: http://junit.sourceforge.net/cpl-v10.html
-
- Parts of this product use software developed by JSON.org
- (http://www.json.org). License: http://www.json.org/license.html
-
- Parts of this product use software developed by the Mockito project
- (http://mockito.googlecode.com). License: https://github.com/mockito/mockito/blob/master/LICENSE
-
-* PostgreSQL JDBC, http://jdbc.postgresql.org
-
- Copyright (c) 2011 PostgreSQL Global Development Group
-
-* Scannotation, http://scannotation.sourceforge.net
-
- Copyright (c) 2011 Bill Burke
-
-* SLF4J, http://www.slf4j.org
-
- Copyright (c) 2013 QOS.ch
-
-* Semargl, http://semarglproject.org
-
- Copyright (c) 2012 Lev Khomich
-
- This product uses software developed by The Apache Software Foundation:
- Clerezza, Jena, IO Commons (http://www.apache.org/).
-
- This product includes/uses test suite developed by Hewlett-Packard
- (http://hp.com/). Copyright (c) 2002, Hewlett-Packard Company.
-
- This product includes/uses test suite developed by W3C Consortium.
-
- This product includes/uses RDFa test harness developed by RDF Web Applications
- Working Group (http://www.w3.org/2010/02/rdfa/).
-
-* Janino, http://janino.codehaus.org
-
- Copyright (c) 2010 Arno Unkrig
-
-* Java Injection API, http://atinject.googlecode.com
-
- Copyright (c) 2009 The JSR-330 Expert Group
-
-* Javassist, http://www.jboss.org/javassist
-
- Copyright (c) 2013 Shigeru Chiba
-
-* Jaxen, http://jaxen.codehaus.org
-
- Copyright (c) 2006 The Werken Company
-
-* JSoup, http://jsoup.org
-
- Copyright (c) 2013 Jonathan Hedley
-
-* EHCache, http://ehcache.org
-
- Copyright (c) 2010 Terracotta, Inc.
-
-* CDI, http://github.com/jboss/cdi
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Weld, http://github.com/weld
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Bean Validation, http://github.com/hibernate/hibernate-validator
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* JBoss EJB Common Interceptor, http://github.com/jbossinterceptors/jbossinterceptors
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* RESTEasy, http://www.jboss.org/resteasy
-
- Copyright (c) 2012 Red Hat Middleware, LLC
-
-* Java Activation, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Java Servlet API, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Common Annotations (JSR-250), http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Expression Language, http://www.oracle.com
-
- Copyright (c) 2012 Oracle Corporation
-
-* Apache Xerces, http://xerces.apache.org
-
- Copyright (c) 2013 The Apache Software Foundation
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation, http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems, http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at
- iClick, Inc., software copyright (c) 1999.
-
-* "Java Concurrency in Practice" book annotations component, http://jcip.net
-
- Copyright (c) 2005 Brian Goetz and Tim Peierls
-
-* Hamcrest, http://www.hamcrest.org
-
- Copyright (c) 2000-2006 Joe Walnes, Nat Pryce, Steve Freeman
-
-* D3.js, http://d3js.org
-
- Copyright (c) 2013 Michael Bostock
-
-* Dracula Graph Library, http://www.graphdracula.net
-
- Copyright (c) 2013 Johann Philipp Strathausen
-
-* strftime, http://hacks.bluesmoon.info/strftime
-
- Copyright (c) 2008 Philip S Tellis
-
-* jQuery, http://jquery.com
-
- Copyright (c) 2013 jQuery Foundation
-
-* CodeMirror, http://codemirror.net
-
- Copyright (c) 2013 Marijn Haverbeke
-
-* D2R Snorql, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/,
-
- Copyright (c) 2007 Richard Cyganiak
-
-* script.aculo.us, http://script.aculo.us
-
- Copyright (c) 2010 Thomas Fuchs
-
-* Prototype, http://prototypejs.org
-
- Copyright (c) 2010 Sam Stephenson
-
-* SPARQL Flint Editor, http://github.com/TSO-Openup/FlintSparqlEditor
-
- Copyright (c) 2011 TSO Ltd
-
-* Sgvizler, http://sgvizler.googlecode.com
-
- Copyright (c) 2011 Martin G. Skjæveland
-
-* MigLayout, http://www.migcalendar.com/miglayout
-
- Copyright (c) 2004 MiG InfoCom AB
-
-* SwingBits, http://swingbits.sourceforge.net
-
- Copyright (c) 2006 EzWare
-
-* ROME, http://rometools.jira.com
-
- Copyright (c) 2004 Sun Microsystems
-
-* JSONLD-Java, http://github.com/tristan/jsonld-java
-
- Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz GmbH
-
-* JSON-LD Test Suite, http://json-ld.org/test-suite
-
- Public Domain (Creative Commons Zero license) without copyright
-
-* ical4j test suite, http://ical4j.googlecode.com
-
- Copyright (c) 2011 Ben Fortuna
-
-* Javolution, http://javolution.org/
-
- Copyright (c) 2012 Javolution
+ * Javolution, Copyright (c) 2012 Javolution, is licensed under BSD license. The
+ original source code is available from http://javolution.org
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b5c3a614/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
index 4ee884f..96a77bb 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
+++ b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt
@@ -9,104 +9,3 @@ Portions of this software were originally based on the following:
Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
These have been licensed to the Apache Software Foundation under a software grant.
-
-* CAL10N, http://cal10n.qos.ch
-
- Copyright (c) 2009 QOS.ch
-
-* Logback, http://logback.qos.ch
-
- Copyright (C) 2012 QOS.ch
-
-* Guava, http://guava-libraries.googlecode.com
-
- Copyright (c) 2013 Google Inc.
-
-* OneJAR, http://one-jar.sourceforge.net
-
- Copyright (c) 2004-2010 P. Simon Tuffs
-
-* SLF4J, http://www.slf4j.org
-
- Copyright (c) 2013 QOS.ch
-
-* Jaxen, http://jaxen.codehaus.org
-
- Copyright (c) 2006 The Werken Company
-
-* JDOM, http://www.jdom.org
-
- Copyright (c) 2012 Jason Hunter & Brett McLaughlin
-
-* JSoup, http://jsoup.org
-
- Copyright (c) 2013 Jonathan Hedley
-
-* Jackson, http://jackson.codehaus.org
-
- Copyright (c) 2010 FasterXML LLC.
-
-* OpenRDF Sesame, http://www.openrdf.org
-
- Copyright (c) 2013 Aduna
-
- This software includes code developed by Aduna
- (http://www.aduna-software.com/).
-
- This software includes code developed by Ontotext AD
- (http://www.ontotext.com/).
-
- This software includes code developed by 3 Round Stones
- (http://www.3roundstones.com/).
-
- This software includes code developed by Fluid Operations
- (http://www.fluidops.com/).
-
- This software includes code developed by the Information Management Group at
- Food & Biobased Research, Wageningen University (http://www.fbr.wur.nl/).
-
- This software includes code developed by Clark & Parsia
- (http://clarkparsia.com/).
-
- This software includes code developed by the Institute for Defense Analyses
- (IDA) (http://www.ida.org/).
-
- This software includes code developed by Atos (http://www.atos.net/).
-
- This software includes code developed by Peter Ansell.
-
- The above parties have licensed their code contributions to Aduna under the
- terms of a contributor license agreement (CLA).
-
- This product includes software developed by the JUnit project
- (http://www.junit.org). License: http://junit.sourceforge.net/cpl-v10.html
-
- Parts of this product use software developed by JSON.org
- (http://www.json.org). License: http://www.json.org/license.html
-
- Parts of this product use software developed by the Mockito project
- (http://mockito.googlecode.com). License: https://github.com/mockito/mockito/blob/master/LICENSE
-
-* Semargl, http://semarglproject.org
-
- Copyright (c) 2012 Lev Khomich
-
- This product uses software developed by The Apache Software Foundation:
- Clerezza, Jena, IO Commons (http://www.apache.org/).
-
- This product includes/uses test suite developed by Hewlett-Packard
- (http://hp.com/). Copyright (c) 2002, Hewlett-Packard Company.
-
- This product includes/uses test suite developed by W3C Consortium.
-
- This product includes/uses RDFa test harness developed by RDF Web Applications
- Working Group (http://www.w3.org/2010/02/rdfa/).
-
-* ROME, http://rometools.jira.com
-
- Copyright (c) 2004 Sun Microsystems
-
-* JSONLD-Java, http://github.com/tristan/jsonld-java
-
- Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz GmbH
-
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b5c3a614/platform/marmotta-core/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/META-INF/NOTICE b/platform/marmotta-core/src/main/resources/META-INF/NOTICE
index a49305c..8a7975e 100644
--- a/platform/marmotta-core/src/main/resources/META-INF/NOTICE
+++ b/platform/marmotta-core/src/main/resources/META-INF/NOTICE
@@ -6,25 +6,8 @@ The Apache Software Foundation (http://www.apache.org/).
Apache Marmotta, Copyright 2012-2013 The Apache Software Foundation
-This product also includes the following third-party components:
+Portions of this software were originally based on the following:
-* D3.js, http://d3js.org
-
- Copyright (c) 2013 Michael Bostock
-
-* Dracula Graph Library, http://www.graphdracula.net
-
- Copyright (c) 2013 Johann Philipp Strathausen
-
-* strftime, http://hacks.bluesmoon.info/strftime
-
- Copyright (c) 2008 Philip S Tellis
-
-* jQuery, http://jquery.com
-
- Copyright (c) 2013 jQuery Foundation
-
-* Sgvizler, http://sgvizler.googlecode.com
-
- Copyright (c) 2011 Martin G. Skjæveland
+ Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
+These have been licensed to the Apache Software Foundation under a software grant.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b5c3a614/platform/marmotta-ldpath/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/src/main/resources/META-INF/NOTICE b/platform/marmotta-ldpath/src/main/resources/META-INF/NOTICE
index 3cc0e81..84d1c16 100644
--- a/platform/marmotta-ldpath/src/main/resources/META-INF/NOTICE
+++ b/platform/marmotta-ldpath/src/main/resources/META-INF/NOTICE
@@ -4,6 +4,8 @@ Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Additionally, it includes the following 3rd party modules:
+Portions of this software were originally based on the following:
- CodeMirror licensed under Apache License 2.0
+ Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
+
+These have been licensed to the Apache Software Foundation under a software grant.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b5c3a614/platform/marmotta-sparql/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/resources/META-INF/NOTICE b/platform/marmotta-sparql/src/main/resources/META-INF/NOTICE
index 83e9f63..e15a2ab 100644
--- a/platform/marmotta-sparql/src/main/resources/META-INF/NOTICE
+++ b/platform/marmotta-sparql/src/main/resources/META-INF/NOTICE
@@ -4,29 +4,8 @@ Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product also includes the following third-party components:
+Portions of this software were originally based on the following:
+ Copyright 2008-2012 Salzburg Research Forschungsgesellschaft mbH
-* CodeMirror, http://codemirror.net
-
- Copyright (c) 2013 Marijn Haverbeke
-
-* D2R Snorql, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/,
-
- Copyright (c) 2007 Richard Cyganiak
-
-* script.aculo.us, http://script.aculo.us
-
- Copyright (c) 2010 Thomas Fuchs
-
-* Prototype, http://prototypejs.org
-
- Copyright (c) 2010 Sam Stephenson
-
-* SPARQL Flint Editor, http://github.com/TSO-Openup/FlintSparqlEditor
-
- Copyright (c) 2011 TSO Ltd
-
-* Sgvizler, http://sgvizler.googlecode.com
-
- Copyright (c) 2011 Martin G. Skjæveland
+These have been licensed to the Apache Software Foundation under a software grant.
[10/50] [abbrv] git commit: extended KiWiDatabaseRunner: @ForDialect
now also applicable on a per-method level (non-matching tests will be
ignored)
Posted by ss...@apache.org.
extended KiWiDatabaseRunner: @ForDialect now also applicable on a per-method level (non-matching tests will be ignored)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/87ec95a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/87ec95a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/87ec95a2
Branch: refs/heads/master
Commit: 87ec95a214078d5dfe107f946265420887ddd530
Parents: 09f96df
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Sep 10 15:53:45 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Sep 10 15:55:12 2013 +0200
----------------------------------------------------------------------
.../kiwi/test/junit/DatabaseRunnerTest1.java | 50 ++++++++++++++++++--
.../kiwi/test/junit/DatabaseRunnerTest2.java | 49 +++++++++++++++++--
.../kiwi/test/junit/KiWiDatabaseRunner.java | 24 ++++++++--
3 files changed, 113 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/87ec95a2/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest1.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest1.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest1.java
index 7c6a9d3..310c6ec 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest1.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest1.java
@@ -17,8 +17,16 @@
*/
package org.apache.marmotta.kiwi.test.junit;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
-import org.junit.Assert;
+import org.apache.marmotta.kiwi.persistence.h2.H2Dialect;
+import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect;
+import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect;
+import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner.ForDialects;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,7 +41,43 @@ public class DatabaseRunnerTest1 {
@Test
public void testDatabase() {
- Assert.assertNotNull(dbConfig);
- System.out.println("Running test with " + dbConfig.getName());
+ assertNotNull(dbConfig);
+ }
+
+ @Test
+ @ForDialects(H2Dialect.class)
+ public void testOnlyH2() {
+ assertThat(dbConfig.getDialect(), instanceOf(H2Dialect.class));
+ }
+
+ @Test
+ @ForDialects(PostgreSQLDialect.class)
+ public void testOnlyPostgreSQL() {
+ assertThat(dbConfig.getDialect(), instanceOf(PostgreSQLDialect.class));
+ }
+
+ @Test
+ @ForDialects(MySQLDialect.class)
+ public void testOnlyMySQL() {
+ assertThat(dbConfig.getDialect(), instanceOf(MySQLDialect.class));
}
+
+ @Test
+ @ForDialects({PostgreSQLDialect.class, MySQLDialect.class})
+ public void testNotH2() {
+ assertThat(dbConfig.getDialect(), not(instanceOf(H2Dialect.class)));
+ }
+
+ @Test
+ @ForDialects({H2Dialect.class, MySQLDialect.class})
+ public void testNotPostgreSQL() {
+ assertThat(dbConfig.getDialect(), not(instanceOf(PostgreSQLDialect.class)));
+ }
+
+ @Test
+ @ForDialects({PostgreSQLDialect.class, H2Dialect.class})
+ public void testNotMySQL() {
+ assertThat(dbConfig.getDialect(), not(instanceOf(MySQLDialect.class)));
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/87ec95a2/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest2.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest2.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest2.java
index 8757672..cd23616 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest2.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/DatabaseRunnerTest2.java
@@ -17,8 +17,16 @@
*/
package org.apache.marmotta.kiwi.test.junit;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
-import org.junit.Assert;
+import org.apache.marmotta.kiwi.persistence.h2.H2Dialect;
+import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect;
+import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect;
+import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner.ForDialects;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,8 +38,43 @@ public class DatabaseRunnerTest2 {
@Test
public void testDatabase() {
- Assert.assertNotNull(dbConfig);
- System.out.println("Running test with " + dbConfig.getName());
+ assertNotNull(dbConfig);
+ }
+
+ @Test
+ @ForDialects(H2Dialect.class)
+ public void testOnlyH2() {
+ assertThat(dbConfig.getDialect(), instanceOf(H2Dialect.class));
+ }
+
+ @Test
+ @ForDialects(PostgreSQLDialect.class)
+ public void testOnlyPostgreSQL() {
+ assertThat(dbConfig.getDialect(), instanceOf(PostgreSQLDialect.class));
+ }
+ @Test
+ @ForDialects(MySQLDialect.class)
+ public void testOnlyMySQL() {
+ assertThat(dbConfig.getDialect(), instanceOf(MySQLDialect.class));
}
+
+ @Test
+ @ForDialects({PostgreSQLDialect.class, MySQLDialect.class})
+ public void testNotH2() {
+ assertThat(dbConfig.getDialect(), not(instanceOf(H2Dialect.class)));
+ }
+
+ @Test
+ @ForDialects({H2Dialect.class, MySQLDialect.class})
+ public void testNotPostgreSQL() {
+ assertThat(dbConfig.getDialect(), not(instanceOf(PostgreSQLDialect.class)));
+ }
+
+ @Test
+ @ForDialects({PostgreSQLDialect.class, H2Dialect.class})
+ public void testNotMySQL() {
+ assertThat(dbConfig.getDialect(), not(instanceOf(MySQLDialect.class)));
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/87ec95a2/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/KiWiDatabaseRunner.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/KiWiDatabaseRunner.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/KiWiDatabaseRunner.java
index 443a8e4..3eecff2 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/KiWiDatabaseRunner.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/junit/KiWiDatabaseRunner.java
@@ -27,6 +27,7 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.persistence.KiWiDialect;
import org.apache.marmotta.kiwi.persistence.h2.H2Dialect;
@@ -94,9 +95,9 @@ public class KiWiDatabaseRunner extends Suite {
* Only execute with {@link KiWiConfiguration}s for these {@link KiWiDialect}s.
*/
@Retention(RetentionPolicy.RUNTIME)
- @Target(ElementType.TYPE)
+ @Target({ElementType.TYPE, ElementType.METHOD})
public static @interface ForDialects {
- Class<? extends KiWiDialect>[] dialect();
+ Class<? extends KiWiDialect>[] value();
}
private final ArrayList<Runner> runners = new ArrayList<Runner>();
@@ -109,7 +110,7 @@ public class KiWiDatabaseRunner extends Suite {
ForDialects d = klass.getAnnotation(ForDialects.class);
if (d != null) {
ArrayList<Class<? extends KiWiDialect>> forDialects = new ArrayList<>();
- for (Class<? extends KiWiDialect> dialect : d.dialect()) {
+ for (Class<? extends KiWiDialect> dialect : d.value()) {
forDialects.add(dialect);
}
this.forDialects = Collections.unmodifiableList(forDialects);
@@ -188,6 +189,21 @@ public class KiWiDatabaseRunner extends Suite {
}
@Override
+ protected void runChild(FrameworkMethod method, RunNotifier notifier) {
+ final ForDialects forD = method.getAnnotation(ForDialects.class);
+ if (forD != null) {
+ if (ArrayUtils.contains(forD.value(), config.getDialect().getClass())) {
+ super.runChild(method, notifier);
+ } else {
+ notifier.fireTestIgnored(describeChild(method));
+ }
+ } else {
+ super.runChild(method, notifier);
+ }
+
+ }
+
+ @Override
protected Object createTest() throws Exception {
if (fieldAnnotated()) {
Object testInstance = getTestClass().getOnlyConstructor().newInstance();
@@ -312,7 +328,7 @@ public class KiWiDatabaseRunner extends Suite {
}
}
-
+
private boolean fieldAnnotated() {
return !getFieldsAnnotatedByKiWiConfig().isEmpty();
}
[14/50] [abbrv] git commit: set correct links (partly fixes
MARMOTTA-149)
Posted by ss...@apache.org.
set correct links (partly fixes MARMOTTA-149)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/3ee09772
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/3ee09772
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/3ee09772
Branch: refs/heads/master
Commit: 3ee097725eb82a5899d1e8693c0f13afc008b4f0
Parents: 6d60b04
Author: tkurz <tk...@apache.org>
Authored: Wed Sep 11 15:04:40 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Wed Sep 11 15:04:40 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/web/admin/about.html | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3ee09772/platform/marmotta-core/src/main/resources/web/admin/about.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/about.html b/platform/marmotta-core/src/main/resources/web/admin/about.html
index 743a39e..706bfda 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/about.html
+++ b/platform/marmotta-core/src/main/resources/web/admin/about.html
@@ -37,7 +37,7 @@
<p>You can find all installed features on the module list on the right side. To get a quick access to common functionalities, we listed some links:</p>
<ul>
<li><a href="import.html">Import your data:</a> RDF and non-RDF formats are supported.</li>
- <li><a href="../../sparql/admin/snorql/snorql.html">SPARQL your data:</a> full SPARQL 1.1 support including querying and updates.</li>
+ <li><a href="../../sparql/admin/snorql.html">SPARQL your data:</a> full SPARQL 1.1 support including querying and updates.</li>
<li><a href="configuration.html">Configure your database:</a> Marmotta comes with h2 embedded; configure your own database to handle bigger data.</li>
<li><a href="dataview.html">Control your data:</a> the dataview gives an overview on the current data in the system. (Attention: there might be problems with the visualisation if big data sets).</li>
<li><a href="../../user/admin/users.html">Manage your user accounts:</a> the user module allows creating and managing user accounts.</li>
@@ -47,14 +47,14 @@
<h2>Marmotta Modules</h2>
<p>Apache Marmotta provides some modules:</p>
<dl>
- <dt>Core</dt> <dd>provides the core RDF and Linked Data Platform capabilities.</dd>
- <dt>SPARQL</dt> <dd>offers query capabilities for the triplestore.</dd>
- <dt>LDPath Querying</dt> <dd>provides support for LDPath within the platform.</dd>
- <dt>Linked Data Caching</dt> <dd>provides transparent mechanism to cache Web resources.</dd>
- <dt>Reasoner</dt> <dd>adds a rule-based reasoner to the triple store.</dd>
- <dt>Security</dt> <dd>implements security mechanism.</dd>
- <dt>User</dt> <dd>provides the user management features.</dd>
- <dt>Versioning</dt> <dd>offers versioning services on top of the triple store.</dd>
+ <dt><a href="../../core/admin/about.html">Core</a></dt> <dd>provides the core RDF and Linked Data Platform capabilities.</dd>
+ <dt><a href="../../sparql/admin/about.html">SPARQL</a></dt> <dd>offers query capabilities for the triplestore.</dd>
+ <dt><a href="../../ldpath/admin/about.html">LDPath Querying</a></dt> <dd>provides support for LDPath within the platform.</dd>
+ <dt><a href="../../cache/admin/about.html">Linked Data Caching</a></dt> <dd>provides transparent mechanism to cache Web resources.</dd>
+ <dt><a href="../../reasoner/admin/about.html">Reasoner</a></dt> <dd>adds a rule-based reasoner to the triple store.</dd>
+ <dt><a href="../../security/admin/about.html">Security</a></dt> <dd>implements security mechanism.</dd>
+ <dt><a href="../../user/me.html">User</a></dt> <dd>provides the user management features.</dd>
+ <dt><a href="../../versioning/admin/about.html">Versioning</a></dt> <dd>offers versioning services on top of the triple store.</dd>
</dl>
<!--###END_CONTENT###-->
</body>
[08/50] [abbrv] git commit: MARMOTTA-155: fixed issue with 3-char
locales (LocaleUtils.toLocale() does not handle them properly)
Posted by ss...@apache.org.
MARMOTTA-155: fixed issue with 3-char locales (LocaleUtils.toLocale() does not handle them properly)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/d467cec7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/d467cec7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/d467cec7
Branch: refs/heads/master
Commit: d467cec7e5dbabf37a9f4f9f3b2f71979e1b4726
Parents: be890b6
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Sep 10 14:44:16 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Sep 10 14:44:16 2013 +0200
----------------------------------------------------------------------
.../apache/marmotta/kiwi/model/rdf/KiWiLiteral.java | 15 ++++++---------
.../marmotta/kiwi/persistence/KiWiConnection.java | 9 ++++++---
.../apache/marmotta/kiwi/sail/KiWiValueFactory.java | 10 +++++-----
3 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d467cec7/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
index 9526081..e96220e 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
@@ -17,20 +17,17 @@
*/
package org.apache.marmotta.kiwi.model.rdf;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Locale;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
import org.apache.marmotta.commons.sesame.model.Namespaces;
-import com.google.common.hash.HashCode;
-import com.google.common.hash.HashFunction;
-import com.google.common.hash.Hasher;
-import com.google.common.hash.Hashing;
import org.openrdf.model.Literal;
import org.openrdf.model.URI;
import org.openrdf.model.datatypes.XMLDatatypeUtil;
-import javax.xml.datatype.XMLGregorianCalendar;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Locale;
-
/**
* KiWiLiterals store literal information from the knowledge base. They directly
* correspond to an RDF literal stored in Sesame. KiWiLiterals are
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d467cec7/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
index 3467525..cbba4e2 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
@@ -18,12 +18,16 @@
package org.apache.marmotta.kiwi.persistence;
import info.aduna.iteration.*;
+
import org.apache.marmotta.commons.sesame.model.LiteralCommons;
import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.apache.marmotta.commons.util.DateUtils;
+
import com.google.common.base.Preconditions;
+
import net.sf.ehcache.Cache;
import net.sf.ehcache.Element;
+
import org.apache.commons.lang3.LocaleUtils;
import org.apache.marmotta.kiwi.caching.KiWiCacheManager;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
@@ -1707,9 +1711,8 @@ public class KiWiConnection {
protected static Locale getLocale(String language) {
Locale locale = localeMap.get(language);
if(locale == null && language != null) {
- locale = LocaleUtils.toLocale(language.replace("-","_"));
- localeMap.put(language,locale);
-
+ locale = Locale.forLanguageTag(language);
+ localeMap.put(language, locale);
}
return locale;
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/d467cec7/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
index 0074ede..78f630e 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
@@ -49,7 +49,6 @@ public class KiWiValueFactory implements ValueFactory {
private Random anonIdGenerator;
-
/**
* This is a hash map for storing references to resources that have not yet been persisted. It is used e.g. when
* one or more transactions are currently active and request the creation of same resource several times
@@ -393,14 +392,15 @@ public class KiWiValueFactory implements ValueFactory {
Locale locale;
if(lang != null) {
try {
- locale = LocaleUtils.toLocale(lang.replace("-","_"));
+ locale = Locale.forLanguageTag(lang);
} catch (IllegalArgumentException ex) {
log.warn("malformed language literal (language: {})", lang);
locale = null;
- lang = null;
+ lang = null;
}
- } else
- locale = null;
+ } else {
+ locale = null;
+ }
if (lang != null) {
// FIXME: MARMOTTA-39 (no rdf:langString)
[41/50] [abbrv] git commit: fixed RAT pattern
Posted by ss...@apache.org.
fixed RAT pattern
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/27ee0920
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/27ee0920
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/27ee0920
Branch: refs/heads/master
Commit: 27ee0920f400f45a7d1fe5cac1778c4a7eba08c4
Parents: 1e46218
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 24 10:43:17 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 24 10:43:17 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/27ee0920/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ec62ebe..fe6ea61 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -455,7 +455,7 @@
<exclude>**/src/ext/**</exclude>
<exclude>**/src/main/resources/task-dialog*.properties</exclude>
<exclude>**/src/test/resources/org/apache/marmotta/commons/sesame/rio/vcard/*.vcf</exclude>
- <exclude>platform/marmotta-sparql/src/main/resources/web/admin/sgvizler.html</exclude>
+ <exclude>**/src/main/resources/web/admin/sgvizler.html</exclude>
<!-- META-INF files don't take a license header -->
<exclude>**/META-INF/**</exclude>
[35/50] [abbrv] git commit: [maven-release-plugin] prepare for next
development iteration
Posted by ss...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/e2d98299
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/e2d98299
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/e2d98299
Branch: refs/heads/master
Commit: e2d98299c8c1570f0bc738a7c864640befb8d6b5
Parents: 543a6f6
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Sep 13 15:09:20 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Sep 13 15:09:20 2013 +0200
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 2 +-
build/archetypes/marmotta-archetype-webapp/pom.xml | 2 +-
build/archetypes/pom.xml | 2 +-
build/checkstyle-resources/pom.xml | 2 +-
build/dependency-resource-supplement/pom.xml | 2 +-
build/plugins/buildinfo-maven-plugin/pom.xml | 2 +-
build/plugins/marmotta-maven-plugin/pom.xml | 2 +-
build/plugins/pom.xml | 2 +-
build/plugins/refpack-maven-plugin/pom.xml | 2 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 2 +-
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 2 +-
extras/webjars/codemirror/pom.xml | 2 +-
extras/webjars/pom.xml | 2 +-
extras/webjars/sgvizler/pom.xml | 2 +-
extras/webjars/snorql/pom.xml | 2 +-
extras/webjars/strftime/pom.xml | 2 +-
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-splash/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 2 +-
libraries/kiwi/kiwi-sparql/pom.xml | 2 +-
libraries/kiwi/kiwi-transactions/pom.xml | 2 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 2 +-
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
libraries/kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-api/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-file/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-core/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-facebook/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-html/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-ldap/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdf/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdfa/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-vimeo/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-xml/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-youtube/pom.xml | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
libraries/ldpath/ldpath-core/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
libraries/ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 7 +------
platform/marmotta-core/pom.xml | 2 +-
platform/marmotta-ldcache/pom.xml | 2 +-
platform/marmotta-ldpath/pom.xml | 2 +-
platform/marmotta-reasoner/pom.xml | 2 +-
platform/marmotta-security/pom.xml | 2 +-
platform/marmotta-sparql/pom.xml | 2 +-
platform/marmotta-user/pom.xml | 2 +-
platform/marmotta-versioning/pom.xml | 2 +-
platform/pom.xml | 2 +-
pom.xml | 4 ++--
88 files changed, 89 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index 8cc13ff..f0fd540 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index bfb2aba..b7a424c 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index dea4e2a..8e0a159 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>archetypes-reactor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index 0ef41ed..b3a6a3a 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index 92d77a4..c8f01c2 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index e363329..7b37981 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index fc86edf..ccbf2c7 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<artifactId>plugins-reactor</artifactId>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index 3a11349..9b81934 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 0ab97f5..097efe3 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<artifactId>plugins-reactor</artifactId>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index c1982b4..95fafb3 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>plugins-reactor</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>23</version> <relativePath /> -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index a3bd4de..58d17db 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index 07ef981..fb27410 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index f636502..ff5a67c 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 0eac626..3959563 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index a84fbaf..4e7e229 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 06ba1eb..7104ebe 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index 36be4ae..d228916 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index 9dfd8a5..b490c5a 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index 475ae41..ccde248 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index 8ec3e73..9115052 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 0f4a8d8..619db50 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index 25de2c0..b7a194e 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 0be1aef..281e334 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index 1605757..004f5bd 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/extras/webjars/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml
index 2450243..98034fc 100644
--- a/extras/webjars/pom.xml
+++ b/extras/webjars/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index a611271..30ad9f1 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index 0f8831e..bb286d5 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index 6f337ab..bbf66df 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 5db3648..d2e7902 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index aea7c89..edcd041 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 60d6f86..fb30987 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 8aa8a8d..95fa064 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index c4bcf84..b28547d 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index e76b396..5785642 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index 3ddd37d..f824894 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index 07d3b2d..41fc742 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index ac82859..b8e880a 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index 2c8a49d..c0b297c 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>kiwi-tripletable</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index 81c2a4c..ebed513 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 665f70d..f219e8b 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index 13dbd08..be4cb03 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index 0df8bea..e3270ac 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldcache/ldcache-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml
index 881b2bf..7a6cd94 100644
--- a/libraries/ldcache/ldcache-backend-file/pom.xml
+++ b/libraries/ldcache/ldcache-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldcache/ldcache-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
index 1fab347..f638d16 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldcache/ldcache-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml
index 6b2c713..7499cc7 100644
--- a/libraries/ldcache/ldcache-core/pom.xml
+++ b/libraries/ldcache/ldcache-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldcache/ldcache-sail-generic/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/pom.xml b/libraries/ldcache/ldcache-sail-generic/pom.xml
index 8ed617e..b43d08c 100644
--- a/libraries/ldcache/ldcache-sail-generic/pom.xml
+++ b/libraries/ldcache/ldcache-sail-generic/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldcache/ldcache-sail-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/pom.xml b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
index 8c755ea..428fe07 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml
index 26dee79..d8de48e 100644
--- a/libraries/ldcache/pom.xml
+++ b/libraries/ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 6873d92..250f7fd 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index de02401..93e5f65 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index e1526d5..17f40b5 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-provider-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml
index 8b4a77d..a78e4d5 100644
--- a/libraries/ldclient/ldclient-provider-html/pom.xml
+++ b/libraries/ldclient/ldclient-provider-html/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-provider-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml
index 539209e..6d0b934 100644
--- a/libraries/ldclient/ldclient-provider-ldap/pom.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
index c2d2d9f..08e8437 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index 6719feb..9a09b52 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index fd75822..5b6df79 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-provider-rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdfa/pom.xml b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
index 8dcd4b3..247df46 100644
--- a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index d1e38fa..f2fc4d7 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-provider-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml
index 12ebc32..5d8deae 100644
--- a/libraries/ldclient/ldclient-provider-xml/pom.xml
+++ b/libraries/ldclient/ldclient-provider-xml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index 43ebc06..1a79aa4 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldclient/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml
index 084786b..e0e2a21 100644
--- a/libraries/ldclient/pom.xml
+++ b/libraries/ldclient/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index d97b08f..f1eff45 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index 236ff61..a5d5c02 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index 6338891..24e946f 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 5be1f7e..978d1af 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index da8f536..ac9b6b9 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index 95dd222..b68926d 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index ac7553a..150c0da 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index 62e6fe7..cecc3cc 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index dc031ad..83a77ed 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index 333fbcc..a7c844c 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 42823a3..39cca2b 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index 57a840d..22d1c42 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index d2a227d..d317f1f 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index a2f5a15..b5a6723 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 42eaaa3..2981dce 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/libraries/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 9c1079c..8c2f6cf 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ec6db55..db1135d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<packaging>pom</packaging>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<name>Apache Marmotta Parent</name>
<description>Parent POM for the Apache Marmotta project</description>
@@ -1585,9 +1585,4 @@
<tag>3.0.0-incubating</tag>
</scm>
-->
-
-
- <scm>
- <tag>3.1.0-incubating</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index f27b855..a3c5ca4 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index 2fac3fb..b9c52e9 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index 9178ee7..abb6788 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index 0b0cee3..a58c1ee 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 3e6f337..5b47e3c 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index fbe950b..37189dd 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index c8279ec..23b1870 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index 35a0868..77590aa 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index 3713bab..6f1264b 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/e2d98299/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee0fec8..ae48672 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.2.0-incubating-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
@@ -124,7 +124,7 @@
<url>https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</url>
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git</developerConnection>
- <tag>3.1.0-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
[45/50] [abbrv] git commit: revert release candidate 2
Posted by ss...@apache.org.
revert release candidate 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/5ee14835
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/5ee14835
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/5ee14835
Branch: refs/heads/master
Commit: 5ee14835110785c7bc2b595b87d10ec339ef8886
Parents: f208316
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 24 15:47:59 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 24 15:47:59 2013 +0200
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 2 +-
build/archetypes/marmotta-archetype-webapp/pom.xml | 2 +-
build/archetypes/pom.xml | 2 +-
build/checkstyle-resources/pom.xml | 2 +-
build/dependency-resource-supplement/pom.xml | 2 +-
build/plugins/buildinfo-maven-plugin/pom.xml | 2 +-
build/plugins/marmotta-maven-plugin/pom.xml | 2 +-
build/plugins/pom.xml | 2 +-
build/plugins/refpack-maven-plugin/pom.xml | 2 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 2 +-
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 2 +-
extras/webjars/codemirror/pom.xml | 2 +-
extras/webjars/pom.xml | 2 +-
extras/webjars/sgvizler/pom.xml | 2 +-
extras/webjars/snorql/pom.xml | 2 +-
extras/webjars/strftime/pom.xml | 2 +-
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-splash/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 2 +-
libraries/kiwi/kiwi-sparql/pom.xml | 2 +-
libraries/kiwi/kiwi-transactions/pom.xml | 2 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 2 +-
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
libraries/kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-api/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-file/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-core/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-facebook/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-html/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-ldap/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdf/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdfa/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-vimeo/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-xml/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-youtube/pom.xml | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
libraries/ldpath/ldpath-core/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
libraries/ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 2 +-
platform/marmotta-core/pom.xml | 2 +-
platform/marmotta-ldcache/pom.xml | 2 +-
platform/marmotta-ldpath/pom.xml | 2 +-
platform/marmotta-reasoner/pom.xml | 2 +-
platform/marmotta-security/pom.xml | 2 +-
platform/marmotta-sparql/pom.xml | 2 +-
platform/marmotta-user/pom.xml | 2 +-
platform/marmotta-versioning/pom.xml | 2 +-
platform/pom.xml | 2 +-
pom.xml | 2 +-
88 files changed, 88 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index f0fd540..15ab89d 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index b7a424c..dde1896 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index 8e0a159..bb1c01b 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>archetypes-reactor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index b3a6a3a..2a55e83 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index c8f01c2..d9eb75a 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index 7b37981..df5c3aa 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index ccbf2c7..5126b17 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<artifactId>plugins-reactor</artifactId>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index 9b81934..d25196d 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 097efe3..4f129c1 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<artifactId>plugins-reactor</artifactId>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index 95fafb3..3da02ac 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>plugins-reactor</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>23</version> <relativePath /> -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index 58d17db..b6b8359 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index fb27410..b79125f 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index ff5a67c..2213ba3 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 3959563..f63e640 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index 4e7e229..a672ec2 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 7104ebe..182338c 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index d228916..1e318d5 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index b490c5a..c7d7532 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index ccde248..18c3eee 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index 9115052..3414eed 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 619db50..5dd8f40 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index b7a194e..6d88340 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 281e334..393b2de 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index 004f5bd..1a8e2dd 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/extras/webjars/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml
index 98034fc..927b81b 100644
--- a/extras/webjars/pom.xml
+++ b/extras/webjars/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index 30ad9f1..8a7a862 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index bb286d5..832e8aa 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index bbf66df..79f8730 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index d2e7902..11b8ec7 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index edcd041..0d8d859 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index fb30987..444f55f 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 95fa064..01fc15b 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index b28547d..ce9fda9 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index 5785642..cdc67aa 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index f824894..9187873 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index 41fc742..c76886e 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index b8e880a..493383a 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index c0b297c..9f98878 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>kiwi-tripletable</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index ebed513..7a3dc74 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index f219e8b..323b311 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index be4cb03..5cc7128 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index e3270ac..f4db276 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldcache/ldcache-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml
index 7a6cd94..b613fb8 100644
--- a/libraries/ldcache/ldcache-backend-file/pom.xml
+++ b/libraries/ldcache/ldcache-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldcache/ldcache-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
index f638d16..a67f0a5 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldcache/ldcache-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml
index 7499cc7..f406705 100644
--- a/libraries/ldcache/ldcache-core/pom.xml
+++ b/libraries/ldcache/ldcache-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldcache/ldcache-sail-generic/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/pom.xml b/libraries/ldcache/ldcache-sail-generic/pom.xml
index b43d08c..6556e5b 100644
--- a/libraries/ldcache/ldcache-sail-generic/pom.xml
+++ b/libraries/ldcache/ldcache-sail-generic/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldcache/ldcache-sail-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/pom.xml b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
index 428fe07..e05681f 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml
index d8de48e..b7d126d 100644
--- a/libraries/ldcache/pom.xml
+++ b/libraries/ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 250f7fd..22eb397 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index 93e5f65..17dd713 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index 17f40b5..7b044f3 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-provider-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml
index a78e4d5..efa9821 100644
--- a/libraries/ldclient/ldclient-provider-html/pom.xml
+++ b/libraries/ldclient/ldclient-provider-html/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-provider-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml
index 6d0b934..4736c8f 100644
--- a/libraries/ldclient/ldclient-provider-ldap/pom.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
index 08e8437..a97c354 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index 9a09b52..c67862f 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index 5b6df79..ab3355a 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-provider-rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdfa/pom.xml b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
index 247df46..eb1e264 100644
--- a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index f2fc4d7..541bd79 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-provider-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml
index 5d8deae..0ff9206 100644
--- a/libraries/ldclient/ldclient-provider-xml/pom.xml
+++ b/libraries/ldclient/ldclient-provider-xml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index 1a79aa4..062ce27 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldclient/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml
index e0e2a21..a35912e 100644
--- a/libraries/ldclient/pom.xml
+++ b/libraries/ldclient/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index f1eff45..faacf31 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index a5d5c02..a8ebdae 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index 24e946f..30028ce 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 978d1af..030d560 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index ac9b6b9..b500bc4 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index b68926d..70738f8 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index 150c0da..b2f6704 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index cecc3cc..dea27be 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index 83a77ed..d49d490 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index a7c844c..ae8abfa 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 39cca2b..0e9612e 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index 22d1c42..0ce6361 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index d317f1f..818b73e 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index b5a6723..a4c680a 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 2981dce..99568d2 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/libraries/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 8c2f6cf..a3dbffd 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2bfcc52..fe6ea61 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<packaging>pom</packaging>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<name>Apache Marmotta Parent</name>
<description>Parent POM for the Apache Marmotta project</description>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index a3c5ca4..6ebaaf8 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index b9c52e9..b73049a 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index abb6788..19a16a0 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index a58c1ee..861a38c 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 5b47e3c..183e65d 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 37189dd..2e7a6d3 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index 23b1870..a6ac0fb 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index 77590aa..aa64a16 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index 6f1264b..8c7a027 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5ee14835/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ae48672..aaa9f22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
[17/50] [abbrv] git commit: fixed MARMOTTA-280
Posted by ss...@apache.org.
fixed MARMOTTA-280
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/5f777a16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/5f777a16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/5f777a16
Branch: refs/heads/master
Commit: 5f777a16a38cf69761bd3d0d001a63f20d80dab5
Parents: d74b7a7
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Wed Sep 11 17:17:00 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Wed Sep 11 17:17:00 2013 +0200
----------------------------------------------------------------------
.../sesame/facading/impl/FacadingImpl.java | 3 ++
.../concurrent/ConcurrentFacadingTest.java | 1 +
.../evaluation/KiWiEvaluationStrategyImpl.java | 9 +++--
.../persistence/KiWiSparqlConnection.java | 25 ++++++++++--
.../sparql/sail/KiWiSparqlSailConnection.java | 2 +-
.../kiwi/persistence/KiWiConnection.java | 3 ++
.../kiwi/persistence/h2/statements.properties | 1 +
.../marmotta/kiwi/test/RepositoryTest.java | 42 ++++++++++++++++++++
.../services/sparql/SparqlServiceImpl.java | 2 +-
.../src/main/resources/web/admin/snorql.html | 1 -
.../src/main/resources/web/admin/update.html | 1 -
11 files changed, 78 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java b/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
index be43a64..8cfba98 100644
--- a/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
+++ b/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/impl/FacadingImpl.java
@@ -113,6 +113,9 @@ public class FacadingImpl implements Facading {
final URI r_type = connection.getValueFactory().createURI(s_type);
connection.add(r, RDF_TYPE, r_type, context);
log.trace("added type {} to {} because of RDFType-Annotation", r_type, r);
+ if(!connection.hasStatement(r, RDF_TYPE, r_type,true,context)) {
+ log.error("error adding type for facade!");
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
index 32ce2a0..504699d 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/concurrent/ConcurrentFacadingTest.java
@@ -53,6 +53,7 @@ public class ConcurrentFacadingTest extends AbstractFacadingTest {
}
@Test
+ @Ignore("currently fails for H2 database because of transaction locking")
public void testParallelFacading() throws RepositoryException {
final RepositoryConnection fc = repositoryRDF.getConnection();
try {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategyImpl.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategyImpl.java
index dd3e905..b6cb5e6 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategyImpl.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategyImpl.java
@@ -23,6 +23,7 @@ import org.apache.marmotta.kiwi.sparql.persistence.KiWiSparqlConnection;
import org.openrdf.query.BindingSet;
import org.openrdf.query.Dataset;
import org.openrdf.query.QueryEvaluationException;
+import org.openrdf.query.QueryInterruptedException;
import org.openrdf.query.algebra.*;
import org.openrdf.query.algebra.evaluation.TripleSource;
import org.openrdf.query.algebra.evaluation.impl.EvaluationStrategyImpl;
@@ -81,11 +82,11 @@ public class KiWiEvaluationStrategyImpl extends EvaluationStrategyImpl{
}
};
} catch (SQLException e) {
- throw new QueryEvaluationException(e);
+ throw new QueryEvaluationException(e.getMessage(),e);
} catch (IllegalArgumentException e) {
- throw new QueryEvaluationException(e);
+ throw new QueryEvaluationException(e.getMessage(),e);
} catch (InterruptedException e) {
- throw new QueryEvaluationException(e);
+ throw new QueryInterruptedException(e.getMessage());
}
} else {
return super.evaluate(join, bindings);
@@ -109,7 +110,7 @@ public class KiWiEvaluationStrategyImpl extends EvaluationStrategyImpl{
} catch (IllegalArgumentException e) {
throw new QueryEvaluationException(e);
} catch (InterruptedException e) {
- throw new QueryEvaluationException(e);
+ throw new QueryInterruptedException(e);
}
} else {
return super.evaluate(join, bindings);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java
index 4ca85e8..61eedd2 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java
@@ -304,12 +304,20 @@ public class KiWiSparqlConnection {
executorService.submit(new Callable<ResultSet>() {
@Override
public ResultSet call() throws Exception {
- return queryStatement.executeQuery();
+ try {
+ return queryStatement.executeQuery();
+ } catch (SQLException ex) {
+ if(Thread.interrupted()) {
+ log.info("SQL query execution cancelled; not returning result (Thread={})", Thread.currentThread());
+ throw new InterruptedException("SPARQL query execution cancelled");
+ } else {
+ throw ex;
+ }
+ }
}
}
);
-
try {
ResultSet result = queryFuture.get();
@@ -336,11 +344,20 @@ public class KiWiSparqlConnection {
return new CloseableIteratorIteration<BindingSet, SQLException>(Iterations.asList(it).iterator());
} catch (InterruptedException | CancellationException e) {
log.info("SPARQL query execution cancelled");
+ queryFuture.cancel(true);
queryStatement.cancel();
+ queryStatement.close();
+
throw new InterruptedException("SPARQL query execution cancelled");
} catch (ExecutionException e) {
- log.error("error executing SPARQL query",e);
- throw new SQLException("error executing SPARQL query",e);
+ log.error("error executing SPARQL query",e.getCause());
+ if(e.getCause() instanceof SQLException) {
+ throw (SQLException)e.getCause();
+ } else if(e.getCause() instanceof InterruptedException) {
+ throw (InterruptedException)e.getCause();
+ } else {
+ throw new SQLException("error executing SPARQL query",e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSailConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSailConnection.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSailConnection.java
index b26ee36..d92808f 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSailConnection.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sail/KiWiSparqlSailConnection.java
@@ -90,7 +90,7 @@ public class KiWiSparqlSailConnection extends NotifyingSailConnectionWrapper {
return strategy.evaluate(tupleExpr, EmptyBindingSet.getInstance());
} catch (QueryEvaluationException e) {
- throw new SailException(e);
+ throw new SailException(e.getMessage(),e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
index 3043e70..c771f5a 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
@@ -1118,6 +1118,9 @@ public class KiWiConnection {
return count > 0;
} catch(SQLException ex) {
+ if("HYT00".equals(ex.getSQLState())) { // H2 table locking timeout
+ throw new ConcurrentModificationException("the same triple was modified in concurrent transactions (triple="+triple+")");
+ }
// this is an ugly hack to catch duplicate key errors in some databases (H2)
// better option could be http://stackoverflow.com/questions/6736518/h2-java-insert-ignore-allow-exception
return false;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
index 3bb64a9..130e3e7 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
@@ -61,6 +61,7 @@ store.tliteral = INSERT INTO nodes (id,ntype,svalue,tvalue,ltype,createdAt
store.namespace = INSERT INTO namespaces (id,prefix,uri,createdAt) VALUES (?,?,?,?)
store.triple = INSERT INTO triples (id,subject,predicate,object,context,inferred,createdAt) VALUES (?,?,?,?,?,?,?)
+#store.triple = MERGE INTO triples (id,subject,predicate,object,context,inferred,createdAt) KEY(id) VALUES (?,?,?,?,?,?,?)
load.triple = SELECT id FROM triples WHERE subject = ? AND predicate = ? AND object = ? AND context = ? AND deleted = false AND inferred = true
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
index 9d2fd3d..8568b51 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
@@ -29,6 +29,7 @@ import static org.junit.Assume.assumeThat;
import java.io.IOException;
import java.io.InputStream;
import java.sql.SQLException;
+import java.util.ConcurrentModificationException;
import java.util.List;
import org.apache.commons.lang3.RandomStringUtils;
@@ -672,4 +673,45 @@ public class RepositoryTest {
}
}
+ /**
+ * Test the concurrent connection problem reported in MARMOTTA-236 for facading:
+ * - get two parallel connections
+ * - add triple in connection 1; should be available in connection 1 and not in connection 2
+ * - add same triple in connection 2; should be available in both, connection 1 and connection 2 or
+ * fail-fast by throwing a ConcurrentModificationException
+ * @throws Exception
+ */
+ @Test
+ public void testMARMOTTA236() throws Exception {
+ RepositoryConnection con1 = repository.getConnection();
+ RepositoryConnection con2 = repository.getConnection();
+
+ try {
+ URI r1 = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
+ URI r2 = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
+ URI r3 = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
+
+ con1.begin();
+ con1.add(r1,r2,r3);
+
+ Assert.assertTrue(con1.hasStatement(r1,r2,r3,true));
+
+ con2.begin();
+ Assert.assertFalse(con2.hasStatement(r1,r2,r3,true));
+
+ con2.add(r1,r2,r3);
+
+ Assert.assertTrue(con2.hasStatement(r1,r2,r3,true));
+
+ con2.rollback();
+ con1.commit();
+ } catch (ConcurrentModificationException ex) {
+
+ } finally {
+ con1.close();
+ con2.close();
+ }
+
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
index ba3ab5a..1384dae 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
@@ -151,7 +151,7 @@ public class SparqlServiceImpl implements SparqlService {
log.error("error while getting repository connection: {}", e);
throw new MarmottaException("error while getting repository connection", e);
} catch (QueryEvaluationException e) {
- log.error("error while evaluating query: {}", e);
+ log.error("error while evaluating query: {}", e.getMessage());
throw new MarmottaException("error while writing query result in format ", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/platform/marmotta-sparql/src/main/resources/web/admin/snorql.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql.html b/platform/marmotta-sparql/src/main/resources/web/admin/snorql.html
index 4d79e45..1cd0349 100755
--- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql.html
+++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql.html
@@ -113,7 +113,6 @@
<script type="text/javascript" src="../../webjars/snorql/1.0/snorql.js"></script>
<script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script>
<script type="text/javascript" src="../../webjars/codemirror/3.16/codemirror.js"></script>
- <script type="text/javascript" src="../../webjars/codemirror/3.16/matchbrackets.js"></script>
<script type="text/javascript">
jQuery.noConflict();
</script>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5f777a16/platform/marmotta-sparql/src/main/resources/web/admin/update.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/update.html b/platform/marmotta-sparql/src/main/resources/web/admin/update.html
index f8033f5..691ad66 100644
--- a/platform/marmotta-sparql/src/main/resources/web/admin/update.html
+++ b/platform/marmotta-sparql/src/main/resources/web/admin/update.html
@@ -77,7 +77,6 @@
<script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script>
<script type="text/javascript" src="../../webjars/jquery-ui/1.8.21/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../webjars/codemirror/3.16/codemirror.js"></script>
- <script type="text/javascript" src="../../webjars/codemirror/3.16/matchbrackets.js"></script>
<script type="text/javascript">
[40/50] [abbrv] git commit: revert 3.1.0 RC1
Posted by ss...@apache.org.
revert 3.1.0 RC1
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/1e46218e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/1e46218e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/1e46218e
Branch: refs/heads/master
Commit: 1e46218ef3934c66c704cd1f77f3b5952a460981
Parents: 81721b1
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 24 10:34:10 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 24 10:34:10 2013 +0200
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 2 +-
build/archetypes/marmotta-archetype-webapp/pom.xml | 2 +-
build/archetypes/pom.xml | 2 +-
build/checkstyle-resources/pom.xml | 2 +-
build/dependency-resource-supplement/pom.xml | 2 +-
build/plugins/buildinfo-maven-plugin/pom.xml | 2 +-
build/plugins/marmotta-maven-plugin/pom.xml | 2 +-
build/plugins/pom.xml | 2 +-
build/plugins/refpack-maven-plugin/pom.xml | 2 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 2 +-
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 2 +-
extras/webjars/codemirror/pom.xml | 2 +-
extras/webjars/pom.xml | 2 +-
extras/webjars/sgvizler/pom.xml | 2 +-
extras/webjars/snorql/pom.xml | 2 +-
extras/webjars/strftime/pom.xml | 2 +-
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-splash/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 2 +-
libraries/kiwi/kiwi-sparql/pom.xml | 2 +-
libraries/kiwi/kiwi-transactions/pom.xml | 2 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 2 +-
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
libraries/kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-api/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-file/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-core/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-facebook/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-html/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-ldap/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdf/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdfa/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-vimeo/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-xml/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-youtube/pom.xml | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
libraries/ldpath/ldpath-core/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
libraries/ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 2 +-
platform/marmotta-core/pom.xml | 2 +-
platform/marmotta-ldcache/pom.xml | 2 +-
platform/marmotta-ldpath/pom.xml | 2 +-
platform/marmotta-reasoner/pom.xml | 2 +-
platform/marmotta-security/pom.xml | 2 +-
platform/marmotta-sparql/pom.xml | 2 +-
platform/marmotta-user/pom.xml | 2 +-
platform/marmotta-versioning/pom.xml | 2 +-
platform/pom.xml | 2 +-
pom.xml | 2 +-
88 files changed, 88 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index f0fd540..15ab89d 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index b7a424c..dde1896 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index 8e0a159..bb1c01b 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>archetypes-reactor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index b3a6a3a..2a55e83 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index c8f01c2..d9eb75a 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index 7b37981..df5c3aa 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index ccbf2c7..5126b17 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<artifactId>plugins-reactor</artifactId>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index 9b81934..d25196d 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 097efe3..4f129c1 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<artifactId>plugins-reactor</artifactId>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index 95fafb3..3da02ac 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>plugins-reactor</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>23</version> <relativePath /> -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index 58d17db..b6b8359 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index fb27410..b79125f 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index ff5a67c..2213ba3 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 3959563..f63e640 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index 4e7e229..a672ec2 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 7104ebe..182338c 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index d228916..1e318d5 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index b490c5a..c7d7532 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index ccde248..18c3eee 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index 9115052..3414eed 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 619db50..5dd8f40 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index b7a194e..6d88340 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 281e334..393b2de 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index 004f5bd..1a8e2dd 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/extras/webjars/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml
index 98034fc..927b81b 100644
--- a/extras/webjars/pom.xml
+++ b/extras/webjars/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index 30ad9f1..8a7a862 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index bb286d5..832e8aa 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index bbf66df..79f8730 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index d2e7902..11b8ec7 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index edcd041..0d8d859 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index fb30987..444f55f 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 95fa064..01fc15b 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index b28547d..ce9fda9 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index 5785642..cdc67aa 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index f824894..9187873 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index 41fc742..c76886e 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index b8e880a..493383a 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index c0b297c..9f98878 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>kiwi-tripletable</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index ebed513..7a3dc74 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index f219e8b..323b311 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index be4cb03..5cc7128 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index e3270ac..f4db276 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldcache/ldcache-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml
index 7a6cd94..b613fb8 100644
--- a/libraries/ldcache/ldcache-backend-file/pom.xml
+++ b/libraries/ldcache/ldcache-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldcache/ldcache-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
index f638d16..a67f0a5 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldcache/ldcache-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml
index 7499cc7..f406705 100644
--- a/libraries/ldcache/ldcache-core/pom.xml
+++ b/libraries/ldcache/ldcache-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldcache/ldcache-sail-generic/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/pom.xml b/libraries/ldcache/ldcache-sail-generic/pom.xml
index b43d08c..6556e5b 100644
--- a/libraries/ldcache/ldcache-sail-generic/pom.xml
+++ b/libraries/ldcache/ldcache-sail-generic/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldcache/ldcache-sail-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/pom.xml b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
index 428fe07..e05681f 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml
index d8de48e..b7d126d 100644
--- a/libraries/ldcache/pom.xml
+++ b/libraries/ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 250f7fd..22eb397 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index 93e5f65..17dd713 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index 17f40b5..7b044f3 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-provider-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml
index a78e4d5..efa9821 100644
--- a/libraries/ldclient/ldclient-provider-html/pom.xml
+++ b/libraries/ldclient/ldclient-provider-html/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-provider-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml
index 6d0b934..4736c8f 100644
--- a/libraries/ldclient/ldclient-provider-ldap/pom.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
index 08e8437..a97c354 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index 9a09b52..c67862f 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index 5b6df79..ab3355a 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-provider-rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdfa/pom.xml b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
index 247df46..eb1e264 100644
--- a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index f2fc4d7..541bd79 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-provider-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml
index 5d8deae..0ff9206 100644
--- a/libraries/ldclient/ldclient-provider-xml/pom.xml
+++ b/libraries/ldclient/ldclient-provider-xml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index 1a79aa4..062ce27 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldclient/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml
index e0e2a21..a35912e 100644
--- a/libraries/ldclient/pom.xml
+++ b/libraries/ldclient/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index f1eff45..faacf31 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index a5d5c02..a8ebdae 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index 24e946f..30028ce 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 978d1af..030d560 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index ac9b6b9..b500bc4 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index b68926d..70738f8 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index 150c0da..b2f6704 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index cecc3cc..dea27be 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index 83a77ed..d49d490 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index a7c844c..ae8abfa 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 39cca2b..0e9612e 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index 22d1c42..0ce6361 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index d317f1f..818b73e 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index b5a6723..a4c680a 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 2981dce..99568d2 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/libraries/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 8c2f6cf..a3dbffd 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index db1135d..ec62ebe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<packaging>pom</packaging>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<name>Apache Marmotta Parent</name>
<description>Parent POM for the Apache Marmotta project</description>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index a3c5ca4..6ebaaf8 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index b9c52e9..b73049a 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index abb6788..19a16a0 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index a58c1ee..861a38c 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 5b47e3c..183e65d 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 37189dd..2e7a6d3 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index 23b1870..a6ac0fb 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index 77590aa..aa64a16 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index 6f1264b..8c7a027 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1e46218e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ae48672..aaa9f22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.2.0-incubating-SNAPSHOT</version>
+ <version>3.1.0-incubating-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
[02/50] [abbrv] git commit: fixes MARMOTTA-303
Posted by ss...@apache.org.
fixes MARMOTTA-303
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/ce5cf2c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/ce5cf2c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/ce5cf2c5
Branch: refs/heads/master
Commit: ce5cf2c5deb63a3bb1658e62beb6f1c880efcaaa
Parents: 83522bf
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Sep 10 11:52:05 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Sep 10 11:52:05 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/web/public/html/reasoning.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ce5cf2c5/platform/marmotta-core/src/main/resources/web/public/html/reasoning.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/html/reasoning.html b/platform/marmotta-core/src/main/resources/web/public/html/reasoning.html
index 5a9fa95..75597af 100644
--- a/platform/marmotta-core/src/main/resources/web/public/html/reasoning.html
+++ b/platform/marmotta-core/src/main/resources/web/public/html/reasoning.html
@@ -25,7 +25,7 @@
font-size: 0.95em;
}
</style>
- <script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script>
+ <script type="text/javascript" src="../../../webjars/jquery/1.8.2/jquery.min.js"></script>
<script type="text/javascript">
var hash;
var baseURI;
[05/50] [abbrv] git commit: MARMOTTA-225: fixed re-serialisation of
URIs as fieldname
Posted by ss...@apache.org.
MARMOTTA-225: fixed re-serialisation of URIs as fieldname
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/1a3a45cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/1a3a45cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/1a3a45cc
Branch: refs/heads/master
Commit: 1a3a45ccc5724113ae1f5d6ada219d1a34152213
Parents: 6591259
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Sep 10 12:27:38 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Sep 10 12:30:34 2013 +0200
----------------------------------------------------------------------
.../ldpath/model/fields/FieldMapping.java | 23 +++++---
.../ldpath/model/tests/LiteralTypeTest.java | 15 ++++--
.../at/newmedialab/ldpath/parser/rdfpath.jj | 55 +++++++++++---------
.../src/test/resources/parse/program.ldpath | 5 +-
4 files changed, 62 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1a3a45cc/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/fields/FieldMapping.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/fields/FieldMapping.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/fields/FieldMapping.java
index 538be06..ad7984b 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/fields/FieldMapping.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/fields/FieldMapping.java
@@ -21,6 +21,7 @@ import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
+import java.net.URI;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -38,6 +39,8 @@ import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
*/
public class FieldMapping<T,Node> implements LDPathConstruct<Node> {
+ private boolean isSimpleName = true;
+
/**
* The name of the field in the search index
*/
@@ -46,7 +49,7 @@ public class FieldMapping<T,Node> implements LDPathConstruct<Node> {
/**
* The type of the field in the search index
*/
- private String fieldType;
+ private URI fieldType;
/**
* The selector to use for selecting nodes
@@ -63,10 +66,15 @@ public class FieldMapping<T,Node> implements LDPathConstruct<Node> {
*/
private Map<String, String> fieldConfig;
- public FieldMapping() {
+ private FieldMapping() {
}
-
- public FieldMapping(String fieldName, String fieldType, NodeSelector<Node> selector, NodeTransformer<T,Node> transformer, Map<String, String> fieldConfig) {
+
+ public FieldMapping(URI fieldName, URI fieldType, NodeSelector<Node> selector, NodeTransformer<T,Node> transformer, Map<String, String> fieldConfig) {
+ this(fieldName.toString(), fieldType, selector, transformer, fieldConfig);
+ this.isSimpleName = false;
+ }
+
+ public FieldMapping(String fieldName, URI fieldType, NodeSelector<Node> selector, NodeTransformer<T,Node> transformer, Map<String, String> fieldConfig) {
this();
this.fieldName = fieldName;
this.fieldType = fieldType;
@@ -80,7 +88,7 @@ public class FieldMapping<T,Node> implements LDPathConstruct<Node> {
return fieldName;
}
- public String getFieldType() {
+ public URI getFieldType() {
return fieldType;
}
@@ -162,7 +170,10 @@ public class FieldMapping<T,Node> implements LDPathConstruct<Node> {
}
fc.append(")");
}
- return String.format("%s = %s :: <%s>%s ;", fieldName, selector.getPathExpression(backend), fieldType, fc.toString());
+ if (isSimpleName)
+ return String.format("%s = %s :: <%s>%s ;", fieldName, selector.getPathExpression(backend), fieldType, fc.toString());
+ else
+ return String.format("<%s> = %s :: <%s>%s ;", fieldName, selector.getPathExpression(backend), fieldType, fc.toString());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1a3a45cc/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralTypeTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralTypeTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralTypeTest.java
index 0ed55d5..bbd63d8 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralTypeTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/LiteralTypeTest.java
@@ -17,6 +17,8 @@
*/
package org.apache.marmotta.ldpath.model.tests;
+import java.net.URI;
+
import org.apache.marmotta.ldpath.api.backend.NodeBackend;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.tests.NodeTest;
@@ -35,10 +37,14 @@ import org.apache.marmotta.ldpath.api.tests.NodeTest;
*/
public class LiteralTypeTest<Node> extends NodeTest<Node> {
- private String typeUri;
+ private URI typeUri;
public LiteralTypeTest(String typeUri) {
- this.typeUri = typeUri;
+ this.typeUri = URI.create(typeUri);
+ }
+
+ public LiteralTypeTest(URI uri) {
+ this.typeUri = uri;
}
/**
@@ -55,9 +61,10 @@ public class LiteralTypeTest<Node> extends NodeTest<Node> {
if(rdfBackend.isLiteral(node)) {
if(typeUri != null) {
- return typeUri.equals(rdfBackend.getLiteralType(node).toString());
+ return typeUri.equals(rdfBackend.getLiteralType(node));
} else {
- return null == rdfBackend.getLiteralType(node).toString();
+ // FIXME: MARMOTTA-39
+ return null == rdfBackend.getLiteralType(node);
}
} else {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1a3a45cc/libraries/ldpath/ldpath-core/src/main/javacc/at/newmedialab/ldpath/parser/rdfpath.jj
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/javacc/at/newmedialab/ldpath/parser/rdfpath.jj b/libraries/ldpath/ldpath-core/src/main/javacc/at/newmedialab/ldpath/parser/rdfpath.jj
index bd0e133..bd71bb5 100644
--- a/libraries/ldpath/ldpath-core/src/main/javacc/at/newmedialab/ldpath/parser/rdfpath.jj
+++ b/libraries/ldpath/ldpath-core/src/main/javacc/at/newmedialab/ldpath/parser/rdfpath.jj
@@ -212,11 +212,16 @@ public class LdPathParser<Node> {
}
}
+ public Node resolveURI(URI uri) {
return backend.createURI(uri.toString());
+ }
- public Node resolveResource(String uri) {
+ public Node resolveResource(String uri) throws ParseException {
return backend.createURI(uri);
}
+ public Node resolveResource(String prefix, String local) throws ParseException {
+ return resolveResource(resolveNamespace(prefix)+local);
}
+
public String resolveNamespace(String prefix) throws ParseException {
String uri = namespaces.get(prefix);
@@ -243,6 +248,14 @@ public class LdPathParser<Node> {
}
}
+ public NodeTransformer<?,Node> getTransformer(URI type) throws ParseException {
+ return getTransformer(type.toString());
+ }
+
+ public NodeTransformer<?,Node> getTransformer(Node node) throws ParseException {
+ return getTransformer(backend.stringValue(node));
+ }
+
public NodeTransformer<?,Node> getTransformer(String uri) throws ParseException {
if(xsdNodeTransformerMap.get(uri) != null) {
return xsdNodeTransformerMap.get(uri);
@@ -484,7 +497,7 @@ Program Program() :
(
<K_BOOST> boostSelector = Selector() <SCOLON> {
NodeTransformer transformer = getTransformer(Program.DOCUMENT_BOOST_TYPE);
- FieldMapping booster = new FieldMapping("@boost", Program.DOCUMENT_BOOST_TYPE, boostSelector, transformer, null);
+ FieldMapping booster = new FieldMapping("@boost", java.net.URI.create(Program.DOCUMENT_BOOST_TYPE), boostSelector, transformer, null);
program.setBooster(booster);
}
)?
@@ -504,13 +517,13 @@ Program Program() :
LinkedList<Node> UriList() :
{
LinkedList<Node> rest = null;
- String uri;
+ URI uri;
}
{
uri = Uri() ( <COMMA> rest = UriList() )?
{
if (rest == null) rest = new LinkedList<Node>();
- rest.addFirst(resolveResource(uri));
+ rest.addFirst(resolveURI(uri));
return rest;
}
}
@@ -519,8 +532,8 @@ FieldMapping Rule() :
{
FieldMapping<?,Node> rule;
Token name;
- String uri;
- String type = null;
+ URI uri;
+ URI type = null;
NodeSelector<Node> selector;
NodeTransformer<?,Node> transformer;
Map<String, String> conf = null;
@@ -600,16 +613,16 @@ String ConfVal() : {
| id = <IDENTIFIER> { return id.image; }
}
-String Uri() : {
+URI Uri() : {
Token uri, prefix, localName;
}
{
uri = <URI> {
- return uri.image.substring(1,uri.image.length()-1);
+ return java.net.URI.create(uri.image.substring(1,uri.image.length()-1));
}
| prefix = <IDENTIFIER> ":" localName = <IDENTIFIER> {
- return resolveNamespace(prefix.image)+localName.image;
+ return java.net.URI.create(resolveNamespace(prefix.image)+localName.image);
}
}
@@ -821,13 +834,11 @@ TestingSelector TestingSelector() :
ReversePropertySelector ReversePropertySelector() :
{
ReversePropertySelector result = null;
- Node property;
- String uri;
+ URI uri;
}
{
<INVERSE> uri = Uri() {
- property = resolveResource(uri);
- result = new ReversePropertySelector(property);
+ result = new ReversePropertySelector(resolveURI(uri));
return result;
}
}
@@ -835,13 +846,11 @@ ReversePropertySelector ReversePropertySelector() :
PropertySelector PropertySelector() :
{
PropertySelector result = null;
- Node property;
- String uri;
+ URI uri;
}
{
uri = Uri() {
- property = resolveResource(uri);
- result = new PropertySelector(property);
+ result = new PropertySelector(resolveURI(uri));
return result;
}
}
@@ -997,7 +1006,7 @@ LiteralLanguageTest LiteralLanguageTest():
LiteralTypeTest LiteralTypeTest():
{
- String type;
+ URI type;
}
{
<TYPE> type = Uri() {
@@ -1060,19 +1069,15 @@ PathEqualityTest PathEqualityTest():
Node Node():
{
- String uri, type = null;
+ URI uri, type = null;
Token literal, language;
}
{
uri = Uri() {
- return resolveResource(uri);
+ return resolveURI(uri);
}
| literal = <STRLIT> (<TYPE> type = Uri() )? {
- try {
- return backend.createLiteral(literal.image.substring(1, literal.image.length()-1),null,type == null ? null : new URI(type));
- } catch(java.net.URISyntaxException ex) {
- throw new ParseException("could not parse type URI "+type+": "+ex.getMessage());
- }
+ return backend.createLiteral(literal.image.substring(1, literal.image.length()-1),null,type);
}
| literal = <STRLIT> <LANG> language = <IDENTIFIER> {
return backend.createLiteral(literal.image.substring(1, literal.image.length()-1),new Locale(language.image),null);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1a3a45cc/libraries/ldpath/ldpath-core/src/test/resources/parse/program.ldpath
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/test/resources/parse/program.ldpath b/libraries/ldpath/ldpath-core/src/test/resources/parse/program.ldpath
index 7d2670a..fc4fdc5 100644
--- a/libraries/ldpath/ldpath-core/src/test/resources/parse/program.ldpath
+++ b/libraries/ldpath/ldpath-core/src/test/resources/parse/program.ldpath
@@ -31,4 +31,7 @@ group = (test:p1 / test:p2) :: test:type ;
inverse = ^test:incoming :: test:type ;
-config = test:foo :: test:type(c1="true", c2="false", c3="1.234") ;
\ No newline at end of file
+config = test:foo :: test:type(c1="true", c2="false", c3="1.234") ;
+
+foo:bar = test:foo :: test:type ;
+<http://test/> = test:test :: test:type ;