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 2015/11/12 15:56:44 UTC
[01/18] marmotta git commit: fixed missing dependency
Repository: marmotta
Updated Branches:
refs/heads/MARMOTTA-588 2fa66e7de -> 940cac1f9
fixed missing dependency
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ec74be5a
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ec74be5a
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ec74be5a
Branch: refs/heads/MARMOTTA-588
Commit: ec74be5ae1a8f9ca4865abf6d54611473775b11b
Parents: d0810b4
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Jul 2 14:56:40 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Jul 2 14:56:40 2015 +0200
----------------------------------------------------------------------
platform/marmotta-sparql/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/ec74be5a/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 8a837bb..732c47d 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -172,6 +172,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-ui</artifactId>
</dependency>
[13/18] marmotta git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/marmotta into develop
Posted by wi...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/b4d8c333
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/b4d8c333
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/b4d8c333
Branch: refs/heads/MARMOTTA-588
Commit: b4d8c333688b57474decc601f01daa41e025f983
Parents: 732f456 ef38b46
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Oct 9 14:51:24 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Oct 9 14:51:24 2015 +0200
----------------------------------------------------------------------
.../commons/http/MarmottaHttpUtils.java | 4 +--
.../commons/http/MarmottaHttpUtilsTest.java | 27 ++++++++++++++++++++
.../kiwi/sparql/builder/SQLBuilder.java | 2 ++
3 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[11/18] marmotta git commit: added test for marmotta-618
Posted by wi...@apache.org.
added test for marmotta-618
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ef38b465
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ef38b465
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ef38b465
Branch: refs/heads/MARMOTTA-588
Commit: ef38b4658ee0d3a38481cfaed21071be10951b66
Parents: a377e5e
Author: Dietmar <dg...@gmail.com>
Authored: Fri Oct 2 13:33:50 2015 +0200
Committer: Dietmar <dg...@gmail.com>
Committed: Fri Oct 2 13:33:50 2015 +0200
----------------------------------------------------------------------
.../commons/http/MarmottaHttpUtilsTest.java | 27 ++++++++++++++++++++
1 file changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/ef38b465/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/http/MarmottaHttpUtilsTest.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/http/MarmottaHttpUtilsTest.java b/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/http/MarmottaHttpUtilsTest.java
index 2c19b47..dffcefe 100644
--- a/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/http/MarmottaHttpUtilsTest.java
+++ b/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/http/MarmottaHttpUtilsTest.java
@@ -19,6 +19,8 @@ package org.apache.marmotta.commons.http;
import static org.junit.Assert.assertEquals;
+import java.util.List;
+
import org.junit.Test;
import com.google.common.collect.ImmutableList;
@@ -37,4 +39,29 @@ public class MarmottaHttpUtilsTest {
assertEquals(null, MarmottaHttpUtils.bestContentType(ImmutableList.of(new ContentType("text", "tutle")), ImmutableList.of(new ContentType("text", "plain"))));
}
+ @Test
+ public void testParseAcceptHeader() throws Exception {
+ List<ContentType> acceptedTypes = MarmottaHttpUtils.parseAcceptHeaders( ImmutableList.of(
+ "application/n-triples;q=0.7,"
+ + " text/plain;q=0.7,"
+ + " application/rdf+xml;q=0.8,"
+ + " application/xml;q=0.8,"
+ + " text/turtle,"
+ + " application/x-turtle,"
+ + " application/trig;q=0.8,"
+ + " application/x-trig;q=0.8"));
+ List<ContentType> offeredTypes = MarmottaHttpUtils.parseAcceptHeaders(ImmutableList.of(
+ "application/ld+json; q=1.0",
+ "application/x-turtle; q=1.0",
+ "application/x-trig; q=1.0",
+ "application/rdf+xml; q=1.0",
+ "text/turtle; q=1.0",
+ "text/rdf+n3; q=1.0",
+ "application/trix; q=1.0",
+ "application/rdf+json; q=1.0",
+ "text/n3; q=1.0",
+ "text/x-nquads; q=1.0"));
+ assertEquals(new ContentType("text", "turtle", 1.0), MarmottaHttpUtils.bestContentType(offeredTypes, acceptedTypes));
+
+ }
}
[02/18] marmotta git commit: Removed colors and highlighting from
log-output - it makes it hard to read the logs in files
Posted by wi...@apache.org.
Removed colors and highlighting from log-output - it makes it hard to read the logs in files
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/e36c67b0
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e36c67b0
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e36c67b0
Branch: refs/heads/MARMOTTA-588
Commit: e36c67b0e75dca82fc6bcde394fadf774f1156bd
Parents: ec74be5
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Jul 23 08:56:19 2015 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Jul 23 08:56:19 2015 +0200
----------------------------------------------------------------------
.../marmotta-rio-ical/src/test/resources/logback.xml | 4 ++--
.../marmotta-rio-rss/src/test/resources/logback.xml | 4 ++--
.../marmotta-rio-vcard/src/test/resources/logback.xml | 4 ++--
.../marmotta-sail-transactions/src/test/resources/logback.xml | 4 ++--
.../marmotta-util-facading/src/test/resources/logback.xml | 4 ++--
libraries/kiwi/kiwi-loader/src/main/resources/logback.xml | 4 ++--
libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml | 4 ++--
libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml | 4 ++--
.../ldcache/ldcache-backend-file/src/test/resources/logback.xml | 4 ++--
.../ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml | 4 ++--
libraries/ldcache/ldcache-core/src/test/resources/logback.xml | 4 ++--
.../ldcache/ldcache-sail-generic/src/test/resources/logback.xml | 4 ++--
.../ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml | 4 ++--
libraries/ldclient/ldclient-core/src/test/resources/logback.xml | 4 ++--
.../ldclient-provider-facebook/src/test/resources/logback.xml | 4 ++--
.../ldclient-provider-freebase/src/test/resources/logback.xml | 4 ++--
.../ldclient-provider-ldap/src/test/resources/logback.xml | 4 ++--
.../ldclient-provider-mediawiki/src/test/resources/logback.xml | 4 ++--
.../ldclient-provider-rdf/src/test/resources/logback.xml | 4 ++--
.../ldclient-provider-vimeo/src/test/resources/logback.xml | 4 ++--
.../ldclient-provider-youtube/src/test/resources/logback.xml | 4 ++--
.../ldpath/ldpath-backend-file/src/test/resources/logback.xml | 4 ++--
libraries/ldpath/ldpath-core/src/test/resources/logback.xml | 4 ++--
.../ldpath-functions-collections/src/test/resources/logback.xml | 4 ++--
.../ldpath/ldpath-functions-date/src/test/resources/logback.xml | 4 ++--
.../ldpath/ldpath-functions-html/src/test/resources/logback.xml | 4 ++--
.../ldpath/ldpath-functions-json/src/test/resources/logback.xml | 4 ++--
.../ldpath/ldpath-functions-math/src/test/resources/logback.xml | 4 ++--
.../ldpath/ldpath-functions-text/src/test/resources/logback.xml | 4 ++--
.../ldpath/ldpath-functions-xml/src/test/resources/logback.xml | 4 ++--
.../ldpath-template-linkeddata/src/test/resources/logback.xml | 4 ++--
loader/marmotta-loader-berkeley/src/main/resources/logback.xml | 4 ++--
loader/marmotta-loader-hbase/src/main/resources/logback.xml | 4 ++--
33 files changed, 66 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/commons/marmotta-sesame-tools/marmotta-rio-ical/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-ical/src/test/resources/logback.xml b/commons/marmotta-sesame-tools/marmotta-rio-ical/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-ical/src/test/resources/logback.xml
+++ b/commons/marmotta-sesame-tools/marmotta-rio-ical/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/commons/marmotta-sesame-tools/marmotta-rio-rss/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/test/resources/logback.xml b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/test/resources/logback.xml
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/commons/marmotta-sesame-tools/marmotta-rio-vcard/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-vcard/src/test/resources/logback.xml b/commons/marmotta-sesame-tools/marmotta-rio-vcard/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-vcard/src/test/resources/logback.xml
+++ b/commons/marmotta-sesame-tools/marmotta-rio-vcard/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/test/resources/logback.xml b/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/test/resources/logback.xml
index 9678d31..fdaf8cd 100644
--- a/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/test/resources/logback.xml
+++ b/commons/marmotta-sesame-tools/marmotta-sail-transactions/src/test/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
@@ -27,4 +27,4 @@
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/resources/logback.xml b/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/resources/logback.xml
index 864df3a..f058315 100644
--- a/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/resources/logback.xml
+++ b/commons/marmotta-sesame-tools/marmotta-util-facading/src/test/resources/logback.xml
@@ -18,11 +18,11 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<logger name="org.apache.marmotta.commons.sesame.facading.concurrent.model" level="TRACE" />
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/kiwi/kiwi-loader/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/main/resources/logback.xml b/libraries/kiwi/kiwi-loader/src/main/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/kiwi/kiwi-loader/src/main/resources/logback.xml
+++ b/libraries/kiwi/kiwi-loader/src/main/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml b/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml
index 9678d31..fdaf8cd 100644
--- a/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml
+++ b/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
@@ -27,4 +27,4 @@
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml b/libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml
index 42350aa..bd6db5e 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml
+++ b/libraries/kiwi/kiwi-triplestore/src/test/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
@@ -27,4 +27,4 @@
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml b/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml b/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/src/test/resources/logback.xml b/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldcache/ldcache-sail-generic/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/src/test/resources/logback.xml b/libraries/ldcache/ldcache-sail-generic/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldcache/ldcache-sail-generic/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-sail-generic/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml b/libraries/ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldclient/ldclient-core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/src/test/resources/logback.xml b/libraries/ldclient/ldclient-core/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldclient/ldclient-core/src/test/resources/logback.xml
+++ b/libraries/ldclient/ldclient-core/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldclient/ldclient-provider-facebook/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/src/test/resources/logback.xml b/libraries/ldclient/ldclient-provider-facebook/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldclient/ldclient-provider-facebook/src/test/resources/logback.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldclient/ldclient-provider-freebase/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-freebase/src/test/resources/logback.xml b/libraries/ldclient/ldclient-provider-freebase/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldclient/ldclient-provider-freebase/src/test/resources/logback.xml
+++ b/libraries/ldclient/ldclient-provider-freebase/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldclient/ldclient-provider-ldap/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/src/test/resources/logback.xml b/libraries/ldclient/ldclient-provider-ldap/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldclient/ldclient-provider-ldap/src/test/resources/logback.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/logback.xml b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/logback.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldclient/ldclient-provider-rdf/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/src/test/resources/logback.xml b/libraries/ldclient/ldclient-provider-rdf/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldclient/ldclient-provider-rdf/src/test/resources/logback.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/logback.xml b/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/logback.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldclient/ldclient-provider-youtube/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/src/test/resources/logback.xml b/libraries/ldclient/ldclient-provider-youtube/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldclient/ldclient-provider-youtube/src/test/resources/logback.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldpath/ldpath-backend-file/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/src/test/resources/logback.xml b/libraries/ldpath/ldpath-backend-file/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldpath/ldpath-backend-file/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-backend-file/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/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 16c98cd..f1c2b60 100644
--- a/libraries/ldpath/ldpath-core/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-core/src/test/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
@@ -26,4 +26,4 @@
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldpath/ldpath-functions-collections/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-collections/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldpath/ldpath-functions-collections/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-collections/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldpath/ldpath-functions-date/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-date/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldpath/ldpath-functions-date/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-date/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldpath/ldpath-functions-html/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-html/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldpath/ldpath-functions-html/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-html/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldpath/ldpath-functions-json/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-json/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-json/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldpath/ldpath-functions-json/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-json/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldpath/ldpath-functions-math/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-math/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldpath/ldpath-functions-math/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-math/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldpath/ldpath-functions-text/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-text/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldpath/ldpath-functions-text/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-text/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldpath/ldpath-functions-xml/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/src/test/resources/logback.xml b/libraries/ldpath/ldpath-functions-xml/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldpath/ldpath-functions-xml/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-functions-xml/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/libraries/ldpath/ldpath-template-linkeddata/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/src/test/resources/logback.xml b/libraries/ldpath/ldpath-template-linkeddata/src/test/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/src/test/resources/logback.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/src/test/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/loader/marmotta-loader-berkeley/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/loader/marmotta-loader-berkeley/src/main/resources/logback.xml b/loader/marmotta-loader-berkeley/src/main/resources/logback.xml
index 1bfecff..ea28135 100644
--- a/loader/marmotta-loader-berkeley/src/main/resources/logback.xml
+++ b/loader/marmotta-loader-berkeley/src/main/resources/logback.xml
@@ -18,10 +18,10 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/e36c67b0/loader/marmotta-loader-hbase/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/loader/marmotta-loader-hbase/src/main/resources/logback.xml b/loader/marmotta-loader-hbase/src/main/resources/logback.xml
index 3b6995b..ebc7937 100644
--- a/loader/marmotta-loader-hbase/src/main/resources/logback.xml
+++ b/loader/marmotta-loader-hbase/src/main/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %highlight(%level) %cyan(%logger{15}) - %m%n</pattern>
+ <pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
@@ -29,4 +29,4 @@
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
[09/18] marmotta git commit: Added the ValueExpr "Exists" to
SQLBuilder
Posted by wi...@apache.org.
Added the ValueExpr "Exists" to SQLBuilder
SPARQL-Exists statements had no datatype assigned.
Added the ValueExpr "Exists" to SQLBuilder in order
to have proper ValueType on SPARQL-EXISTS statements when
using "native" sparql.strategy!
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/56bcb6d2
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/56bcb6d2
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/56bcb6d2
Branch: refs/heads/MARMOTTA-588
Commit: 56bcb6d299f6ec232f0b0fe82ef93697f91e4f0b
Parents: dd013be
Author: Dietmar <dg...@gmail.com>
Authored: Fri Sep 25 15:19:18 2015 +0200
Committer: Dietmar <dg...@gmail.com>
Committed: Fri Sep 25 15:19:18 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/56bcb6d2/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
index 933fdda..f816fa4 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
@@ -897,6 +897,8 @@ public class SQLBuilder {
return ValueType.BOOL;
} else if(expr instanceof If) {
return getProjectionType(((If) expr).getResult());
+ } else if(expr instanceof Exists) {
+ return ValueType.BOOL;
} else {
return ValueType.STRING;
}
[10/18] marmotta git commit: MARMOTTA-618 - strip leading spaces from
header string!
Posted by wi...@apache.org.
MARMOTTA-618 - strip leading spaces from header string!
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/a377e5e0
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/a377e5e0
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/a377e5e0
Branch: refs/heads/MARMOTTA-588
Commit: a377e5e00b16a0b93f5baf1c7402d692b2ffc59b
Parents: 56bcb6d
Author: Dietmar <dg...@gmail.com>
Authored: Fri Oct 2 13:10:49 2015 +0200
Committer: Dietmar <dg...@gmail.com>
Committed: Fri Oct 2 13:10:49 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a377e5e0/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java
index 46f38f5..ceb3eee 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/MarmottaHttpUtils.java
@@ -128,8 +128,8 @@ public class MarmottaHttpUtils {
public static ContentType parseContentType(String c) {
if (StringUtils.isBlank(c)) return null;
-
- String mt[] = c.split(";");
+ // be sure to trim leading and trailing spaces
+ String mt[] = c.trim().split(";");
String[] tst = mt[0].split("/");
[03/18] marmotta git commit: Fixed several "No newline at end of file"
Posted by wi...@apache.org.
Fixed several "No newline at end of file"
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/36167f0b
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/36167f0b
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/36167f0b
Branch: refs/heads/MARMOTTA-588
Commit: 36167f0b67a2f521296b23b9bf6dc8971a080614
Parents: e36c67b
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Jul 23 08:58:55 2015 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Jul 23 08:58:55 2015 +0200
----------------------------------------------------------------------
.../src/main/java/exceptions/DoThisException.java | 2 +-
.../marmotta-commons/src/ext/java/javolution/lang/Immutable.java | 2 +-
.../marmotta-commons/src/ext/java/javolution/lang/ValueType.java | 2 +-
.../src/ext/java/javolution/util/FastCollection.java | 2 +-
commons/marmotta-commons/src/ext/java/javolution/util/FastSet.java | 2 +-
.../src/ext/java/javolution/util/FastSortedSet.java | 2 +-
.../src/ext/java/javolution/util/FastSortedTable.java | 2 +-
.../marmotta-commons/src/ext/java/javolution/util/FastTable.java | 2 +-
.../src/ext/java/javolution/util/function/Consumer.java | 2 +-
.../src/ext/java/javolution/util/function/Equalities.java | 2 +-
.../src/ext/java/javolution/util/function/Function.java | 2 +-
.../src/ext/java/javolution/util/function/Iteration.java | 2 +-
.../src/ext/java/javolution/util/function/MultiVariable.java | 2 +-
.../src/ext/java/javolution/util/function/Predicate.java | 2 +-
.../src/ext/java/javolution/util/function/Reducer.java | 2 +-
.../src/ext/java/javolution/util/function/Reducers.java | 2 +-
.../src/ext/java/javolution/util/function/Splittable.java | 2 +-
.../src/ext/java/javolution/util/function/Supplier.java | 2 +-
.../ext/java/javolution/util/internal/table/FractalTableImpl.java | 2 +-
.../ext/java/javolution/util/internal/table/SharedTableImpl.java | 2 +-
.../util/internal/table/sorted/SharedSortedTableImpl.java | 2 +-
.../src/ext/java/javolution/util/service/CollectionService.java | 2 +-
.../src/ext/java/javolution/util/service/MapService.java | 2 +-
.../src/ext/java/javolution/util/service/SortedTableService.java | 2 +-
.../src/ext/java/com/sun/syndication/feed/synd/SyndLink.java | 2 +-
.../src/ext/java/com/sun/syndication/io/impl/FeedGenerators.java | 2 +-
.../org/rometools/feed/module/sle/io/LabelNamespaceElement.java | 2 +-
.../org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java | 2 +-
.../java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java | 2 +-
.../apache/marmotta/ldpath/backend/sesame/SesameValueBackend.java | 2 +-
.../ldpath/model/functions/AbstractTextFilterFunction.java | 2 +-
.../org/apache/marmotta/ldpath/parser/EmptyTestingBackend.java | 2 +-
.../marmotta/ldpath/model/functions/json/JsonPathFunctionTest.java | 2 +-
.../apache/marmotta/ldpath/model/functions/math/MathFunction.java | 2 +-
.../platform/backend/accumulograph/AccumuloGraphLoggingModule.java | 2 +-
.../platform/backend/bigdata/BigDataSesame27Repository.java | 2 +-
.../core/services/http/response/LastModifiedResponseHandler.java | 2 +-
.../core/services/http/response/StatusCodeResponseHandler.java | 2 +-
.../core/services/http/response/StringBodyResponseHandler.java | 2 +-
.../platform/core/services/importer/ImportServiceImpl.java | 2 +-
.../marmotta/platform/core/services/modules/ModuleServiceImpl.java | 2 +-
.../core/services/templating/AdminTemplatingServiceImpl.java | 2 +-
.../platform/ldp/services/LdpBinaryStoreServiceImplTest.java | 2 +-
.../apache/marmotta/platform/user/webservices/UserWebService.java | 2 +-
44 files changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/java/exceptions/DoThisException.java
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/java/exceptions/DoThisException.java b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/java/exceptions/DoThisException.java
index a260d19..0cc71d0 100644
--- a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/java/exceptions/DoThisException.java
+++ b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/java/exceptions/DoThisException.java
@@ -35,4 +35,4 @@ public class DoThisException extends Exception {
public DoThisException(Throwable cause) {
super(cause);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/lang/Immutable.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/lang/Immutable.java b/commons/marmotta-commons/src/ext/java/javolution/lang/Immutable.java
index 9b60984..0a6b285 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/lang/Immutable.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/lang/Immutable.java
@@ -42,4 +42,4 @@ public interface Immutable<T> {
*/
T value();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/lang/ValueType.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/lang/ValueType.java b/commons/marmotta-commons/src/ext/java/javolution/lang/ValueType.java
index d26cb01..d3390e5 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/lang/ValueType.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/lang/ValueType.java
@@ -68,4 +68,4 @@ public interface ValueType<T> extends Immutable<T> {
@Override
T value();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/FastCollection.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/FastCollection.java b/commons/marmotta-commons/src/ext/java/javolution/util/FastCollection.java
index 100d59e..be4f68d 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/FastCollection.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/FastCollection.java
@@ -631,4 +631,4 @@ public abstract class FastCollection<E> implements Collection<E>, Serializable {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/FastSet.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/FastSet.java b/commons/marmotta-commons/src/ext/java/javolution/util/FastSet.java
index c5283c5..3ded167 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/FastSet.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/FastSet.java
@@ -143,4 +143,4 @@ public class FastSet<E> extends FastCollection<E> implements Set<E> {
protected SetService<E> service() {
return service;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/FastSortedSet.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/FastSortedSet.java b/commons/marmotta-commons/src/ext/java/javolution/util/FastSortedSet.java
index 8559070..2123b6d 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/FastSortedSet.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/FastSortedSet.java
@@ -150,4 +150,4 @@ public class FastSortedSet<E> extends FastSet<E> implements SortedSet<E> {
return (SortedSetService<E>) super.service();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/FastSortedTable.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/FastSortedTable.java b/commons/marmotta-commons/src/ext/java/javolution/util/FastSortedTable.java
index 1b90692..225cbd5 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/FastSortedTable.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/FastSortedTable.java
@@ -135,4 +135,4 @@ public class FastSortedTable<E> extends FastTable<E> {
return (SortedTableService<E>) super.service();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/FastTable.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/FastTable.java b/commons/marmotta-commons/src/ext/java/javolution/util/FastTable.java
index 40c171a..7bff38e 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/FastTable.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/FastTable.java
@@ -435,4 +435,4 @@ public class FastTable<E> extends FastCollection<E> implements List<E>,
return service;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/function/Consumer.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/Consumer.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/Consumer.java
index 9c03869..14cde9b 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/Consumer.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/Consumer.java
@@ -26,4 +26,4 @@ public interface Consumer<T> {
*/
void accept(T param);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/function/Equalities.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/Equalities.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/Equalities.java
index 4eb4c29..33a804f 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/Equalities.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/Equalities.java
@@ -71,4 +71,4 @@ public class Equalities {
* Utility class (private constructor).
*/
private Equalities() {}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/function/Function.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/Function.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/Function.java
index 35471de..a359f91 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/Function.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/Function.java
@@ -30,4 +30,4 @@ public interface Function<T, R> {
*/
R apply(T param);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/function/Iteration.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/Iteration.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/Iteration.java
index 8d870ce..6eb74e2 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/Iteration.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/Iteration.java
@@ -29,4 +29,4 @@ public interface Iteration<E> {
*/
void run(Iterator<E> it);
- }
\ No newline at end of file
+ }
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/function/MultiVariable.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/MultiVariable.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/MultiVariable.java
index c38f4d8..8dea99a 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/MultiVariable.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/MultiVariable.java
@@ -51,4 +51,4 @@ public class MultiVariable<L, R> {
public R getRight() {
return right;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/function/Predicate.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/Predicate.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/Predicate.java
index e2c5803..1f4eb2c 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/Predicate.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/Predicate.java
@@ -29,4 +29,4 @@ public interface Predicate<T> {
*/
boolean test(T param);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/function/Reducer.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/Reducer.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/Reducer.java
index 73b3e44..ec7bcc7 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/Reducer.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/Reducer.java
@@ -23,4 +23,4 @@ import java.util.Collection;
*/
public interface Reducer<E> extends Consumer<Collection<E>>, Supplier<E> {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/function/Reducers.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/Reducers.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/Reducers.java
index 020c44e..e8b25d8 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/Reducers.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/Reducers.java
@@ -226,4 +226,4 @@ public class Reducers {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/function/Splittable.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/Splittable.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/Splittable.java
index 4ad3d5d..eb5d5b9 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/Splittable.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/Splittable.java
@@ -50,4 +50,4 @@ public interface Splittable<T> {
*/
void update(Consumer<T> action, T part);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/function/Supplier.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/Supplier.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/Supplier.java
index 984549a..65c39e6 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/Supplier.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/Supplier.java
@@ -27,4 +27,4 @@ public interface Supplier<T> {
*/
T get();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/FractalTableImpl.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/FractalTableImpl.java b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/FractalTableImpl.java
index 66f7782..29b59fc 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/FractalTableImpl.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/FractalTableImpl.java
@@ -169,4 +169,4 @@ final class FractalTableImpl {
return (table != null) ? table : allocate(i);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/SharedTableImpl.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/SharedTableImpl.java b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/SharedTableImpl.java
index 4f77098..448b5d3 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/SharedTableImpl.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/SharedTableImpl.java
@@ -312,4 +312,4 @@ public class SharedTableImpl<E> extends SharedCollectionImpl<E> implements
return (TableService<E>) super.target();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/sorted/SharedSortedTableImpl.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/sorted/SharedSortedTableImpl.java b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/sorted/SharedSortedTableImpl.java
index 8b8ebfe..752f9b1 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/sorted/SharedSortedTableImpl.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/sorted/SharedSortedTableImpl.java
@@ -54,4 +54,4 @@ public class SharedSortedTableImpl<E> extends SharedTableImpl<E> implements
return (SortedTableService<E>) super.target();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/service/CollectionService.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/service/CollectionService.java b/commons/marmotta-commons/src/ext/java/javolution/util/service/CollectionService.java
index f4664a8..1181b4f 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/service/CollectionService.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/service/CollectionService.java
@@ -36,4 +36,4 @@ public interface CollectionService<E> extends Collection<E>,
*/
Equality<? super E> comparator();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/service/MapService.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/service/MapService.java b/commons/marmotta-commons/src/ext/java/javolution/util/service/MapService.java
index c4a8f91..a1fea92 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/service/MapService.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/service/MapService.java
@@ -70,4 +70,4 @@ public interface MapService<K, V> extends
*/
@Override
CollectionService<V> values();
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-commons/src/ext/java/javolution/util/service/SortedTableService.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/service/SortedTableService.java b/commons/marmotta-commons/src/ext/java/javolution/util/service/SortedTableService.java
index 74e47e2..bd61081 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/service/SortedTableService.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/service/SortedTableService.java
@@ -33,4 +33,4 @@ public interface SortedTableService<E> extends TableService<E> {
@Override
SortedTableService<E>[] split(int n, boolean updateable);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndLink.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndLink.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndLink.java
index f16a3d4..a6c95f5 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndLink.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndLink.java
@@ -152,4 +152,4 @@ public interface SyndLink {
* @param length The length to set.
*/
public abstract void setLength(long length);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/FeedGenerators.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/FeedGenerators.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/FeedGenerators.java
index f6e1a71..f62daca 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/FeedGenerators.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/FeedGenerators.java
@@ -59,4 +59,4 @@ public class FeedGenerators extends PluginManager {
return getKeys();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java
index d4083db..d0923f7 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/io/LabelNamespaceElement.java
@@ -75,4 +75,4 @@ public class LabelNamespaceElement {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java
index 47279f6..350d362 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ScriptRunner.java
@@ -299,4 +299,4 @@ public class ScriptRunner {
private void flush() {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java
index 41d7a92..471eb71 100644
--- a/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java
+++ b/libraries/ldpath/ldpath-api/src/main/java/org/apache/marmotta/ldpath/api/backend/NodeBackend.java
@@ -223,4 +223,4 @@ public interface NodeBackend<Node> {
*/
public BigDecimal decimalValue(Node node);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/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 e127886..5d0ad97 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
@@ -271,4 +271,4 @@ public class SesameValueBackend implements NodeBackend<Value>{
return new URIImpl(uri);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/AbstractTextFilterFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/AbstractTextFilterFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/AbstractTextFilterFunction.java
index 7f9feac..09eb52e 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/AbstractTextFilterFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/AbstractTextFilterFunction.java
@@ -71,4 +71,4 @@ public abstract class AbstractTextFilterFunction<Node> extends SelectorFunction<
public final String getSignature() {
return String.format("fn:%s(content: LiteralList) : LiteralList", getLocalName());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/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 cf02c4c..7e35251 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
@@ -71,4 +71,4 @@ public class EmptyTestingBackend extends
public String stringValue(String node) {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/libraries/ldpath/ldpath-functions-json/src/test/java/org/apache/marmotta/ldpath/model/functions/json/JsonPathFunctionTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-json/src/test/java/org/apache/marmotta/ldpath/model/functions/json/JsonPathFunctionTest.java b/libraries/ldpath/ldpath-functions-json/src/test/java/org/apache/marmotta/ldpath/model/functions/json/JsonPathFunctionTest.java
index 2a3b7f9..f5bb744 100644
--- a/libraries/ldpath/ldpath-functions-json/src/test/java/org/apache/marmotta/ldpath/model/functions/json/JsonPathFunctionTest.java
+++ b/libraries/ldpath/ldpath-functions-json/src/test/java/org/apache/marmotta/ldpath/model/functions/json/JsonPathFunctionTest.java
@@ -73,4 +73,4 @@ public class JsonPathFunctionTest extends AbstractTestBase {
Assert.assertEquals(1, values.size());
Assert.assertEquals(answer, values.iterator().next());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MathFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MathFunction.java b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MathFunction.java
index 1fbea12..4567b53 100644
--- a/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MathFunction.java
+++ b/libraries/ldpath/ldpath-functions-math/src/main/java/org/apache/marmotta/ldpath/model/functions/math/MathFunction.java
@@ -22,4 +22,4 @@ import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
public abstract class MathFunction<Node> extends SelectorFunction<Node> {
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/platform/backends/marmotta-backend-accumulograph/src/main/java/org/apache/marmotta/platform/backend/accumulograph/AccumuloGraphLoggingModule.java
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-accumulograph/src/main/java/org/apache/marmotta/platform/backend/accumulograph/AccumuloGraphLoggingModule.java b/platform/backends/marmotta-backend-accumulograph/src/main/java/org/apache/marmotta/platform/backend/accumulograph/AccumuloGraphLoggingModule.java
index b710a09..39024a9 100644
--- a/platform/backends/marmotta-backend-accumulograph/src/main/java/org/apache/marmotta/platform/backend/accumulograph/AccumuloGraphLoggingModule.java
+++ b/platform/backends/marmotta-backend-accumulograph/src/main/java/org/apache/marmotta/platform/backend/accumulograph/AccumuloGraphLoggingModule.java
@@ -76,4 +76,4 @@ public class AccumuloGraphLoggingModule extends BaseLoggingModule {
public Collection<String> getPackages() {
return ImmutableSet.of("org.apache.marmotta.platform.backend.accumulograph", "edu.jhuapl.tinkerpop");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/platform/backends/marmotta-backend-bigdata/src/main/java/org/apache/marmotta/platform/backend/bigdata/BigDataSesame27Repository.java
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-bigdata/src/main/java/org/apache/marmotta/platform/backend/bigdata/BigDataSesame27Repository.java b/platform/backends/marmotta-backend-bigdata/src/main/java/org/apache/marmotta/platform/backend/bigdata/BigDataSesame27Repository.java
index 6ae97fe..9529ecb 100644
--- a/platform/backends/marmotta-backend-bigdata/src/main/java/org/apache/marmotta/platform/backend/bigdata/BigDataSesame27Repository.java
+++ b/platform/backends/marmotta-backend-bigdata/src/main/java/org/apache/marmotta/platform/backend/bigdata/BigDataSesame27Repository.java
@@ -141,4 +141,4 @@ public class BigDataSesame27Repository extends SailRepository {
throw new RepositoryException("could not create repository connection",e);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/LastModifiedResponseHandler.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/LastModifiedResponseHandler.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/LastModifiedResponseHandler.java
index 9210c5f..ee34033 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/LastModifiedResponseHandler.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/LastModifiedResponseHandler.java
@@ -62,4 +62,4 @@ public class LastModifiedResponseHandler implements ResponseHandler<Date> {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/StatusCodeResponseHandler.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/StatusCodeResponseHandler.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/StatusCodeResponseHandler.java
index bbcb5ce..79e4176 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/StatusCodeResponseHandler.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/StatusCodeResponseHandler.java
@@ -35,4 +35,4 @@ public class StatusCodeResponseHandler implements ResponseHandler<Integer> {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/StringBodyResponseHandler.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/StringBodyResponseHandler.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/StringBodyResponseHandler.java
index 18475fe..28bdbf7 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/StringBodyResponseHandler.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/response/StringBodyResponseHandler.java
@@ -37,4 +37,4 @@ public class StringBodyResponseHandler implements ResponseHandler<String> {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/ImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/ImportServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/ImportServiceImpl.java
index c9f8884..634c387 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/ImportServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/ImportServiceImpl.java
@@ -108,4 +108,4 @@ public class ImportServiceImpl implements ImportService{
return importerMap.get(type);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/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 eb43b29..9c25478 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
@@ -424,4 +424,4 @@ public class ModuleServiceImpl implements ModuleService {
return 50;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/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 9b24e2f..84b0713 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
@@ -169,4 +169,4 @@ public class AdminTemplatingServiceImpl implements AdminInterfaceService {
return menu;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/services/LdpBinaryStoreServiceImplTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/services/LdpBinaryStoreServiceImplTest.java b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/services/LdpBinaryStoreServiceImplTest.java
index 87ea78a..ee96b8e 100644
--- a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/services/LdpBinaryStoreServiceImplTest.java
+++ b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/services/LdpBinaryStoreServiceImplTest.java
@@ -51,4 +51,4 @@ public class LdpBinaryStoreServiceImplTest {
// There might be more testing like this here...
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/36167f0b/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/webservices/UserWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/webservices/UserWebService.java b/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/webservices/UserWebService.java
index 0d46a58..a83ed36 100644
--- a/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/webservices/UserWebService.java
+++ b/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/webservices/UserWebService.java
@@ -347,4 +347,4 @@ public class UserWebService {
return foaf;
}
}
-}
\ No newline at end of file
+}
[16/18] marmotta git commit: some code cleanup
Posted by wi...@apache.org.
some code cleanup
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/8e97ffc5
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/8e97ffc5
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/8e97ffc5
Branch: refs/heads/MARMOTTA-588
Commit: 8e97ffc51b05c7d1d92a94684308099ab9794ece
Parents: 9ac05e7
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Oct 12 11:58:47 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Oct 12 11:58:47 2015 +0200
----------------------------------------------------------------------
.../reasoner/model/program/Justification.java | 3 ++-
.../test/engine/JustificationResolutionTest.java | 19 +++++--------------
2 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/8e97ffc5/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Justification.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Justification.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Justification.java
index 56d982b..ec8f947 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Justification.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/program/Justification.java
@@ -71,7 +71,7 @@ public class Justification {
public Justification() {
supportingTriples = StatementCommons.newQuadrupleSet();
- supportingRules = new HashSet<Rule>();
+ supportingRules = new HashSet<>();
}
public long getId() {
@@ -146,4 +146,5 @@ public class Justification {
", supportingRules=" + supportingRules +
'}';
}
+
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/8e97ffc5/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/engine/JustificationResolutionTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/engine/JustificationResolutionTest.java b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/engine/JustificationResolutionTest.java
index 3f1aa48..8229e68 100644
--- a/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/engine/JustificationResolutionTest.java
+++ b/libraries/kiwi/kiwi-reasoner/src/test/java/org/apache/marmotta/kiwi/reasoner/test/engine/JustificationResolutionTest.java
@@ -51,10 +51,8 @@ public class JustificationResolutionTest {
private Map<Statement,Set<Justification>> baseJustifications;
-
protected static Random rnd = new Random();
-
private KiWiTriple t1, t2, t3, t4, t5; // base
private KiWiTriple i1, i2, i3, i4, i5, i6; // inferred
private Justification j1, j2, j3, j4, j5, tj1, tj2, tj3;
@@ -68,7 +66,6 @@ public class JustificationResolutionTest {
baseJustifications = StatementCommons.newQuadrupleMap();
-
KiWiUriResource s1 = randomURI();
KiWiUriResource s2 = randomURI();
KiWiUriResource s3 = randomURI();
@@ -88,7 +85,6 @@ public class JustificationResolutionTest {
t4 = new KiWiTriple(s1,p1,o1, randomURI());
t5 = new KiWiTriple(s3,p1,o1, randomURI());
-
i1 = new KiWiTriple(s1,p2,o1, ctx_inferred); i1.setInferred(true);
i2 = new KiWiTriple(s1,p1,o2, ctx_inferred); i2.setInferred(true);
i3 = new KiWiTriple(s3,p1,o3, ctx_inferred); i3.setInferred(true);
@@ -144,8 +140,7 @@ public class JustificationResolutionTest {
tj2.setTriple(i4);
tj2.getSupportingTriples().add(i1);
tj2.getSupportingTriples().add(i2);
-
-
+
// i6 is justified by i2 and i5 (so multiplexing needed)
tj3 = new Justification();
tj3.setTriple(i6);
@@ -172,9 +167,6 @@ public class JustificationResolutionTest {
Assert.assertTrue(tj1r.getSupportingTriples().contains(t1));
Assert.assertTrue(tj1r.getSupportingTriples().contains(t2));
Assert.assertTrue(tj1r.getSupportingTriples().contains(t3));
-
-
-
}
/**
@@ -228,7 +220,6 @@ public class JustificationResolutionTest {
Assert.assertThat(r4,Matchers.<Justification>hasItem(hasProperty("supportingTriples", allOf(hasItems(t2, t4, t5), not(hasItem(t3))))));
}
-
// TODO: a test taking into account transaction justifications
/**
@@ -240,7 +231,6 @@ public class JustificationResolutionTest {
}
-
/**
* Return a random URI, with a 10% chance of returning a URI that has already been used.
* @return
@@ -276,12 +266,11 @@ public class JustificationResolutionTest {
return object;
}
-
-
private class MockReasoningEngine extends ReasoningEngine {
+
private MockReasoningEngine() {
- }
+ }
/**
* Return the justifications for the triple passed as argument.
@@ -312,5 +301,7 @@ public class JustificationResolutionTest {
public Set<Justification> getBaseJustifications(KiWiReasoningConnection connection, Set<Justification> justifications) throws SQLException, ReasoningException {
return super.getBaseJustifications(connection, justifications);
}
+
}
+
}
[12/18] marmotta git commit: MARMOTTA-617: added test
Posted by wi...@apache.org.
MARMOTTA-617: added test
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/732f4565
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/732f4565
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/732f4565
Branch: refs/heads/MARMOTTA-588
Commit: 732f45650a02f193f75398284b86045da06a3c68
Parents: dd013be
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Oct 9 14:48:47 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Oct 9 14:48:47 2015 +0200
----------------------------------------------------------------------
.../kiwi/sparql/test/KiWiSparqlTest.java | 36 +++++++++++++++--
.../kiwi/sparql/test/MARMOTTA-617.sparql | 28 +++++++++++++
.../marmotta/kiwi/sparql/test/MARMOTTA-617.ttl | 41 ++++++++++++++++++++
3 files changed, 101 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/732f4565/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
index e346ce5..6f34750 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
+++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
@@ -36,9 +36,7 @@ import org.junit.*;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
import org.junit.runner.RunWith;
-import org.openrdf.model.BNode;
-import org.openrdf.model.Statement;
-import org.openrdf.model.URI;
+import org.openrdf.model.*;
import org.openrdf.model.impl.URIImpl;
import org.openrdf.query.*;
import org.openrdf.query.impl.DatasetImpl;
@@ -137,7 +135,7 @@ public class KiWiSparqlTest {
* @throws Exception
*/
@Test
- public void testQuery37() throws Exception {
+ public void testMarmotta578() throws Exception {
testQuery("MARMOTTA-578.sparql");
}
@@ -252,4 +250,34 @@ public class KiWiSparqlTest {
}
+ @Test
+ public void testMarmotta617() throws Exception {
+ RepositoryConnection conn = repository.getConnection();
+ try {
+ conn.begin();
+
+ // 1) load demo data
+ conn.add(this.getClass().getResourceAsStream("MARMOTTA-617.ttl"), "http://localhost/test/MARMOTTA-617", RDFFormat.TURTLE);
+ conn.commit();
+
+ // 2) test the query behavior
+ String queryString = IOUtils.toString(this.getClass().getResourceAsStream("MARMOTTA-617.sparql"), "UTF-8");
+ TupleQuery query = conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
+ TupleQueryResult results = query.evaluate();
+ try {
+ while (results.hasNext()) {
+ BindingSet bindingSet = results.next();
+ Assert.assertTrue(bindingSet.getValue("children") instanceof Literal);
+ Literal children = (Literal) bindingSet.getValue("children");
+ Assert.assertEquals("http://www.w3.org/2001/XMLSchema#boolean", children.getDatatype().stringValue());
+ Assert.assertTrue(Lists.newArrayList("true", "false").contains(children.stringValue()));
+ }
+ } finally {
+ results.close();
+ }
+ } finally {
+ conn.close();
+ }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/732f4565/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-617.sparql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-617.sparql b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-617.sparql
new file mode 100644
index 0000000..b0f847a
--- /dev/null
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-617.sparql
@@ -0,0 +1,28 @@
+#
+# 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.
+#
+
+SELECT DISTINCT ?uri ?title ?children {
+ GRAPH <http://localhost/test/MARMOTTA-617> {
+ ?uri a <http://www.w3.org/2004/02/skos/core#ConceptScheme> .
+ OPTIONAL {
+ ?uri <http://www.w3.org/2000/01/rdf-schema#label> ?title .
+ FILTER (lang(?title) = 'en')
+ }
+ BIND ( EXISTS { ?uri <http://www.w3.org/2004/02/skos/core#hasTopConcept> ?_top } AS ?children )
+ }
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/732f4565/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-617.ttl
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-617.ttl b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-617.ttl
new file mode 100644
index 0000000..91d0e6c
--- /dev/null
+++ b/libraries/kiwi/kiwi-sparql/src/test/resources/org/apache/marmotta/kiwi/sparql/test/MARMOTTA-617.ttl
@@ -0,0 +1,41 @@
+#
+# 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 skos: <http://www.w3.org/2004/02/skos/core#> .
+@prefix : <http://example.org/vocabulary/> .
+
+:Vocabulary a skos:ConceptScheme;
+ skos:hasTopConcept :TopLevelConceptA;
+ skos:hasTopConcept :TopLevelConceptB;
+ rdfs:label "A simple Vocabulary"@en.
+
+:TopLevelConceptA a skos:Concept;
+ skos:inScheme :Vocabulary;
+ skos:topConceptOf :Vocabulary;
+ skos:prefLabel "Label Concept a"@en.
+
+:TopLevelConceptB a skos:Concept;
+ skos:inScheme :Vocabulary;
+ skos:topConceptOf :Vocabulary;
+ skos:narrower :NarrowerConceptB;
+ skos:prefLabel "Label Concept b"@en.
+
+:NarrowerConceptB a skos:Concept;
+ skos:inScheme :Vocabulary;
+ skos:broader :TopLevelConceptB;
+ skos:prefLabel "Label Concept b"@en.
[05/18] marmotta git commit: Extended logging for some ldcache test
that fail on jenkins but work locally.
Posted by wi...@apache.org.
Extended logging for some ldcache test that fail on jenkins but work locally.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/4adec76c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/4adec76c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/4adec76c
Branch: refs/heads/MARMOTTA-588
Commit: 4adec76c99bb198c5573454c508c636ea652dffe
Parents: 55d4087
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Jul 23 09:46:42 2015 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Jul 23 09:46:42 2015 +0200
----------------------------------------------------------------------
.../backend/file/test/LDCacheFileTest.java | 29 ++++++++------------
.../src/test/resources/logback.xml | 3 ++
.../src/test/resources/logback.xml | 3 ++
.../services/test/ng/BaseLDCacheTest.java | 13 +++++----
.../ldcache-core/src/test/resources/logback.xml | 3 ++
5 files changed, 28 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/4adec76c/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java b/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java
index d08d866..040eb4f 100644
--- a/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java
+++ b/libraries/ldcache/ldcache-backend-file/src/test/java/org/apache/marmotta/ldcache/backend/file/test/LDCacheFileTest.java
@@ -14,15 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.marmotta.ldcache.backend.file.test;
-import com.google.common.io.Files;
-import org.apache.commons.io.FileUtils;
import org.apache.marmotta.ldcache.api.LDCachingBackend;
import org.apache.marmotta.ldcache.backend.file.LDCachingFileBackend;
import org.apache.marmotta.ldcache.services.test.ng.BaseLDCacheTest;
+import org.junit.Rule;
import org.junit.internal.AssumptionViolatedException;
+import org.junit.rules.TemporaryFolder;
import org.openrdf.repository.RepositoryException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,33 +38,27 @@ public class LDCacheFileTest extends BaseLDCacheTest {
private static Logger log = LoggerFactory.getLogger(LDCacheFileTest.class);
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
/**
* Needs to be implemented by tests to provide the correct backend. Backend needs to be properly initialised.
*
- * @return
+ * @return an LDCachingBackend
*/
@Override
protected LDCachingBackend createBackend() {
- final File storageDir = Files.createTempDir();
-
- LDCachingBackend backend = null;
try {
- backend = new LDCachingFileBackend(storageDir) {
- @Override
- public void shutdown() {
- super.shutdown();
-
- try {
- FileUtils.deleteDirectory(storageDir);
- } catch (IOException e) {
- }
- }
- };
+ final File storageDir = temporaryFolder.newFolder();
+ LDCachingBackend backend = null;
+ backend = new LDCachingFileBackend(storageDir);
backend.initialize();
return backend;
} catch (RepositoryException e) {
throw new AssumptionViolatedException("could not initialise backend",e);
+ } catch (IOException e) {
+ throw new AssumptionViolatedException("could not create storage-dir for file backend", e);
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/4adec76c/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml b/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
index ea28135..d3e58c4 100644
--- a/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-backend-file/src/test/resources/logback.xml
@@ -21,6 +21,9 @@
<pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
+
+ <logger name="org.apache.marmotta.ldcache" level="DEBUG" />
+
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/4adec76c/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml b/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
index ea28135..d3e58c4 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/src/test/resources/logback.xml
@@ -21,6 +21,9 @@
<pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
+
+ <logger name="org.apache.marmotta.ldcache" level="DEBUG" />
+
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/4adec76c/libraries/ldcache/ldcache-core/src/test/java/org/apache/marmotta/ldcache/services/test/ng/BaseLDCacheTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/src/test/java/org/apache/marmotta/ldcache/services/test/ng/BaseLDCacheTest.java b/libraries/ldcache/ldcache-core/src/test/java/org/apache/marmotta/ldcache/services/test/ng/BaseLDCacheTest.java
index 8f42b22..725c327 100644
--- a/libraries/ldcache/ldcache-core/src/test/java/org/apache/marmotta/ldcache/services/test/ng/BaseLDCacheTest.java
+++ b/libraries/ldcache/ldcache-core/src/test/java/org/apache/marmotta/ldcache/services/test/ng/BaseLDCacheTest.java
@@ -141,15 +141,18 @@ public abstract class BaseLDCacheTest {
// run a SPARQL test to see if the returned data is correct
InputStream sparql = BaseLDCacheTest.class.getResourceAsStream(sparqlFile);
- BooleanQuery testLabel = connection.prepareBooleanQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql));
- Assert.assertTrue("SPARQL test query failed", testLabel.evaluate());
+ final String query = IOUtils.toString(sparql);
+ BooleanQuery testLabel = connection.prepareBooleanQuery(QueryLanguage.SPARQL, query);
+ final boolean testResult = testLabel.evaluate();
+
+ if(!testResult && log.isDebugEnabled()) {
+ log.debug("QUERY: {}", query);
- if(log.isDebugEnabled()) {
StringWriter out = new StringWriter();
connection.export(Rio.createWriter(RDFFormat.TURTLE, out));
- log.debug("DATA:");
- log.debug(out.toString());
+ log.debug("DATA: {}", out.toString());
}
+ Assert.assertTrue("SPARQL test query failed", testResult);
connection.commit();
connection.close();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/4adec76c/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/src/test/resources/logback.xml b/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
index ea28135..d3e58c4 100644
--- a/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
+++ b/libraries/ldcache/ldcache-core/src/test/resources/logback.xml
@@ -21,6 +21,9 @@
<pattern>%d{HH:mm:ss.SSS} %level %logger{15} - %m%n</pattern>
</encoder>
</appender>
+
+ <logger name="org.apache.marmotta.ldcache" level="DEBUG" />
+
<root level="${root-level:-INFO}">
<appender-ref ref="CONSOLE"/>
</root>
[17/18] marmotta git commit: more cleanup
Posted by wi...@apache.org.
more cleanup
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/adefed44
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/adefed44
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/adefed44
Branch: refs/heads/MARMOTTA-588
Commit: adefed448a9cb1de3329f8b69b1733c1e5b38c05
Parents: 8e97ffc
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Oct 12 15:40:19 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Oct 12 15:40:19 2015 +0200
----------------------------------------------------------------------
.../kiwi/reasoner/test/model/JustificationTest.java | 9 ---------
.../kiwi/sparql/evaluation/KiWiEvaluationStrategy.java | 1 -
.../apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java | 8 --------
3 files changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/adefed44/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 f3a1cb7..c354465 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
@@ -39,7 +39,6 @@ public class JustificationTest {
protected static Random rnd = new Random();
-
private KiWiTriple t1, t2, t3, t4; // base
private KiWiTriple i1, i2, i3, i4; // inferred
private Rule r1, r2;
@@ -71,11 +70,8 @@ public class JustificationTest {
i2 = new KiWiTriple(s1,p1,o2, ctx_inferred); i2.setInferred(true);
i3 = new KiWiTriple(s3,p1,o3, ctx_inferred); i3.setInferred(true);
i4 = new KiWiTriple(s1,p2,o1, ctx_inferred); i4.setInferred(true);
-
-
}
-
@Test
public void testJustificationEquals() {
Justification j1 = new Justification();
@@ -107,7 +103,6 @@ public class JustificationTest {
Assert.assertNotEquals(j1, j4);
}
-
@Test
public void testJustificationSet() {
Set<Justification> set = new HashSet<>();
@@ -129,7 +124,6 @@ public class JustificationTest {
Assert.assertEquals(1, set.size());
-
// j3 differs in the inferred triple
Justification j3 = new Justification();
j3.setTriple(i2);
@@ -142,7 +136,6 @@ public class JustificationTest {
Assert.assertEquals(2, set.size());
-
// j4 differs in the supporting triples
Justification j4 = new Justification();
j4.setTriple(i1);
@@ -156,8 +149,6 @@ public class JustificationTest {
Assert.assertEquals(3, set.size());
}
-
-
/**
* Return a random URI, with a 10% chance of returning a URI that has already been used.
* @return
http://git-wip-us.apache.org/repos/asf/marmotta/blob/adefed44/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java
index bc9b188..6315886 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/evaluation/KiWiEvaluationStrategy.java
@@ -136,7 +136,6 @@ public class KiWiEvaluationStrategy extends EvaluationStrategyImpl{
}
}
-
@Override
public CloseableIteration<BindingSet, QueryEvaluationException> evaluate(LeftJoin join, BindingSet bindings) throws QueryEvaluationException {
if(isSupported(join)) {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/adefed44/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
index 6f34750..c3a2868 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
+++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
@@ -18,28 +18,20 @@
package org.apache.marmotta.kiwi.sparql.test;
import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import info.aduna.iteration.Iterations;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.marmotta.commons.sesame.model.StatementCommons;
-import org.apache.marmotta.commons.vocabulary.FOAF;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.sail.KiWiStore;
-import org.apache.marmotta.kiwi.sparql.function.NativeFunctionRegistry;
import org.apache.marmotta.kiwi.sparql.sail.KiWiSparqlSail;
import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner;
-import org.apache.marmotta.kiwi.vocabulary.FN_MARMOTTA;
-import org.hamcrest.Matchers;
import org.junit.*;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
import org.junit.runner.RunWith;
import org.openrdf.model.*;
-import org.openrdf.model.impl.URIImpl;
import org.openrdf.query.*;
-import org.openrdf.query.impl.DatasetImpl;
import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
[14/18] marmotta git commit: fixed module description
Posted by wi...@apache.org.
fixed module description
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/c911ee2c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/c911ee2c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/c911ee2c
Branch: refs/heads/MARMOTTA-588
Commit: c911ee2c5035ad3f36c8bbb354dfb2b0738c112f
Parents: b4d8c33
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Oct 12 10:34:40 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Oct 12 10:34:40 2015 +0200
----------------------------------------------------------------------
commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/c911ee2c/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml b/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml
index 3365857..825263a 100644
--- a/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml
+++ b/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml
@@ -30,7 +30,7 @@
<name>Marmotta Sesame Tools: Common Vocabularies</name>
- <description>Util-Methods to apply 'application/rdf-patch' changesets to Sesame</description>
+ <description>Common RDF vocabularies fro Sesame</description>
<build>
<plugins>
[06/18] marmotta git commit: MARMOTTA-616: removed^Cll traces of
'database.mode' unused configuration
Posted by wi...@apache.org.
MARMOTTA-616: removed^Cll traces of 'database.mode' unused configuration
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ab2d47a3
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ab2d47a3
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ab2d47a3
Branch: refs/heads/MARMOTTA-588
Commit: ab2d47a30e51cfd897cd87c96d5e2736d9c17482
Parents: 4adec76
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Sep 14 19:16:59 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Sep 14 19:16:59 2015 +0200
----------------------------------------------------------------------
.../src/main/resources/config-defaults.properties | 7 -------
.../src/main/resources/config-descriptions.properties | 4 ----
.../core/services/config/ConfigurationServiceImpl.java | 3 +--
3 files changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/ab2d47a3/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties b/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties
index fe1f4ea..bf0d36a 100644
--- a/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties
+++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties
@@ -15,7 +15,6 @@
# limitations under the License.
#
-
###############################################################################
# KiWi database configuration
###############################################################################
@@ -32,13 +31,9 @@ database.user =
# the database password
database.password =
-# the database mode (create, update or validate)
-database.mode =
-
# report slow queries in the log (not thread safe)
database.debug.slowqueries = false
-
# turn on batch commits for database transactions (EXPERIMENTAL); if supported by the database backend, this can
# lead to considerable performance improvements
database.triples.batchcommit = true
@@ -68,7 +63,6 @@ database.postgres.url = jdbc:postgresql://localhost:5432/lmf?prepareThreshold=3
database.mysql.driver = com.mysql.jdbc.Driver
database.mysql.url = jdbc:mysql://localhost:3306/lmf?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-
caching.literal.size = 100000
caching.uri.size = 500000
caching.bnode.size = 10000
@@ -82,4 +76,3 @@ clustering.address = 228.6.7.8
clustering.port = 46655
clustering.backend = GUAVA
-
http://git-wip-us.apache.org/repos/asf/marmotta/blob/ab2d47a3/platform/backends/marmotta-backend-kiwi/src/main/resources/config-descriptions.properties
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/config-descriptions.properties b/platform/backends/marmotta-backend-kiwi/src/main/resources/config-descriptions.properties
index 8fb658b..ea7aebd 100644
--- a/platform/backends/marmotta-backend-kiwi/src/main/resources/config-descriptions.properties
+++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/config-descriptions.properties
@@ -31,9 +31,6 @@ database.user.type = java.lang.String
database.password.description = the database password
database.password.type = java.lang.String("password")
-database.mode.description = the database mode (create, update, validate or off)
-database.mode.type = java.lang.Enum("create"|"update"|"validate"|"off")
-
database.debug.slowqueries.description = enable reporting of slow database queries (produces additional overhead and is not thread safe)
database.debug.slowqueries.type = java.lang.Boolean
@@ -54,7 +51,6 @@ database.fulltext.enabled.type = java.lang.Boolean
database.fulltext.languages.description = list of languages supported by fulltext search; a fulltext index will be created for each language (PostgreSQL only)
database.fulltext.languages.type = java.util.List
-
caching.literal.size.description = size of literal lookup cache
caching.literal.size.type = java.lang.Integer(10|0|*)
caching.uri.size.description = size of URI resource lookup cache
http://git-wip-us.apache.org/repos/asf/marmotta/blob/ab2d47a3/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
index 52003e2..ed7b294 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
@@ -378,8 +378,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
if (db_type.equals("h2")) {
config.setProperty("database.url", "jdbc:h2:" + getHome() + "/db/marmotta;MVCC=true;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=10");
config.setProperty("database.user", "sa");
- config.setProperty("database.password", "sa");
- config.setProperty("database.mode", "create");
+ config.setProperty("database.password", "sa");;
}
config.setProperty("kiwi.setup.database", true);
}
[07/18] marmotta git commit: MARMOTTA-616: fixed typo
Posted by wi...@apache.org.
MARMOTTA-616: fixed typo
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5daafbb9
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5daafbb9
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5daafbb9
Branch: refs/heads/MARMOTTA-588
Commit: 5daafbb9463c0de9949c4c50d8e2b68935664470
Parents: ab2d47a
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Sep 14 19:19:48 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Sep 14 19:19:48 2015 +0200
----------------------------------------------------------------------
.../platform/core/services/config/ConfigurationServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/5daafbb9/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
index ed7b294..e32dc5f 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
@@ -378,7 +378,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
if (db_type.equals("h2")) {
config.setProperty("database.url", "jdbc:h2:" + getHome() + "/db/marmotta;MVCC=true;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=10");
config.setProperty("database.user", "sa");
- config.setProperty("database.password", "sa");;
+ config.setProperty("database.password", "sa");
}
config.setProperty("kiwi.setup.database", true);
}
[15/18] marmotta git commit: typo
Posted by wi...@apache.org.
typo
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9ac05e72
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9ac05e72
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9ac05e72
Branch: refs/heads/MARMOTTA-588
Commit: 9ac05e72b36a30fc9bffb5599e4d4e236104da44
Parents: c911ee2
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Oct 12 10:36:29 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Oct 12 10:36:29 2015 +0200
----------------------------------------------------------------------
commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9ac05e72/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml b/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml
index 825263a..80e683a 100644
--- a/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml
+++ b/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml
@@ -30,7 +30,7 @@
<name>Marmotta Sesame Tools: Common Vocabularies</name>
- <description>Common RDF vocabularies fro Sesame</description>
+ <description>Common RDF vocabularies for Sesame</description>
<build>
<plugins>
[04/18] marmotta git commit: Fixed tests in
ldclient-provider-mediawiki that failed after wikipedia switching to https by
default
Posted by wi...@apache.org.
Fixed tests in ldclient-provider-mediawiki that failed after wikipedia switching to https by default
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/55d4087b
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/55d4087b
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/55d4087b
Branch: refs/heads/MARMOTTA-588
Commit: 55d4087b203f0358f5e0791b9aac7bf8db821439
Parents: 36167f0
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Jul 23 09:23:57 2015 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Jul 23 09:23:57 2015 +0200
----------------------------------------------------------------------
.../test/provider/ProviderTestBase.java | 20 ++++++++------
.../mediawiki/WikipediaIndexEndpoint.java | 2 +-
.../mediawiki/WikipediaPageEndpoint.java | 2 +-
.../test/mediawiki/TestMediawikiProvider.java | 8 ++++--
.../test/mediawiki/wikipedia-marmot-http.sparql | 29 ++++++++++++++++++++
.../test/mediawiki/wikipedia-marmot.sparql | 4 +--
6 files changed, 51 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/provider/ProviderTestBase.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/provider/ProviderTestBase.java b/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/provider/ProviderTestBase.java
index d46184b..7178e88 100644
--- a/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/provider/ProviderTestBase.java
+++ b/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/provider/ProviderTestBase.java
@@ -98,22 +98,26 @@ public class ProviderTestBase {
ClientResponse response = ldclient.retrieveResource(uri);
- RepositoryConnection connection = ModelCommons.asRepository(response.getData()).getConnection();
+ final RepositoryConnection connection = ModelCommons.asRepository(response.getData()).getConnection();
try {
connection.begin();
Assert.assertTrue(connection.size() > 0);
// run a SPARQL test to see if the returned data is correct
- InputStream sparql = this.getClass().getResourceAsStream(sparqlFile);
- BooleanQuery testLabel = connection.prepareBooleanQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql, "UTF-8"));
- Assert.assertTrue("SPARQL test query failed", testLabel.evaluate());
+ final InputStream sparql = this.getClass().getResourceAsStream(sparqlFile);
+ final String query = IOUtils.toString(sparql, "utf8");
+ final BooleanQuery testLabel = connection.prepareBooleanQuery(QueryLanguage.SPARQL, query);
+ final boolean testSuccess = testLabel.evaluate();
+
+ if (!testSuccess && log.isDebugEnabled()) {
+ log.debug("QUERY:\n{}", query);
- if (log.isDebugEnabled()) {
- StringWriter out = new StringWriter();
+ final StringWriter out = new StringWriter();
connection.export(Rio.createWriter(RDFFormat.TURTLE, out));
- log.debug("DATA:");
- log.debug(out.toString());
+ log.debug("DATA:\n{}", out.toString());
}
+
+ Assert.assertTrue("SPARQL test query failed", testSuccess);
} finally {
connection.commit();
connection.close();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaIndexEndpoint.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaIndexEndpoint.java b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaIndexEndpoint.java
index 47215d3..863b88f 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaIndexEndpoint.java
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaIndexEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.marmotta.ldclient.provider.mediawiki.MediawikiProvider;
public class WikipediaIndexEndpoint extends Endpoint {
public WikipediaIndexEndpoint() {
- super("Wikipedia Provider (Index)", MediawikiProvider.PROVIDER_NAME, "^http://([^.]+)\\.wikipedia\\.org/w/index\\.php.*", "http://$1.wikipedia.org/w/api.php", 86400L);
+ super("Wikipedia Provider (Index)", MediawikiProvider.PROVIDER_NAME, "^https?://([^.]+)\\.wikipedia\\.org/w/index\\.php.*", "https://$1.wikipedia.org/w/api.php", 86400L);
setPriority(PRIORITY_HIGH);
addContentType(new ContentType("text", "xml"));
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaPageEndpoint.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaPageEndpoint.java b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaPageEndpoint.java
index 218dc27..1987532 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaPageEndpoint.java
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaPageEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.marmotta.ldclient.provider.mediawiki.MediawikiProvider;
public class WikipediaPageEndpoint extends Endpoint {
public WikipediaPageEndpoint() {
- super("Wikipedia Provider (Page)", MediawikiProvider.PROVIDER_NAME, "^http://([^.]+)\\.wikipedia\\.org/wiki/.*", "http://$1.wikipedia.org/w/api.php", 86400L);
+ super("Wikipedia Provider (Page)", MediawikiProvider.PROVIDER_NAME, "^https?://([^.]+)\\.wikipedia\\.org/wiki/.*", "https://$1.wikipedia.org/w/api.php", 86400L);
setPriority(PRIORITY_HIGH);
addContentType(new ContentType("text", "xml"));
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java b/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java
index 71b8027..bbfc74b 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java
@@ -29,13 +29,17 @@ public class TestMediawikiProvider extends ProviderTestBase {
/**
- * This method tests accessing the Youtube Video service via the GData API.
+ * This method tests accessing the mediawiki resource.
*
* @throws Exception
*/
@Test
public void testArticle() throws Exception {
- testResource("http://en.wikipedia.org/wiki/Marmot", "wikipedia-marmot.sparql");
+ testResource("https://en.wikipedia.org/wiki/Marmot", "wikipedia-marmot.sparql");
}
+ @Test
+ public void testArticleHttp() throws Exception {
+ testResource("http://en.wikipedia.org/wiki/Marmot", "wikipedia-marmot-http.sparql");
+ }
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot-http.sparql
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot-http.sparql b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot-http.sparql
new file mode 100644
index 0000000..36672d6
--- /dev/null
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot-http.sparql
@@ -0,0 +1,29 @@
+#
+# 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 rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX dct: <http://purl.org/dc/terms/>
+PREFIX sioc: <http://rdfs.org/sioc/ns#>
+PREFIX sioc-types: <http://rdfs.org/sioc/types#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+ASK {
+ <http://en.wikipedia.org/wiki/Marmot> dct:title "Marmot" ;
+ owl:sameAs <https://en.wikipedia.org/wiki/Marmot> ;
+ rdf:type sioc-types:WikiArticle ;
+ sioc:topic <https://en.wikipedia.org/wiki/Category:Ground_squirrels> .
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot.sparql
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot.sparql b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot.sparql
index 5425d1c..65be278 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot.sparql
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot.sparql
@@ -21,7 +21,7 @@ PREFIX dct: <http://purl.org/dc/terms/>
PREFIX sioc: <http://rdfs.org/sioc/ns#>
PREFIX sioc-types: <http://rdfs.org/sioc/types#>
ASK {
- <http://en.wikipedia.org/wiki/Marmot> dct:title "Marmot" ;
+ <https://en.wikipedia.org/wiki/Marmot> dct:title "Marmot" ;
rdf:type sioc-types:WikiArticle ;
- sioc:topic <http://en.wikipedia.org/wiki/Category:Ground_squirrels> .
+ sioc:topic <https://en.wikipedia.org/wiki/Category:Ground_squirrels> .
}
[18/18] marmotta git commit: Merge branch 'develop' into MARMOTTA-588
Posted by wi...@apache.org.
Merge branch 'develop' into MARMOTTA-588
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/940cac1f
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/940cac1f
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/940cac1f
Branch: refs/heads/MARMOTTA-588
Commit: 940cac1f945ddd8f0ab8efe4bd6c97cb4de4f545
Parents: 2fa66e7 adefed4
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Nov 12 15:55:55 2015 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Nov 12 15:55:55 2015 +0100
----------------------------------------------------------------------
.../main/java/exceptions/DoThisException.java | 2 +-
.../src/ext/java/javolution/lang/Immutable.java | 2 +-
.../src/ext/java/javolution/lang/ValueType.java | 2 +-
.../java/javolution/util/FastCollection.java | 2 +-
.../src/ext/java/javolution/util/FastSet.java | 2 +-
.../ext/java/javolution/util/FastSortedSet.java | 2 +-
.../java/javolution/util/FastSortedTable.java | 2 +-
.../src/ext/java/javolution/util/FastTable.java | 2 +-
.../java/javolution/util/function/Consumer.java | 2 +-
.../javolution/util/function/Equalities.java | 2 +-
.../java/javolution/util/function/Function.java | 2 +-
.../javolution/util/function/Iteration.java | 2 +-
.../javolution/util/function/MultiVariable.java | 2 +-
.../javolution/util/function/Predicate.java | 2 +-
.../java/javolution/util/function/Reducer.java | 2 +-
.../java/javolution/util/function/Reducers.java | 2 +-
.../javolution/util/function/Splittable.java | 2 +-
.../java/javolution/util/function/Supplier.java | 2 +-
.../util/internal/table/FractalTableImpl.java | 2 +-
.../util/internal/table/SharedTableImpl.java | 2 +-
.../table/sorted/SharedSortedTableImpl.java | 2 +-
.../util/service/CollectionService.java | 2 +-
.../javolution/util/service/MapService.java | 2 +-
.../util/service/SortedTableService.java | 2 +-
.../commons/http/MarmottaHttpUtils.java | 4 +-
.../commons/http/MarmottaHttpUtilsTest.java | 27 ++++++++++++
.../marmotta-model-vocabs/pom.xml | 2 +-
.../src/test/resources/logback.xml | 4 +-
.../com/sun/syndication/feed/synd/SyndLink.java | 2 +-
.../sun/syndication/io/impl/FeedGenerators.java | 2 +-
.../module/sle/io/LabelNamespaceElement.java | 2 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../kiwi-loader/src/main/resources/logback.xml | 4 +-
.../src/test/resources/logback-test.xml | 4 +-
.../reasoner/model/program/Justification.java | 3 +-
.../engine/JustificationResolutionTest.java | 19 +++------
.../reasoner/test/model/JustificationTest.java | 9 ----
.../kiwi/sparql/builder/SQLBuilder.java | 2 +
.../evaluation/KiWiEvaluationStrategy.java | 1 -
.../kiwi/sparql/test/KiWiSparqlTest.java | 44 ++++++++++++++------
.../kiwi/sparql/test/MARMOTTA-617.sparql | 28 +++++++++++++
.../marmotta/kiwi/sparql/test/MARMOTTA-617.ttl | 41 ++++++++++++++++++
.../kiwi/persistence/util/ScriptRunner.java | 2 +-
.../src/test/resources/logback.xml | 4 +-
.../backend/file/test/LDCacheFileTest.java | 29 +++++--------
.../src/test/resources/logback.xml | 7 +++-
.../src/test/resources/logback.xml | 7 +++-
.../services/test/ng/BaseLDCacheTest.java | 13 +++---
.../ldcache-core/src/test/resources/logback.xml | 7 +++-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../test/provider/ProviderTestBase.java | 20 +++++----
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../mediawiki/WikipediaIndexEndpoint.java | 2 +-
.../mediawiki/WikipediaPageEndpoint.java | 2 +-
.../test/mediawiki/TestMediawikiProvider.java | 8 +++-
.../src/test/resources/logback.xml | 4 +-
.../test/mediawiki/wikipedia-marmot-http.sparql | 29 +++++++++++++
.../test/mediawiki/wikipedia-marmot.sparql | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../ldpath/api/backend/NodeBackend.java | 2 +-
.../src/test/resources/logback.xml | 4 +-
.../backend/sesame/SesameValueBackend.java | 2 +-
.../functions/AbstractTextFilterFunction.java | 2 +-
.../ldpath/parser/EmptyTestingBackend.java | 2 +-
.../ldpath-core/src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../functions/json/JsonPathFunctionTest.java | 2 +-
.../src/test/resources/logback.xml | 4 +-
.../model/functions/math/MathFunction.java | 2 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/test/resources/logback.xml | 4 +-
.../src/main/resources/logback.xml | 4 +-
.../src/main/resources/logback.xml | 4 +-
.../AccumuloGraphLoggingModule.java | 2 +-
.../bigdata/BigDataSesame27Repository.java | 2 +-
.../main/resources/config-defaults.properties | 11 +----
.../resources/config-descriptions.properties | 4 --
.../config/ConfigurationServiceImpl.java | 1 -
.../response/LastModifiedResponseHandler.java | 2 +-
.../response/StatusCodeResponseHandler.java | 2 +-
.../response/StringBodyResponseHandler.java | 2 +-
.../services/importer/ImportServiceImpl.java | 2 +-
.../services/modules/ModuleServiceImpl.java | 2 +-
.../templating/AdminTemplatingServiceImpl.java | 2 +-
.../services/LdpBinaryStoreServiceImplTest.java | 2 +-
platform/marmotta-sparql/pom.xml | 4 ++
.../user/webservices/UserWebService.java | 2 +-
100 files changed, 335 insertions(+), 201 deletions(-)
----------------------------------------------------------------------
[08/18] marmotta git commit: changed the default db name on both
postgres and mysql
Posted by wi...@apache.org.
changed the default db name on both postgres and mysql
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/dd013bed
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/dd013bed
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/dd013bed
Branch: refs/heads/MARMOTTA-588
Commit: dd013bed15e6a63a55f3e3f1c29d5a3030d7209b
Parents: 5daafbb
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Sep 23 17:13:47 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Sep 23 17:13:47 2015 +0200
----------------------------------------------------------------------
.../src/main/resources/config-defaults.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/dd013bed/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties b/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties
index bf0d36a..4b2ae7c 100644
--- a/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties
+++ b/platform/backends/marmotta-backend-kiwi/src/main/resources/config-defaults.properties
@@ -57,11 +57,11 @@ database.h2.url = jdbc:h2:${sys:java.io.tmpdir}${sys:file.separator}kiwi/db/kiwi
# Hibernate-specific configuration for PostgreSQL
database.postgres.driver = org.postgresql.Driver
-database.postgres.url = jdbc:postgresql://localhost:5432/lmf?prepareThreshold=3
+database.postgres.url = jdbc:postgresql://localhost:5432/marmotta?prepareThreshold=3
# Hibernate-specific configuration for MySQL
database.mysql.driver = com.mysql.jdbc.Driver
-database.mysql.url = jdbc:mysql://localhost:3306/lmf?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
+database.mysql.url = jdbc:mysql://localhost:3306/marmotta?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
caching.literal.size = 100000
caching.uri.size = 500000