You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/07/24 12:41:25 UTC
[01/12] git commit: MARMOTTA-510: Updated rest-assured to 2.3.2 (no
LICENSE change)
Repository: marmotta
Updated Branches:
refs/heads/MARMOTTA-499 48d398add -> 0d3bdf8cf
MARMOTTA-510: Updated rest-assured to 2.3.2 (no LICENSE change)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bd8d81a0
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bd8d81a0
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bd8d81a0
Branch: refs/heads/MARMOTTA-499
Commit: bd8d81a0c68984045af36ed1bc5fd3c8afbbaeb5
Parents: 4a188e6
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Jun 13 15:37:13 2014 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Jun 13 15:37:13 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bd8d81a0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index aea520a..fe1626a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,7 +40,7 @@
<junit.version>4.11</junit.version>
<weld.version>2.1.Final</weld.version>
<weld.core.version>2.1.2.Final</weld.core.version>
- <rest.assured.version>1.7.1</rest.assured.version>
+ <rest.assured.version>2.3.2</rest.assured.version>
<hamcrest.version>1.3</hamcrest.version>
<tempus.fugit.version>1.1</tempus.fugit.version>
<jatl.version>0.2.2</jatl.version>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bd8d81a0/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 1aa384f..0e11f9c 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
@@ -229,7 +229,7 @@ public class LinkedDataTest {
given()
.header("Content-Type", format.getDefaultMIMEType())
- .body(body)
+ .body(body.getBytes())
.expect()
.statusCode(200)
.when()
[10/12] git commit: Keep stable order when selecting recursive in
ldpath
Posted by wi...@apache.org.
Keep stable order when selecting recursive in ldpath
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/1ee27b87
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/1ee27b87
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/1ee27b87
Branch: refs/heads/MARMOTTA-499
Commit: 1ee27b8780c8e1590a1578f1be8b262e22719293
Parents: 42f5db0
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Jul 10 14:33:33 2014 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Jul 10 14:35:24 2014 +0200
----------------------------------------------------------------------
.../model/selectors/RecursivePathSelector.java | 17 ++++++++++-------
.../marmotta/ldpath/parser/SelectorsTest.java | 10 ++++++++++
2 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/1ee27b87/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java
index e97b2e5..2f84c66 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/RecursivePathSelector.java
@@ -50,7 +50,7 @@ public class RecursivePathSelector<Node> implements NodeSelector<Node> {
*/
@Override
public Collection<Node> select(RDFBackend<Node> rdfBackend, Node context, List<Node> path, Map<Node, List<Node>> resultPaths) {
- Set<Node> result = new HashSet<Node>();
+ List<Node> result = new LinkedList<>();
if (minRecursions <= 0) {
result.add(context);
@@ -60,19 +60,19 @@ public class RecursivePathSelector<Node> implements NodeSelector<Node> {
return result;
}
- private void subSelect(Node currentContext, int depth, RDFBackend<Node> rdfBackend, Set<Node> resultSet, List<Node> path, Map<Node, List<Node>> resultPaths) {
+ private void subSelect(Node currentContext, int depth, RDFBackend<Node> rdfBackend, List<Node> resultList, List<Node> path, Map<Node, List<Node>> resultPaths) {
Collection<Node> nextNodes = delegate.select(rdfBackend, currentContext,path,resultPaths);
depth++;
for (Node n : nextNodes) {
- if (!resultSet.contains(n)) {
+ if (!resultList.contains(n)) {
if (depth >= minRecursions){
- resultSet.add(n);
+ resultList.add(n);
}
if (depth < maxRecursions) {
if(path != null && resultPaths != null) {
- subSelect(n, depth, rdfBackend, resultSet, new ImmutableList.Builder<Node>().addAll(path).add(currentContext).build(),resultPaths);
+ subSelect(n, depth, rdfBackend, resultList, new ImmutableList.Builder<Node>().addAll(path).add(currentContext).build(),resultPaths);
} else {
- subSelect(n, depth, rdfBackend, resultSet, null,resultPaths);
+ subSelect(n, depth, rdfBackend, resultList, null,resultPaths);
}
}
}
@@ -168,12 +168,15 @@ public class RecursivePathSelector<Node> implements NodeSelector<Node> {
RecursivePathSelector<Node> that = (RecursivePathSelector<Node>) o;
if (delegate != null ? !delegate.equals(that.delegate) : that.delegate != null) return false;
+ if (minRecursions != that.minRecursions || maxRecursions != that.maxRecursions) return false;
return true;
}
@Override
public int hashCode() {
- return delegate != null ? delegate.hashCode() : 0;
+ int hash = delegate != null ? delegate.hashCode() : 0;
+ hash = hash * 31 * 31 + minRecursions * 31 + maxRecursions;
+ return hash;
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/1ee27b87/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 f2a0327..fa46454 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
@@ -50,6 +50,16 @@ public class SelectorsTest {
{"(<http://www.example.com/>[@en])", "Grouped"},
{"(<http://www.example.com/>)*", "RecursivePath"},
{"(<http://www.example.com/>)+", "RecursivePath"},
+/* TODO - these should also work in the future...
+ {"(<http://www.example.com/>){5,}", "RecursivePath"},
+ {"(<http://www.example.com/>){5,7}", "RecursivePath"},
+ {"(<http://www.example.com/>){,7}", "RecursivePath"},
+ {"<http://www.example.com/>*", "RecursivePath"},
+ {"<http://www.example.com/>+", "RecursivePath"},
+ {"<http://www.example.com/>{5,}", "RecursivePath"},
+ {"<http://www.example.com/>{5,7}", "RecursivePath"},
+ {"<http://www.example.com/>{,7}", "RecursivePath"},
+*/
{"^<http://www.example.com/>", "ReverseProperty"},
{"fn:count(\"foo\")", "Function"},
// Not implemented yet: {"^*", "ReverseProperty"},
[09/12] git commit: MARMOTTA-513: preparing the build for the
transition towards a jax-doclets release which solves the issue
Posted by wi...@apache.org.
MARMOTTA-513: preparing the build for the transition towards a jax-doclets release which solves the issue
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/42f5db05
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/42f5db05
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/42f5db05
Branch: refs/heads/MARMOTTA-499
Commit: 42f5db0588112ab17974e42142a9c280dc729dcf
Parents: bd6f585
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Jul 9 12:24:34 2014 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Jul 9 12:24:34 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++++
platform/backends/marmotta-backend-bigdata/pom.xml | 4 ++--
platform/backends/marmotta-backend-http/pom.xml | 2 +-
platform/backends/marmotta-backend-kiwi/pom.xml | 4 ++--
platform/backends/marmotta-backend-memory/pom.xml | 4 ++--
platform/backends/marmotta-backend-native/pom.xml | 4 ++--
platform/backends/marmotta-backend-sparql/pom.xml | 4 ++--
platform/backends/marmotta-backend-titan/pom.xml | 4 ++--
platform/ldcache/marmotta-ldcache-common/pom.xml | 10 +++++-----
platform/ldcache/marmotta-ldcache-file/pom.xml | 4 ++--
platform/ldcache/marmotta-ldcache-kiwi/pom.xml | 4 ++--
platform/marmotta-core/pom.xml | 4 ++--
platform/marmotta-ldp/pom.xml | 4 ++--
platform/marmotta-ldpath/pom.xml | 4 ++--
platform/marmotta-reasoner-kiwi/pom.xml | 4 ++--
platform/marmotta-security/pom.xml | 4 ++--
platform/marmotta-sparql/pom.xml | 4 ++--
platform/marmotta-user/pom.xml | 6 +++---
platform/marmotta-versioning-common/pom.xml | 6 +++---
platform/marmotta-versioning-kiwi/pom.xml | 4 ++--
platform/marmotta-zookeeper/pom.xml | 6 +++---
21 files changed, 49 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7aa7356..8d146f9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -53,6 +53,7 @@
<resteasy.version>3.0.8.Final</resteasy.version>
<jackson.version>2.3.3</jackson.version>
<titan.version>0.4.2</titan.version>
+ <jax.doclets.version>0.10.0</jax.doclets.version>
</properties>
<prerequisites>
@@ -116,6 +117,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/backends/marmotta-backend-bigdata/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-bigdata/pom.xml b/platform/backends/marmotta-backend-bigdata/pom.xml
index 90ea62a..2f548ba 100644
--- a/platform/backends/marmotta-backend-bigdata/pom.xml
+++ b/platform/backends/marmotta-backend-bigdata/pom.xml
@@ -121,7 +121,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -130,7 +130,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/backends/marmotta-backend-http/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-http/pom.xml b/platform/backends/marmotta-backend-http/pom.xml
index fc4174b..a352a66 100644
--- a/platform/backends/marmotta-backend-http/pom.xml
+++ b/platform/backends/marmotta-backend-http/pom.xml
@@ -122,7 +122,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/backends/marmotta-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/pom.xml b/platform/backends/marmotta-backend-kiwi/pom.xml
index ab8fd62..7db1e48 100644
--- a/platform/backends/marmotta-backend-kiwi/pom.xml
+++ b/platform/backends/marmotta-backend-kiwi/pom.xml
@@ -111,7 +111,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -120,7 +120,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/backends/marmotta-backend-memory/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-memory/pom.xml b/platform/backends/marmotta-backend-memory/pom.xml
index 4ed6825..79a1164 100644
--- a/platform/backends/marmotta-backend-memory/pom.xml
+++ b/platform/backends/marmotta-backend-memory/pom.xml
@@ -110,7 +110,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -119,7 +119,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/backends/marmotta-backend-native/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-native/pom.xml b/platform/backends/marmotta-backend-native/pom.xml
index 7203f7a..da721c0 100644
--- a/platform/backends/marmotta-backend-native/pom.xml
+++ b/platform/backends/marmotta-backend-native/pom.xml
@@ -111,7 +111,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -120,7 +120,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/backends/marmotta-backend-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-sparql/pom.xml b/platform/backends/marmotta-backend-sparql/pom.xml
index b70005f..b7fd2c0 100644
--- a/platform/backends/marmotta-backend-sparql/pom.xml
+++ b/platform/backends/marmotta-backend-sparql/pom.xml
@@ -113,7 +113,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -122,7 +122,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/backends/marmotta-backend-titan/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-titan/pom.xml b/platform/backends/marmotta-backend-titan/pom.xml
index dde110f..31dee7d 100644
--- a/platform/backends/marmotta-backend-titan/pom.xml
+++ b/platform/backends/marmotta-backend-titan/pom.xml
@@ -110,7 +110,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -119,7 +119,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/ldcache/marmotta-ldcache-common/pom.xml
----------------------------------------------------------------------
diff --git a/platform/ldcache/marmotta-ldcache-common/pom.xml b/platform/ldcache/marmotta-ldcache-common/pom.xml
index 2a64edc..4284f40 100644
--- a/platform/ldcache/marmotta-ldcache-common/pom.xml
+++ b/platform/ldcache/marmotta-ldcache-common/pom.xml
@@ -31,9 +31,9 @@
<name>Apache Marmotta Platform: Linked Data Caching (Common)</name>
<description>
- Provides transparent Linked Data Caching in the LMF triple store. When a resource is queried using e.g. LDPath
- or SPARQL and it represents an external resource (e.g. on DBPedia or GeoNames), the resource is transparently
- fetched on demand and cached locally. This module contains the backend-independent services.
+ Provides common infrastructure for transparent Linked Data Caching in Marmotta. When a resource is queried using
+ e.g. LDPath or SPARQL and it represents an external resource (e.g. on DBPedia or GeoNames), the resource is
+ transparently fetched on demand and cached locally. This module contains the backend-independent services.
</description>
<build>
@@ -112,7 +112,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -121,7 +121,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/ldcache/marmotta-ldcache-file/pom.xml
----------------------------------------------------------------------
diff --git a/platform/ldcache/marmotta-ldcache-file/pom.xml b/platform/ldcache/marmotta-ldcache-file/pom.xml
index b7041d9..30e79b3 100644
--- a/platform/ldcache/marmotta-ldcache-file/pom.xml
+++ b/platform/ldcache/marmotta-ldcache-file/pom.xml
@@ -111,7 +111,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -120,7 +120,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/ldcache/marmotta-ldcache-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/platform/ldcache/marmotta-ldcache-kiwi/pom.xml b/platform/ldcache/marmotta-ldcache-kiwi/pom.xml
index dec7440..5aeb6f6 100644
--- a/platform/ldcache/marmotta-ldcache-kiwi/pom.xml
+++ b/platform/ldcache/marmotta-ldcache-kiwi/pom.xml
@@ -111,7 +111,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -120,7 +120,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index 4dbed3e..e17230e 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -151,7 +151,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -160,7 +160,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/marmotta-ldp/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/pom.xml b/platform/marmotta-ldp/pom.xml
index fcc3879..2b4b867 100644
--- a/platform/marmotta-ldp/pom.xml
+++ b/platform/marmotta-ldp/pom.xml
@@ -111,7 +111,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -120,7 +120,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index 36d5f9a..0d77c55 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -110,7 +110,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -119,7 +119,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/marmotta-reasoner-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner-kiwi/pom.xml b/platform/marmotta-reasoner-kiwi/pom.xml
index 1a1a632..060f2e5 100644
--- a/platform/marmotta-reasoner-kiwi/pom.xml
+++ b/platform/marmotta-reasoner-kiwi/pom.xml
@@ -111,7 +111,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -120,7 +120,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 75aa398..f757e18 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -110,7 +110,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -119,7 +119,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 11f5fab..dca1786 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -122,7 +122,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -131,7 +131,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index 661ad43..e13f2bd 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -31,7 +31,7 @@
<name>Apache Marmotta Platform: User Management</name>
<description>
This module provides basic user management support, i.e. adding, editing and
- removing user configurations from the Linked Media Framework.
+ removing user configurations from Apache Marmotta.
</description>
<build>
@@ -110,7 +110,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -119,7 +119,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/marmotta-versioning-common/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning-common/pom.xml b/platform/marmotta-versioning-common/pom.xml
index f3523cb..dfd5c69 100644
--- a/platform/marmotta-versioning-common/pom.xml
+++ b/platform/marmotta-versioning-common/pom.xml
@@ -115,7 +115,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -124,7 +124,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
@@ -164,4 +164,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/marmotta-versioning-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning-kiwi/pom.xml b/platform/marmotta-versioning-kiwi/pom.xml
index bc1decc..959666b 100644
--- a/platform/marmotta-versioning-kiwi/pom.xml
+++ b/platform/marmotta-versioning-kiwi/pom.xml
@@ -113,7 +113,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -122,7 +122,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/42f5db05/platform/marmotta-zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-zookeeper/pom.xml b/platform/marmotta-zookeeper/pom.xml
index f8d06ed..27002aa 100644
--- a/platform/marmotta-zookeeper/pom.xml
+++ b/platform/marmotta-zookeeper/pom.xml
@@ -110,7 +110,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
@@ -119,7 +119,7 @@
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
- <version>0.10.0</version>
+ <version>${jax.doclets.version}</version>
</docletArtifact>
<additionalparam>
-jaxrscontext {BASE}
@@ -174,4 +174,4 @@
</exclusions>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
[08/12] git commit: MARMOTTA-499: remove debug logging
Posted by wi...@apache.org.
MARMOTTA-499: remove debug logging
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/1dd77c47
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/1dd77c47
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/1dd77c47
Branch: refs/heads/MARMOTTA-499
Commit: 1dd77c478c1c8771af966e4e0352c94213e6154c
Parents: 48d398a
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Jul 9 09:03:09 2014 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Jul 9 09:03:09 2014 +0200
----------------------------------------------------------------------
.../platform/core/services/modules/MarmottaResourceServiceImpl.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/1dd77c47/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/MarmottaResourceServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/MarmottaResourceServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/MarmottaResourceServiceImpl.java
index 422fad1..d11aba6 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/MarmottaResourceServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/MarmottaResourceServiceImpl.java
@@ -211,7 +211,6 @@ public class MarmottaResourceServiceImpl implements MarmottaResourceService {
}
private String getMimeType(String resource) {
- log.warn("{}: {}", resource, tika.detect(resource));
return tika.detect(resource);
}
[06/12] git commit: update to Sesame 2.7.12 test case for a specific
Sesame bug (SES-2090)
Posted by wi...@apache.org.
update to Sesame 2.7.12
test case for a specific Sesame bug (SES-2090)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2b0b8469
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2b0b8469
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2b0b8469
Branch: refs/heads/MARMOTTA-499
Commit: 2b0b84693de18f905f7082b39f457f29d3b775aa
Parents: 94b5029
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Jul 7 16:56:00 2014 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Jul 7 16:56:00 2014 +0200
----------------------------------------------------------------------
.../kiwi/sparql/test/KiWiSparqlUpdateTest.java | 43 ++++++++++++++++++++
parent/pom.xml | 2 +-
2 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2b0b8469/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlUpdateTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlUpdateTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlUpdateTest.java
index 4e3f20e..da7cd6b 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlUpdateTest.java
+++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlUpdateTest.java
@@ -21,11 +21,22 @@ import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.sail.KiWiStore;
import org.apache.marmotta.kiwi.sparql.sail.KiWiSparqlSail;
import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner;
+import org.junit.Test;
import org.junit.runner.RunWith;
+import org.openrdf.model.vocabulary.FOAF;
+import org.openrdf.query.MalformedQueryException;
+import org.openrdf.query.QueryLanguage;
+import org.openrdf.query.Update;
+import org.openrdf.query.UpdateExecutionException;
+import org.openrdf.query.impl.DatasetImpl;
import org.openrdf.query.parser.sparql.SPARQLUpdateTest;
import org.openrdf.repository.Repository;
+import org.openrdf.repository.RepositoryException;
import org.openrdf.repository.sail.SailRepository;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Run the Sesame SPARQL Update Test Suite.
@@ -48,4 +59,36 @@ public class KiWiSparqlUpdateTest extends SPARQLUpdateTest {
return new SailRepository(ssail);
}
+
+ @Test
+ public void contextualInsertDeleteData() throws RepositoryException, MalformedQueryException, UpdateExecutionException {
+
+ StringBuilder insert = new StringBuilder();
+ insert.append(getNamespaceDeclarations());
+ insert.append("INSERT DATA { ex:alice foaf:knows ex:bob. ex:alice foaf:mbox \"alice@example.org\" .} ");
+
+ DatasetImpl ds = new DatasetImpl();
+ ds.setDefaultInsertGraph(graph2);
+ ds.addDefaultRemoveGraph(graph2);
+
+ Update operation1 = con.prepareUpdate(QueryLanguage.SPARQL, insert.toString());
+ operation1.setDataset(ds);
+ operation1.execute();
+
+
+ StringBuilder update = new StringBuilder();
+ update.append(getNamespaceDeclarations());
+ update.append("DELETE DATA { ex:alice foaf:knows ex:bob. ex:alice foaf:mbox \"alice@example.org\" .} ");
+
+ Update operation2 = con.prepareUpdate(QueryLanguage.SPARQL, update.toString());
+ operation2.setDataset(ds);
+
+ assertTrue(con.hasStatement(alice, FOAF.KNOWS, bob, true, graph2));
+ assertTrue(con.hasStatement(alice, FOAF.MBOX, f.createLiteral("alice@example.org"), true, graph2));
+ operation2.execute();
+
+ String msg = "statement should have been deleted.";
+ assertFalse(msg, con.hasStatement(alice, FOAF.KNOWS, bob, true, graph2));
+ assertFalse(msg, con.hasStatement(alice, FOAF.MBOX, f.createLiteral("alice@example.org"), true, graph2));
+ }
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2b0b8469/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0b50d01..7aa7356 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -36,7 +36,7 @@
<url>http://marmotta.apache.org</url>
<properties>
- <sesame.version>2.7.11</sesame.version>
+ <sesame.version>2.7.12</sesame.version>
<junit.version>4.11</junit.version>
<weld.version>2.1.Final</weld.version>
<weld.core.version>2.1.2.Final</weld.core.version>
[02/12] git commit: MARMOTTA-510: Update H2 (no LICENSE change)
Posted by wi...@apache.org.
MARMOTTA-510: Update H2 (no LICENSE change)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/cf4740ab
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/cf4740ab
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/cf4740ab
Branch: refs/heads/MARMOTTA-499
Commit: cf4740abf10df7be02a72af8c40ad73d2fc2c042
Parents: bd8d81a
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Jun 13 15:54:56 2014 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Jun 13 15:54:56 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/cf4740ab/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fe1626a..daf029e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -46,7 +46,7 @@
<jatl.version>0.2.2</jatl.version>
<servlet.api.version>3.0.1</servlet.api.version>
<javax.el.version>2.2.4</javax.el.version>
- <h2.version>1.3.174</h2.version>
+ <h2.version>1.4.178</h2.version>
<postgresql.version>9.3-1100-jdbc4</postgresql.version>
<mysql.version>5.1.21</mysql.version>
<jetty.version>9.0.3.v20130506</jetty.version>
[05/12] git commit: SPARQL: hot fix for ASK with no variables
(MARMOTTA-512)
Posted by wi...@apache.org.
SPARQL: hot fix for ASK with no variables (MARMOTTA-512)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/94b50295
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/94b50295
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/94b50295
Branch: refs/heads/MARMOTTA-499
Commit: 94b502957b9e65e46bd41c36c6dabbb3d6d63ee8
Parents: fb16331
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Jul 7 13:40:05 2014 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Jul 7 13:40:05 2014 +0200
----------------------------------------------------------------------
.../marmotta/kiwi/sparql/persistence/KiWiSparqlConnection.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/94b50295/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 7612a38..1f2c62d 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
@@ -226,6 +226,10 @@ public class KiWiSparqlConnection {
}
selectVariables.add(v);
}
+ // hot fix for MARMOTTA-512
+ if(selectVariables.size() == 0) {
+ selectClause.append("1 as foo");
+ }
// build the from-clause of the query; the from clause is constructed as follows:
[07/12] git commit: fix webservice response for empty SPARQL query
(MARMOTTA-511)
Posted by wi...@apache.org.
fix webservice response for empty SPARQL query (MARMOTTA-511)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bd6f585f
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bd6f585f
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bd6f585f
Branch: refs/heads/MARMOTTA-499
Commit: bd6f585fec50e8566ffd92d25be6b7f5f816ab56
Parents: 2b0b846
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Jul 8 10:32:27 2014 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Jul 8 10:32:27 2014 +0200
----------------------------------------------------------------------
.../marmotta/platform/sparql/webservices/SparqlWebService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bd6f585f/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 a3d7f88..e10168c 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
@@ -230,7 +230,7 @@ public class SparqlWebService {
if (acceptHeader.contains("html")) {
return Response.seeOther(new URI(configurationService.getServerUri() + "sparql/admin/squebi.html")).build();
} else {
- return Response.status(Response.Status.BAD_REQUEST).entity("no SPARQL query specified").build();
+ return Response.status(Status.ACCEPTED).entity("no SPARQL query specified").build();
}
} else {
//query duck typing
@@ -389,7 +389,7 @@ public class SparqlWebService {
if (parseSubType(resultType).equals("html"))
return Response.seeOther(new URI(configurationService.getServerUri() + "sparql/admin/update.html")).build();
else
- return Response.status(Response.Status.BAD_REQUEST).entity("no SPARQL query specified").build();
+ return Response.status(Status.ACCEPTED).entity("no SPARQL query specified").build();
}
} catch (MalformedQueryException ex) {
return Response.status(Response.Status.BAD_REQUEST).entity(WebServiceUtil.jsonErrorResponse(ex)).build();
[12/12] git commit: Merge branch 'develop' into MARMOTTA-499
Posted by wi...@apache.org.
Merge branch 'develop' into MARMOTTA-499
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/0d3bdf8c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/0d3bdf8c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/0d3bdf8c
Branch: refs/heads/MARMOTTA-499
Commit: 0d3bdf8cfc11dc047603fbd306aed338f2efd4d3
Parents: 1dd77c4 d5241ed
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Jul 24 12:38:47 2014 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Jul 24 12:38:47 2014 +0200
----------------------------------------------------------------------
.../persistence/KiWiSparqlConnection.java | 4 ++
.../kiwi/sparql/test/KiWiSparqlUpdateTest.java | 43 ++++++++++++++++++++
.../model/selectors/RecursivePathSelector.java | 17 ++++----
.../marmotta/ldpath/parser/SelectorsTest.java | 10 +++++
parent/pom.xml | 19 +++++----
.../backends/marmotta-backend-bigdata/pom.xml | 4 +-
platform/backends/marmotta-backend-http/pom.xml | 2 +-
platform/backends/marmotta-backend-kiwi/pom.xml | 4 +-
.../backends/marmotta-backend-memory/pom.xml | 4 +-
.../backends/marmotta-backend-native/pom.xml | 4 +-
.../backends/marmotta-backend-sparql/pom.xml | 4 +-
.../backends/marmotta-backend-titan/pom.xml | 4 +-
.../ldcache/marmotta-ldcache-common/pom.xml | 10 ++---
platform/ldcache/marmotta-ldcache-file/pom.xml | 4 +-
platform/ldcache/marmotta-ldcache-kiwi/pom.xml | 4 +-
platform/marmotta-core/pom.xml | 4 +-
.../platform/core/test/ld/LinkedDataTest.java | 2 +-
platform/marmotta-ldp/pom.xml | 4 +-
platform/marmotta-ldpath/pom.xml | 4 +-
platform/marmotta-reasoner-kiwi/pom.xml | 4 +-
platform/marmotta-security/pom.xml | 4 +-
platform/marmotta-sparql/pom.xml | 4 +-
.../sparql/webservices/SparqlWebService.java | 4 +-
platform/marmotta-user/pom.xml | 6 +--
platform/marmotta-versioning-common/pom.xml | 6 +--
platform/marmotta-versioning-kiwi/pom.xml | 4 +-
platform/marmotta-zookeeper/pom.xml | 6 +--
27 files changed, 126 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
[04/12] git commit: MARMOTTA-509,
MARMOTTA-510: Updated RESTeasy and Jackson
Posted by wi...@apache.org.
MARMOTTA-509, MARMOTTA-510: Updated RESTeasy and Jackson
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/fb163312
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/fb163312
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/fb163312
Branch: refs/heads/MARMOTTA-499
Commit: fb1633121749c1f8ec9639355a439179e9eb6e11
Parents: c8d9a18
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Jun 13 17:18:46 2014 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Jun 13 17:18:46 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/fb163312/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9f0da4e..0b50d01 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -50,8 +50,8 @@
<postgresql.version>9.3-1100-jdbc4</postgresql.version>
<mysql.version>5.1.21</mysql.version>
<jetty.version>9.2.1.v20140609</jetty.version>
- <resteasy.version>3.0.6.Final</resteasy.version>
- <jackson.version>2.2.3</jackson.version>
+ <resteasy.version>3.0.8.Final</resteasy.version>
+ <jackson.version>2.3.3</jackson.version>
<titan.version>0.4.2</titan.version>
</properties>
@@ -864,8 +864,7 @@
<dependency>
<groupId>com.fasterxml.jackson.jr</groupId>
<artifactId>jackson-jr-objects</artifactId>
- <!-- FIXME: align jackson versions! -->
- <version>2.3.3</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
[03/12] git commit: MARMOTTA-510: Updated jetty (no LICENSE change)
Posted by wi...@apache.org.
MARMOTTA-510: Updated jetty (no LICENSE change)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/c8d9a18f
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/c8d9a18f
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/c8d9a18f
Branch: refs/heads/MARMOTTA-499
Commit: c8d9a18f9251c242c24fb35498f8bf4a2690a08e
Parents: cf4740a
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Jun 13 16:05:00 2014 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Jun 13 16:13:06 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/c8d9a18f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index daf029e..9f0da4e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -49,7 +49,7 @@
<h2.version>1.4.178</h2.version>
<postgresql.version>9.3-1100-jdbc4</postgresql.version>
<mysql.version>5.1.21</mysql.version>
- <jetty.version>9.0.3.v20130506</jetty.version>
+ <jetty.version>9.2.1.v20140609</jetty.version>
<resteasy.version>3.0.6.Final</resteasy.version>
<jackson.version>2.2.3</jackson.version>
<titan.version>0.4.2</titan.version>
[11/12] git commit: MARMOTTA-513: updated to
com.lunatech.jax-doclets.doclets:doclets:0.10.1
Posted by wi...@apache.org.
MARMOTTA-513: updated to com.lunatech.jax-doclets.doclets:doclets:0.10.1
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d5241ed9
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d5241ed9
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d5241ed9
Branch: refs/heads/MARMOTTA-499
Commit: d5241ed9f6f88598f0973d0bfda75c6add2fca9b
Parents: 1ee27b8
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Jul 11 15:00:45 2014 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Jul 11 15:00:45 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/d5241ed9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8d146f9..016a3ac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -53,7 +53,7 @@
<resteasy.version>3.0.8.Final</resteasy.version>
<jackson.version>2.3.3</jackson.version>
<titan.version>0.4.2</titan.version>
- <jax.doclets.version>0.10.0</jax.doclets.version>
+ <jax.doclets.version>0.10.1</jax.doclets.version>
</properties>
<prerequisites>