You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/12/19 15:49:02 UTC
[1/5] git commit: Removed unused properties in ldpath/pom.xml
Updated Branches:
refs/heads/develop f94823e46 -> 883aa7834
Removed unused properties in ldpath/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/8ab69987
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/8ab69987
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/8ab69987
Branch: refs/heads/develop
Commit: 8ab69987104546a7de06e188f83954d5b5ecf3b3
Parents: bb46814
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Dec 19 11:28:51 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Dec 19 14:23:56 2013 +0100
----------------------------------------------------------------------
libraries/ldpath/pom.xml | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/8ab69987/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 93a03bf..18b9c48 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -31,14 +31,6 @@
<name>LDPath: Reactor</name>
<description>A path-based query language for RDF and Linked Data.</description>
- <properties>
- <sesameVersion>2.6.10</sesameVersion>
- <jenaVersion>2.7.3</jenaVersion>
- <sl4jVersion>1.7.2</sl4jVersion>
- <logbackVersion>1.0.7</logbackVersion>
- <jacksonVersion>1.9.10</jacksonVersion>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
[4/5] git commit: Fixed some warnings
Posted by ja...@apache.org.
Fixed some warnings
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/97425c6a
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/97425c6a
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/97425c6a
Branch: refs/heads/develop
Commit: 97425c6a08c064d8772d141ea9ef4c54c010941a
Parents: a0b38a5
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Dec 19 15:37:26 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Dec 19 15:37:26 2013 +0100
----------------------------------------------------------------------
.../commons/sesame/rio/ical/TestICalParser.java | 4 +++-
.../commons/sesame/rio/rss/TestAtomParser.java | 4 +++-
.../commons/sesame/rio/rss/TestRSSParser.java | 4 +++-
.../commons/sesame/rio/vcard/TestVCardParser.java | 4 +++-
.../apache/marmotta/kiwi/test/PersistenceTest.java | 6 +++---
.../apache/marmotta/kiwi/test/RepositoryTest.java | 17 +++++++++--------
.../kiwi/test/generator/SnowflakeTest.java | 1 +
.../kiwi/test/generator/UUIDRandomTest.java | 1 +
.../marmotta/kiwi/test/generator/UUIDTimeTest.java | 1 +
.../test/sesame/repository/KiWiRepositoryTest.java | 8 --------
10 files changed, 27 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java b/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
index 09a1698..30353b7 100644
--- a/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
+++ b/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
@@ -20,6 +20,8 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
+import info.aduna.iteration.Iterations;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -93,7 +95,7 @@ public class TestICalParser {
}
assertTrue(connection.size() > 0);
- int count = connection.getStatements(null, null, null, false).asList().size();
+ int count = Iterations.asList(connection.getStatements(null, null, null, false)).size();
assertTrue(count > 0);
BooleanQuery sparqlQuery = (BooleanQuery)connection.prepareQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
index 311daec..a643277 100644
--- a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
+++ b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
@@ -34,6 +34,8 @@ import org.openrdf.sail.memory.MemoryStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.aduna.iteration.Iterations;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -84,7 +86,7 @@ public class TestAtomParser {
}
assertTrue(connection.size() > 0);
- int count = connection.getStatements(null, null, null, false).asList().size();
+ int count = Iterations.asList(connection.getStatements(null, null, null, false)).size();
assertTrue(count > 0);
BooleanQuery sparqlQuery = (BooleanQuery)connection.prepareQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql).replaceAll("http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/rdfa1.1/","http://localhost/rdfa/"));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
index 305f016..7454c50 100644
--- a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
+++ b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
@@ -34,6 +34,8 @@ import org.openrdf.sail.memory.MemoryStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.aduna.iteration.Iterations;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -84,7 +86,7 @@ public class TestRSSParser {
}
assertTrue(connection.size() > 0);
- int count = connection.getStatements(null, null, null, false).asList().size();
+ int count = Iterations.asList(connection.getStatements(null, null, null, false)).size();
assertTrue(count > 0);
BooleanQuery sparqlQuery = (BooleanQuery)connection.prepareQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql).replaceAll("http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/rdfa1.1/","http://localhost/rdfa/"));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java b/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
index c34d92a..aab8242 100644
--- a/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
+++ b/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
@@ -38,6 +38,8 @@ import org.openrdf.sail.memory.MemoryStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.aduna.iteration.Iterations;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -89,7 +91,7 @@ public class TestVCardParser {
}
assertTrue(connection.size() > 0);
- int count = connection.getStatements(null, null, null, false).asList().size();
+ int count = Iterations.asList(connection.getStatements(null, null, null, false)).size();
assertTrue(count > 0);
BooleanQuery sparqlQuery = (BooleanQuery)connection.prepareQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql).replaceAll("http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/rdfa1.1/","http://localhost/rdfa/"));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
index 69cb81e..9eff945 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java
@@ -1018,7 +1018,7 @@ public class PersistenceTest {
connection.storeTriple(triple2);
// check querying within transaction
- List<Statement> result1 = connection.listTriples(subject,null,null,null,false, true).asList();
+ List<Statement> result1 = Iterations.asList(connection.listTriples(subject,null,null,null,false, true));
Assert.assertThat(result1,hasItems((Statement)triple1,(Statement)triple2));
Assert.assertEquals(2, connection.getSize());
@@ -1027,7 +1027,7 @@ public class PersistenceTest {
connection.commit();
- List<Statement> result2 = connection.listTriples(subject,null,null,null,false, true).asList();
+ List<Statement> result2 = Iterations.asList(connection.listTriples(subject,null,null,null,false, true));
Assert.assertThat(result2,hasItems((Statement)triple1,(Statement)triple2));
Assert.assertEquals(2, connection.getSize());
@@ -1039,7 +1039,7 @@ public class PersistenceTest {
// clear cache and test again
persistence.clearCache();
- List<Statement> result3 = connection.listTriples(subject,null,null,null,false, true).asList();
+ List<Statement> result3 = Iterations.asList(connection.listTriples(subject,null,null,null,false, true));
Assert.assertThat(result3,hasItems((Statement)triple1,(Statement)triple2));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
index ce2adae..0f752b7 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/RepositoryTest.java
@@ -44,6 +44,8 @@ import org.openrdf.rio.RDFParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import info.aduna.iteration.Iterations;
+
import java.io.IOException;
import java.io.InputStream;
import java.sql.SQLException;
@@ -53,9 +55,7 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.*;
-import static org.hamcrest.Matchers.is;
import static org.junit.Assume.assumeThat;
/**
@@ -162,6 +162,7 @@ public class RepositoryTest {
* @throws RepositoryException
*/
@Test
+ @SuppressWarnings("unchecked")
public void testNamespaces() throws RepositoryException {
RepositoryConnection connection = repository.getConnection();
@@ -173,9 +174,9 @@ public class RepositoryTest {
Assert.assertEquals("http://localhost/ns1/", connection.getNamespace("ns1"));
Assert.assertEquals("http://localhost/ns2/", connection.getNamespace("ns2"));
- Assert.assertEquals(2, connection.getNamespaces().asList().size());
+ Assert.assertEquals(2, Iterations.asList(connection.getNamespaces()).size());
Assert.assertThat(
- connection.getNamespaces().asList(),
+ Iterations.asList(connection.getNamespaces()),
CoreMatchers.<Namespace>hasItems(
hasProperty("name", is("http://localhost/ns1/")),
hasProperty("name", is("http://localhost/ns2/"))
@@ -189,7 +190,7 @@ public class RepositoryTest {
Assert.assertEquals("http://localhost/ns3/", connection.getNamespace("ns1"));
Assert.assertThat(
- connection.getNamespaces().asList(),
+ Iterations.asList(connection.getNamespaces()),
CoreMatchers.<Namespace>hasItems(
hasProperty("name", is("http://localhost/ns3/")),
hasProperty("name", is("http://localhost/ns2/"))
@@ -203,7 +204,7 @@ public class RepositoryTest {
connection.commit();
connection.begin();
- Assert.assertEquals(1, connection.getNamespaces().asList().size());
+ Assert.assertEquals(1, Iterations.asList(connection.getNamespaces()).size());
connection.commit();
@@ -313,7 +314,7 @@ public class RepositoryTest {
connectionRDF.add(rdfXML, "http://localhost/srfg/", RDFFormat.RDFXML);
connectionRDF.commit();
- oldTriples = connectionRDF.getStatements(null,null,null,true).asList();
+ oldTriples = Iterations.asList(connectionRDF.getStatements(null,null,null,true));
oldsize = connectionRDF.size();
} finally {
connectionRDF.close();
@@ -329,7 +330,7 @@ public class RepositoryTest {
connection.add(rdfXML, "http://localhost/srfg/", RDFFormat.RDFXML);
connection.commit();
- newTriples = connection.getStatements(null,null,null,true).asList();
+ newTriples = Iterations.asList(connection.getStatements(null,null,null,true));
newsize = connection.size();
} finally {
connection.commit();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/SnowflakeTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/SnowflakeTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/SnowflakeTest.java
index 3bd0402..9e153b0 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/SnowflakeTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/SnowflakeTest.java
@@ -54,6 +54,7 @@ public class SnowflakeTest {
while(System.currentTimeMillis() < start + 5000) {
long id = generator.getId(null,null);
count++;
+ log.trace("Generated ID: {}", id);
}
log.info("generated {} ids ({}/sec)", count, count/5);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
index b6329a4..43debb5 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDRandomTest.java
@@ -57,6 +57,7 @@ public class UUIDRandomTest {
while(System.currentTimeMillis() < start + 5000) {
long id = generator.getId(null,null);
count++;
+ log.trace("Generated ID: {}", id);
}
log.info("generated {} ids ({}/sec)", count, count/5);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
index 5c58fcd..43dea59 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/generator/UUIDTimeTest.java
@@ -57,6 +57,7 @@ public class UUIDTimeTest {
while(System.currentTimeMillis() < start + 5000) {
long id = generator.getId(null,null);
count++;
+ log.trace("Generated ID: {}", id);
}
log.info("generated {} ids ({}/sec)", count, count/5);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/97425c6a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
index 7291859..5dc25bb 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/sesame/repository/KiWiRepositoryTest.java
@@ -20,18 +20,10 @@ package org.apache.marmotta.kiwi.test.sesame.repository;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.sail.KiWiStore;
import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner;
-import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryTest;
import org.openrdf.repository.sail.SailRepository;
-import org.openrdf.sail.Sail;
-import org.openrdf.sail.SailException;
-import org.openrdf.sail.helpers.SailWrapper;
-
-import java.sql.SQLException;
-
-import static org.junit.Assert.fail;
/**
* Run the {@link RepositoryTest}s.
[2/5] git commit: Fixed tests for updated ical4j library (enabled
compatibility mode for test)
Posted by ja...@apache.org.
Fixed tests for updated ical4j library (enabled compatibility mode for test)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bb46814d
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bb46814d
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bb46814d
Branch: refs/heads/develop
Commit: bb46814d97b3db10bed6c0ca8ce06c4115d6ab98
Parents: f94823e
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Dec 19 13:55:11 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Dec 19 14:23:56 2013 +0100
----------------------------------------------------------------------
.../commons/sesame/rio/ical/ICalFormat.java | 35 ++++++++++++++++++--
.../commons/sesame/rio/ical/ICalParser.java | 4 ++-
.../commons/sesame/rio/ical/TestICalParser.java | 18 +++++++---
3 files changed, 49 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bb46814d/commons/sesame-tools-rio-api/src/main/java/org/apache/marmotta/commons/sesame/rio/ical/ICalFormat.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/src/main/java/org/apache/marmotta/commons/sesame/rio/ical/ICalFormat.java b/commons/sesame-tools-rio-api/src/main/java/org/apache/marmotta/commons/sesame/rio/ical/ICalFormat.java
index 555d648..9f130af 100644
--- a/commons/sesame-tools-rio-api/src/main/java/org/apache/marmotta/commons/sesame/rio/ical/ICalFormat.java
+++ b/commons/sesame-tools-rio-api/src/main/java/org/apache/marmotta/commons/sesame/rio/ical/ICalFormat.java
@@ -22,12 +22,43 @@ import java.nio.charset.Charset;
import java.util.Arrays;
/**
- * Add file description here!
+ * ICal Format is using ical4j for parsing.
* <p/>
- * Author: Sebastian Schaffert
+ * If you encounter problems parsing iCal files, e.g. a {@link net.fortuna.ical4j.data.ParserException},
+ * try enabling the relaxed/compatibility mode:
+ * <ul>
+ * <li>use {@link net.fortuna.ical4j.util.CompatibilityHints#setHintEnabled(String, boolean)}, or
+ * <li>create a file called {@code ical4j.properties} in the root of your classpath, or
+ * <li>specify a compatibility hint as {@code system property}
+ * </ul>
+ *
+ * @author Sebastian Schaffert
+ * @see http://wiki.modularity.net.au/ical4j/index.php?title=Compatibility
*/
public class ICalFormat {
+ /**
+ * ICal Format is using ical4j for parsing.
+ * <p/>
+ * If you encounter problems parsing iCal files, e.g. a {@link net.fortuna.ical4j.data.ParserException},
+ * try enabling the relaxed/compatibility mode:
+ * <ul>
+ * <li>use {@link net.fortuna.ical4j.util.CompatibilityHints#setHintEnabled(String, boolean)}, or
+ * <li>create a file called {@code ical4j.properties} in the root of your classpath, or
+ * <li>specify a compatibility hint as {@code system property}
+ * </ul>
+ * <p/>
+ * Complete list of <strong>hints</strong> (valid settings: {@code true}/{@code false}):
+ * <ul>
+ * <li>{@code ical4j.unfolding.relaxed}
+ * <li>{@code ical4j.parsing.relaxed}
+ * <li>{@code ical4j.validation.relaxed}
+ * <li>{@code ical4j.compatibility.outlook}
+ * <li>{@code ical4j.compatibility.notes}
+ * </ul>
+ *
+ * @see http://wiki.modularity.net.au/ical4j/index.php?title=Compatibility
+ */
public static final RDFFormat FORMAT = new RDFFormat(
"ICal",
Arrays.asList("text/calendar"),
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bb46814d/commons/sesame-tools-rio-ical/src/main/java/org/apache/marmotta/commons/sesame/rio/ical/ICalParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/src/main/java/org/apache/marmotta/commons/sesame/rio/ical/ICalParser.java b/commons/sesame-tools-rio-ical/src/main/java/org/apache/marmotta/commons/sesame/rio/ical/ICalParser.java
index 16926cb..167cf35 100644
--- a/commons/sesame-tools-rio-ical/src/main/java/org/apache/marmotta/commons/sesame/rio/ical/ICalParser.java
+++ b/commons/sesame-tools-rio-ical/src/main/java/org/apache/marmotta/commons/sesame/rio/ical/ICalParser.java
@@ -54,7 +54,9 @@ import java.util.*;
* data using the iCal vocabulary (http://www.w3.org/2002/12/cal/icaltzd,
* http://www.w3.org/wiki/RdfCalendarDocumentation)
* <p/>
- * Author: Sebastian Schaffert
+ * @author Sebastian Schaffert
+ * @see http://wiki.modularity.net.au/ical4j/index.php
+ * @see http://wiki.modularity.net.au/ical4j/index.php?title=Compatibility
*/
public class ICalParser extends RDFParserBase {
private static Logger log = LoggerFactory.getLogger(ICalParser.class);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bb46814d/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java b/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
index 961665f..09a1698 100644
--- a/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
+++ b/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
@@ -20,8 +20,14 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import net.fortuna.ical4j.util.CompatibilityHints;
+
import org.apache.commons.io.IOUtils;
-import org.apache.marmotta.commons.sesame.rio.ical.ICalFormat;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -34,10 +40,6 @@ import org.openrdf.sail.memory.MemoryStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-
/**
* Add file description here!
* <p/>
@@ -61,6 +63,12 @@ public class TestICalParser {
list.add(new Object[] { "vacation" });
return list;
}
+
+ @BeforeClass
+ public static void beforeClass() {
+ // The test files contain old date format:
+ CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, true);
+ }
[5/5] git commit: Fixed two small bugs in the admin-ui (core/context
and kiwi-reasoner/config)
Posted by ja...@apache.org.
Fixed two small bugs in the admin-ui (core/context and kiwi-reasoner/config)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/883aa783
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/883aa783
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/883aa783
Branch: refs/heads/develop
Commit: 883aa78347133dcf084d63dd9bb5b8d177840f7e
Parents: 97425c6
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Dec 19 15:47:58 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Dec 19 15:47:58 2013 +0100
----------------------------------------------------------------------
.../marmotta-core/src/main/resources/web/admin/contexts.html | 2 +-
.../src/main/resources/web/admin/widget/conf_reasoner.js | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/883aa783/platform/marmotta-core/src/main/resources/web/admin/contexts.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/contexts.html b/platform/marmotta-core/src/main/resources/web/admin/contexts.html
index 7a0127f..4a94291 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/contexts.html
+++ b/platform/marmotta-core/src/main/resources/web/admin/contexts.html
@@ -64,7 +64,7 @@
$("<tr>", {"id": "context_"+id})
.append($("<td>", {"text": label}))
.append($("<td>").append($("<a>", {"text": uri, "href": uri})))
- .append($("<td>").append(size?$("<span>", {"text":size+" triple"+(size==1?"":"s")}):$("<em>", {"text":"unknown"})))
+ .append($("<td>").append(size!==undefined?$("<span>", {"text":size+" triple"+(size==1?"":"s")}):$("<em>", {"text":"unknown"})))
.append(appendDownloadLinks($("<td>"), ctx))
.append($("<td>").append($("<button>", {"text": "delete"}).click(deleteContext(uri, id, size))))
.appendTo($("table#contexts > tbody:last"));
http://git-wip-us.apache.org/repos/asf/marmotta/blob/883aa783/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/widget/conf_reasoner.js
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/widget/conf_reasoner.js b/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/widget/conf_reasoner.js
index 9d88207..a2b0587 100644
--- a/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/widget/conf_reasoner.js
+++ b/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/widget/conf_reasoner.js
@@ -38,7 +38,7 @@
var settings = {
host: 'http://localhost:8080/LMF/',
samples :{
- skos:"@prefix: skos: <http://www.w3.org/2004/02/skos/core#>\n\n($1 skos:broader $2) -> ($1 skos:broaderTransitive $2)\n($1 skos:narrower $2) -> ($1 skos:narrowerTransitive $2)\n($1 skos:broaderTransitive $2), ($2 skos:broaderTransitive $3) -> ($1 skos:broaderTransitive $3)\n($1 skos:narrowerTransitive $2), ($2 skos:narrowerTransitive $3) -> ($1 skos:narrowerTransitive $3)\n($1 skos:broader $2) -> ($2 skos:narrower $1)\n($1 skos:narrower $2) -> ($2 skos:broader $1)\n($1 skos:broader $2) -> ($1 skos:related $2)\n($1 skos:narrower $2) -> ($1 skos:related $2)\n($1 skos:related $2) -> ($2 skos:related $1)",
+ skos:"@prefix skos: <http://www.w3.org/2004/02/skos/core#>\n\n($1 skos:broader $2) -> ($1 skos:broaderTransitive $2)\n($1 skos:narrower $2) -> ($1 skos:narrowerTransitive $2)\n($1 skos:broaderTransitive $2), ($2 skos:broaderTransitive $3) -> ($1 skos:broaderTransitive $3)\n($1 skos:narrowerTransitive $2), ($2 skos:narrowerTransitive $3) -> ($1 skos:narrowerTransitive $3)\n($1 skos:broader $2) -> ($2 skos:narrower $1)\n($1 skos:narrower $2) -> ($2 skos:broader $1)\n($1 skos:broader $2) -> ($1 skos:related $2)\n($1 skos:narrower $2) -> ($1 skos:related $2)\n($1 skos:related $2) -> ($2 skos:related $1)",
rdfs:"@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n\n($1 rdfs:subClassOf $2), ($2 rdfs:subClassOf $3) -> ($1 rdfs:subClassOf $3)\n($1 rdfs:subPropertyOf $2), ($2 rdfs:subPropertyOf $3) -> ($1 rdfs:subPropertyOf $3)\n($1 rdf:type $2), ($2 rdfs:subClassOf $3) -> ($1 rdf:type $3)\n($p rdfs:range $r), ($1 $p $2) -> ($2 rdf:type $r)\n($p rdfs:domain $d), ($1 $p $2) -> ($1 rdf:type $d)"
},
loader:"../../core/public/img/ajax-loader_small.gif"
@@ -69,6 +69,10 @@
}
var do_upload = function() {
+ var editor = $(program_input)[0]._cmEditor || {};
+ if (editor && editor.save) {
+ editor.save();
+ }
var data = program_input.val();
if(data=="" || title_input.val() == "") {
alert("Values may not be empty!");
[3/5] git commit: MARMOTTA-271: Upgraded Jackson dependency
Posted by ja...@apache.org.
MARMOTTA-271: Upgraded Jackson dependency
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/a0b38a5f
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/a0b38a5f
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/a0b38a5f
Branch: refs/heads/develop
Commit: a0b38a5f834558fb61266d213bcb8dde31fd2370
Parents: 8ab6998
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Dec 19 11:49:09 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Dec 19 15:12:08 2013 +0100
----------------------------------------------------------------------
client/marmotta-client-java/pom.xml | 8 ++--
.../client/clients/ConfigurationClient.java | 21 +++++----
.../marmotta/client/clients/ImportClient.java | 19 ++++----
.../marmotta/client/clients/LDPathClient.java | 19 ++++----
.../ldclient/ldclient-provider-facebook/pom.xml | 9 ++--
.../facebook/FacebookGraphProvider.java | 49 ++++++++++++--------
parent/pom.xml | 32 +++++++------
platform/marmotta-core/pom.xml | 18 +++----
.../platform/core/api/task/TaskInfo.java | 4 +-
.../platform/core/util/WebServiceUtil.java | 10 ++--
.../config/ConfigurationWebService.java | 30 ++++++------
.../webservices/logging/LoggingWebService.java | 45 +++++++++---------
.../config/ConfigurationWebServiceTest.java | 5 +-
.../platform/core/test/ld/LinkedDataTest.java | 26 ++++++-----
14 files changed, 162 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index 5172827..4a35c78 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -93,12 +93,12 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.openrdf.sesame</groupId>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ConfigurationClient.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ConfigurationClient.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ConfigurationClient.java
index 6811191..5ee7e32 100644
--- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ConfigurationClient.java
+++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ConfigurationClient.java
@@ -17,6 +17,15 @@
*/
package org.apache.marmotta.client.clients;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpDelete;
@@ -29,19 +38,11 @@ import org.apache.marmotta.client.exception.MarmottaClientException;
import org.apache.marmotta.client.exception.NotFoundException;
import org.apache.marmotta.client.model.config.Configuration;
import org.apache.marmotta.client.util.HTTPUtil;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
/**
* A client that supports accessing the configuration webservice of the Apache Marmotta. May be used for
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ImportClient.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ImportClient.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ImportClient.java
index b5314a0..0d5a62d 100644
--- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ImportClient.java
+++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ImportClient.java
@@ -17,7 +17,13 @@
*/
package org.apache.marmotta.client.clients;
-import com.google.common.io.ByteStreams;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
@@ -30,17 +36,12 @@ import org.apache.http.util.EntityUtils;
import org.apache.marmotta.client.ClientConfiguration;
import org.apache.marmotta.client.exception.MarmottaClientException;
import org.apache.marmotta.client.util.HTTPUtil;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashSet;
-import java.util.Set;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.io.ByteStreams;
/**
* This client class provides support for importing ontologies in various formats into the Apache Marmotta.
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/LDPathClient.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/LDPathClient.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/LDPathClient.java
index a679860..e6475f7 100644
--- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/LDPathClient.java
+++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/LDPathClient.java
@@ -17,6 +17,13 @@
*/
package org.apache.marmotta.client.clients;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
@@ -27,18 +34,12 @@ import org.apache.marmotta.client.exception.NotFoundException;
import org.apache.marmotta.client.model.rdf.RDFNode;
import org.apache.marmotta.client.util.HTTPUtil;
import org.apache.marmotta.client.util.RDFJSONParser;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
/**
* Add file description here!
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index 00bf00e..2dcbb85 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -52,15 +52,14 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/libraries/ldclient/ldclient-provider-facebook/src/main/java/org/apache/marmotta/ldclient/provider/facebook/FacebookGraphProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/src/main/java/org/apache/marmotta/ldclient/provider/facebook/FacebookGraphProvider.java b/libraries/ldclient/ldclient-provider-facebook/src/main/java/org/apache/marmotta/ldclient/provider/facebook/FacebookGraphProvider.java
index e9d606a..9da22a7 100644
--- a/libraries/ldclient/ldclient-provider-facebook/src/main/java/org/apache/marmotta/ldclient/provider/facebook/FacebookGraphProvider.java
+++ b/libraries/ldclient/ldclient-provider-facebook/src/main/java/org/apache/marmotta/ldclient/provider/facebook/FacebookGraphProvider.java
@@ -17,13 +17,23 @@
package org.apache.marmotta.ldclient.provider.facebook;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.cookie.DateParseException;
-import org.apache.http.impl.cookie.DateUtils;
+import org.apache.http.client.utils.DateUtils;
import org.apache.http.util.EntityUtils;
import org.apache.marmotta.commons.http.UriUtil;
import org.apache.marmotta.commons.vocabulary.DCTERMS;
@@ -34,10 +44,6 @@ import org.apache.marmotta.ldclient.api.ldclient.LDClientService;
import org.apache.marmotta.ldclient.api.provider.DataProvider;
import org.apache.marmotta.ldclient.exception.DataRetrievalException;
import org.apache.marmotta.ldclient.model.ClientResponse;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
import org.openrdf.model.URI;
import org.openrdf.model.ValueFactory;
import org.openrdf.model.vocabulary.RDF;
@@ -50,11 +56,10 @@ import org.openrdf.sail.memory.MemoryStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
/**
* A provider that accesses objects exposed by the Facebook Graph API (in JSON format). The provider will map the
@@ -248,8 +253,8 @@ public class FacebookGraphProvider implements DataProvider {
con.add(subject,FOAF.nick, vf.createLiteral(data.get("username").toString()));
}
- if(data.get("cover") != null && data.get("cover") instanceof Map && ((Map)data.get("cover")).get("source") != null) {
- con.add(subject,FOAF.thumbnail, vf.createURI(((Map) data.get("cover")).get("source").toString()));
+ if(data.get("cover") != null && data.get("cover") instanceof Map && ((Map<?,?>)data.get("cover")).get("source") != null) {
+ con.add(subject,FOAF.thumbnail, vf.createURI(((Map<?,?>) data.get("cover")).get("source").toString()));
}
@@ -278,7 +283,7 @@ public class FacebookGraphProvider implements DataProvider {
throw new DataRetrievalException("error while accessing Facebook Graph API",e);
}
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
/**
@@ -421,7 +426,7 @@ public class FacebookGraphProvider implements DataProvider {
}
- private class ResponseHandler implements org.apache.http.client.ResponseHandler<List<String>> {
+ protected class ResponseHandler implements org.apache.http.client.ResponseHandler<List<String>> {
private Date expiresDate;
@@ -468,11 +473,7 @@ public class FacebookGraphProvider implements DataProvider {
if (expiresDate == null) {
Header expires = response.getFirstHeader("Expires");
if (expires != null) {
- try {
- expiresDate = DateUtils.parseDate(expires.getValue());
- } catch (DateParseException e) {
- log.debug("error parsing Expires: header");
- }
+ expiresDate = DateUtils.parseDate(expires.getValue());
}
}
@@ -507,6 +508,14 @@ public class FacebookGraphProvider implements DataProvider {
return requestUrls;
}
+ public Endpoint getEndpoint() {
+ return endpoint;
+ }
+
+ public int getHttpStatus() {
+ return httpStatus;
+ }
+
}
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ce72ed6..1e74d63 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -51,6 +51,7 @@
<mysql.version>5.1.21</mysql.version>
<jetty.version>9.0.3.v20130506</jetty.version>
<resteasy.version>3.0.6.Final</resteasy.version>
+ <jackson.version>2.2.3</jackson.version>
</properties>
<prerequisites>
@@ -787,28 +788,33 @@
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson-provider</artifactId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.9.13</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.13</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.9.13</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>1.9.13</version>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index 2f0ae17..648e59d 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -290,23 +290,23 @@
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jackson-provider</artifactId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
<!-- Front-end -->
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java
index 1803d1f..4da205a 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java
@@ -17,13 +17,13 @@
*/
package org.apache.marmotta.platform.core.api.task;
-import org.codehaus.jackson.annotate.JsonIgnore;
-
import java.util.Collections;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
public abstract class TaskInfo {
protected final long started;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/WebServiceUtil.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/WebServiceUtil.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/WebServiceUtil.java
index 490bef4..ce715b3 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/WebServiceUtil.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/WebServiceUtil.java
@@ -17,15 +17,17 @@
*/
package org.apache.marmotta.platform.core.util;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.codehaus.jackson.map.ObjectMapper;
-
-import javax.ws.rs.Path;
import java.io.IOException;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
+import javax.ws.rs.Path;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
/**
* Utility methods for web services
* <p/>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
index 1da3836..54cafcd 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
@@ -17,13 +17,13 @@
*/
package org.apache.marmotta.platform.core.webservices.config;
-import org.apache.commons.configuration.ConversionException;
-import org.apache.marmotta.platform.core.api.config.ConfigurationService;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
-import org.slf4j.Logger;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
@@ -38,13 +38,15 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import org.apache.commons.configuration.ConversionException;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.slf4j.Logger;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
/**
* Manage the system configuration of the Apache Marmotta Server. Provides methods for displaying and updating the configuration
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/logging/LoggingWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/logging/LoggingWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/logging/LoggingWebService.java
index 56ee852..b5afd70 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/logging/LoggingWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/logging/LoggingWebService.java
@@ -1,21 +1,10 @@
package org.apache.marmotta.platform.core.webservices.logging;
-import ch.qos.logback.classic.Level;
-import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.marmotta.platform.core.api.config.ConfigurationService;
-import org.apache.marmotta.platform.core.api.logging.LoggingModule;
-import org.apache.marmotta.platform.core.api.logging.LoggingService;
-import org.apache.marmotta.platform.core.model.logging.ConsoleOutput;
-import org.apache.marmotta.platform.core.model.logging.LogFileOutput;
-import org.apache.marmotta.platform.core.model.logging.LoggingOutput;
-import org.apache.marmotta.platform.core.model.logging.SyslogOutput;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
@@ -28,11 +17,25 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.logging.LoggingModule;
+import org.apache.marmotta.platform.core.api.logging.LoggingService;
+import org.apache.marmotta.platform.core.model.logging.ConsoleOutput;
+import org.apache.marmotta.platform.core.model.logging.LogFileOutput;
+import org.apache.marmotta.platform.core.model.logging.LoggingOutput;
+import org.apache.marmotta.platform.core.model.logging.SyslogOutput;
+
+import ch.qos.logback.classic.Level;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
/**
* Listing and modifying logging configuration for appenders and logging modules. JSON format for each appender is:
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/config/ConfigurationWebServiceTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/config/ConfigurationWebServiceTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/config/ConfigurationWebServiceTest.java
index 9a29337..08fa8ce 100644
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/config/ConfigurationWebServiceTest.java
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/config/ConfigurationWebServiceTest.java
@@ -19,19 +19,20 @@ package org.apache.marmotta.platform.core.test.config;
import static com.jayway.restassured.RestAssured.expect;
import static com.jayway.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasItems;
import java.io.IOException;
import org.apache.marmotta.platform.core.api.config.ConfigurationService;
import org.apache.marmotta.platform.core.test.base.JettyMarmotta;
import org.apache.marmotta.platform.core.webservices.config.ConfigurationWebService;
-import org.codehaus.jackson.map.ObjectMapper;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.jayway.restassured.RestAssured;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
index b48d747..1aa384f 100644
--- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
+++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java
@@ -17,7 +17,14 @@
package org.apache.marmotta.platform.core.test.ld;
-import com.jayway.restassured.RestAssured;
+import static com.jayway.restassured.RestAssured.expect;
+import static com.jayway.restassured.RestAssured.given;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Random;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.marmotta.platform.core.api.triplestore.ContextService;
@@ -26,8 +33,11 @@ import org.apache.marmotta.platform.core.test.base.JettyMarmotta;
import org.apache.marmotta.platform.core.webservices.resource.ContentWebService;
import org.apache.marmotta.platform.core.webservices.resource.MetaWebService;
import org.apache.marmotta.platform.core.webservices.resource.ResourceWebService;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.junit.*;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
import org.openrdf.model.Statement;
import org.openrdf.model.URI;
import org.openrdf.repository.Repository;
@@ -40,14 +50,8 @@ import org.openrdf.rio.RDFParseException;
import org.openrdf.rio.Rio;
import org.openrdf.sail.memory.MemoryStore;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Random;
-
-import static com.jayway.restassured.RestAssured.expect;
-import static com.jayway.restassured.RestAssured.form;
-import static com.jayway.restassured.RestAssured.given;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jayway.restassured.RestAssured;
/**
* This test verifies the functionality of the Linked Data endpoint