You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/02/21 16:30:45 UTC
[15/55] git commit: MARMOTTA-106: renamed packages in marmotta-commons
MARMOTTA-106: renamed packages in marmotta-commons
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/6102b3f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/6102b3f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/6102b3f6
Branch: refs/heads/master
Commit: 6102b3f6a1bffcf73b37add1e1aea5fe4f9eebe0
Parents: 3cd9890
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Feb 21 15:16:52 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Feb 21 15:16:52 2013 +0100
----------------------------------------------------------------------
.../sesame/facading/impl/FacadingImpl.java | 23 ++++++++-------
.../facading/impl/FacadingInvocationHandler.java | 3 +-
.../sesame/facading/util/FacadeUtils.java | 4 +-
.../test/java/facading/foaf/FacadingFoafTest.java | 3 +-
.../java/facading/foaf/model/OnlineAccount.java | 3 +-
.../src/test/java/facading/foaf/model/Person.java | 3 +-
.../java/facading/locale/model/LocaleFacade.java | 3 +-
.../kiwi/reasoner/engine/ReasoningEngine.java | 3 --
.../kiwi/sparql/sqlmapper/SparqlToSQLMapper.java | 4 +-
.../apache/marmotta/kiwi/test/TransactionTest.java | 2 +-
.../marmotta/kiwi/model/rdf/KiWiDateLiteral.java | 2 +-
.../marmotta/kiwi/model/rdf/KiWiLiteral.java | 2 +-
.../marmotta/kiwi/model/rdf/KiWiUriResource.java | 3 +-
.../marmotta/kiwi/persistence/KiWiConnection.java | 6 ++--
.../kiwi/persistence/util/ResultSetIteration.java | 5 ---
.../marmotta/kiwi/sail/KiWiValueFactory.java | 6 ++--
.../apache/marmotta/kiwi/test/PersistenceTest.java | 7 ++--
.../apache/marmotta/kiwi/test/RepositoryTest.java | 3 +-
.../versioning/sail/KiWiSnapshotConnection.java | 1 -
.../ldclient/services/ldclient/LDClient.java | 3 --
.../provider/html/AbstractHTMLDataProvider.java | 2 +-
.../html/mapping/CssDateLiteralMapper.java | 4 +-
.../html/mapping/CssLiteralAttrMapper.java | 2 +-
.../html/mapping/CssTextLiteralMapper.java | 2 +-
.../ldap/mapping/TypedLiteralPredicateFactory.java | 2 +-
.../provider/mediawiki/MediawikiProvider.java | 2 +-
.../provider/phpbb/PHPBBForumProvider.java | 2 +-
.../ldclient/provider/phpbb/PHPBBPostProvider.java | 2 +-
.../provider/phpbb/PHPBBTopicProvider.java | 2 +-
.../provider/phpbb/mapping/PHPBBDateMapper.java | 4 +-
.../provider/vimeo/VimeoVideoProvider.java | 2 +-
.../provider/vimeo/mapping/VimeoDateMapper.java | 4 +-
.../provider/xml/AbstractXMLDataProvider.java | 2 +-
.../provider/xml/mapping/CommaSeparatedMapper.java | 2 +-
.../provider/xml/mapping/XPathLiteralMapper.java | 2 +-
.../provider/youtube/YoutubeChannelProvider.java | 2 +-
.../provider/youtube/YoutubePlaylistProvider.java | 2 +-
.../provider/youtube/YoutubeVideoProvider.java | 2 +-
.../model/functions/date/DateFunctionsTest.java | 2 +-
.../kiwi/core/model/content/MediaContentItem.java | 2 +-
.../core/model/module/ModuleConfiguration.java | 2 +-
.../main/java/kiwi/core/model/user/KiWiUser.java | 2 +-
.../java/kiwi/core/model/user/OnlineAccount.java | 2 +-
.../services/content/FileSystemContentReader.java | 4 +-
.../services/content/FileSystemContentWriter.java | 4 +-
.../core/services/content/HTTPContentReader.java | 4 +-
.../core/services/prefix/PrefixServiceImpl.java | 2 -
.../core/services/task/TaskManagerServiceImpl.java | 3 +-
.../services/triplestore/ContextServiceImpl.java | 4 +-
.../core/services/triplestore/LdpServiceImpl.java | 6 +--
.../services/triplestore/SesameServiceImpl.java | 3 --
.../kiwi/core/services/user/UserServiceImpl.java | 9 ++---
.../kiwi/core/webservices/io/ExportWebService.java | 6 ++--
.../webservices/resource/ContentWebService.java | 3 +-
.../webservices/resource/InspectionWebService.java | 13 ++++----
.../core/webservices/resource/MetaWebService.java | 3 +-
.../webservices/resource/ResourceWebService.java | 4 +-
.../webservices/LinkedDataCachingWebService.java | 6 +---
.../ldpath/webservices/LDPathUtilWebService.java | 12 ++++----
.../lmf/ldpath/webservices/LDPathWebService.java | 9 +++--
.../lmf/user/filters/LMFAuthenticationFilter.java | 2 +-
.../at/newmedialab/lmf/user/model/UserAccount.java | 4 +-
.../lmf/user/services/AccountServiceImpl.java | 2 +-
.../user/webservices/UserManagementWebService.java | 4 +-
.../lmf/user/webservices/UserWebService.java | 4 +-
.../lmf/versioning/api/MementoService.java | 2 -
.../versioning/webservices/MementoWebService.java | 4 +-
.../webservices/VersioningWebService.java | 7 ++--
68 files changed, 125 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/impl/FacadingImpl.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/impl/FacadingImpl.java b/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/impl/FacadingImpl.java
index f7b6d78..d6af321 100644
--- a/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/impl/FacadingImpl.java
+++ b/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/impl/FacadingImpl.java
@@ -15,14 +15,11 @@
*/
package at.newmedialab.sesame.facading.impl;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.facading.annotations.RDF;
-import at.newmedialab.sesame.facading.annotations.RDFContext;
-import at.newmedialab.sesame.facading.annotations.RDFFilter;
-import at.newmedialab.sesame.facading.annotations.RDFType;
-import at.newmedialab.sesame.facading.api.Facading;
-import at.newmedialab.sesame.facading.model.Facade;
-import at.newmedialab.sesame.facading.util.FacadeUtils;
+import java.lang.reflect.Proxy;
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
import org.openrdf.repository.RepositoryConnection;
@@ -30,9 +27,13 @@ import org.openrdf.repository.RepositoryException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.lang.reflect.Proxy;
-import java.util.Collection;
-import java.util.LinkedList;
+import at.newmedialab.sesame.facading.annotations.RDF;
+import at.newmedialab.sesame.facading.annotations.RDFContext;
+import at.newmedialab.sesame.facading.annotations.RDFFilter;
+import at.newmedialab.sesame.facading.annotations.RDFType;
+import at.newmedialab.sesame.facading.api.Facading;
+import at.newmedialab.sesame.facading.model.Facade;
+import at.newmedialab.sesame.facading.util.FacadeUtils;
/**
* Offers methods for loading and proxying Facades. A {@link Facade} is an interface that defines a
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/impl/FacadingInvocationHandler.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/impl/FacadingInvocationHandler.java b/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/impl/FacadingInvocationHandler.java
index 270420f..6e6fa15 100644
--- a/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/impl/FacadingInvocationHandler.java
+++ b/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/impl/FacadingInvocationHandler.java
@@ -15,7 +15,6 @@
*/
package at.newmedialab.sesame.facading.impl;
-import at.newmedialab.sesame.commons.util.DateUtils;
import at.newmedialab.sesame.facading.annotations.RDF;
import at.newmedialab.sesame.facading.annotations.RDFInverse;
import at.newmedialab.sesame.facading.annotations.RDFPropertyBuilder;
@@ -23,6 +22,8 @@ import at.newmedialab.sesame.facading.api.Facading;
import at.newmedialab.sesame.facading.api.FacadingPredicateBuilder;
import at.newmedialab.sesame.facading.model.Facade;
import at.newmedialab.sesame.facading.util.FacadeUtils;
+
+import org.apache.marmotta.commons.util.DateUtils;
import org.openrdf.model.Literal;
import org.openrdf.model.Resource;
import org.openrdf.model.Statement;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/util/FacadeUtils.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/util/FacadeUtils.java b/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/util/FacadeUtils.java
index ab58dae..f53d2a0 100644
--- a/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/util/FacadeUtils.java
+++ b/commons/sesame-tools-facading/src/main/java/at/newmedialab/sesame/facading/util/FacadeUtils.java
@@ -15,14 +15,14 @@
*/
package at.newmedialab.sesame.facading.util;
-import at.newmedialab.sesame.commons.util.DateUtils;
import at.newmedialab.sesame.facading.model.Facade;
+
+import org.apache.marmotta.commons.util.DateUtils;
import org.openrdf.model.Resource;
import org.openrdf.model.Value;
import java.lang.annotation.Annotation;
import java.text.ParseException;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/commons/sesame-tools-facading/src/test/java/facading/foaf/FacadingFoafTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/facading/foaf/FacadingFoafTest.java b/commons/sesame-tools-facading/src/test/java/facading/foaf/FacadingFoafTest.java
index 860c036..fce337b 100644
--- a/commons/sesame-tools-facading/src/test/java/facading/foaf/FacadingFoafTest.java
+++ b/commons/sesame-tools-facading/src/test/java/facading/foaf/FacadingFoafTest.java
@@ -8,12 +8,13 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.Matchers.hasProperty;
import static org.junit.Assume.assumeThat;
-import at.newmedialab.sesame.commons.model.Namespaces;
import at.newmedialab.sesame.facading.FacadingFactory;
import at.newmedialab.sesame.facading.api.Facading;
import facading.AbstractFacadingTest;
import facading.foaf.model.OnlineAccount;
import facading.foaf.model.Person;
+
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Assume;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/commons/sesame-tools-facading/src/test/java/facading/foaf/model/OnlineAccount.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/facading/foaf/model/OnlineAccount.java b/commons/sesame-tools-facading/src/test/java/facading/foaf/model/OnlineAccount.java
index 07d59b2..872b5ac 100644
--- a/commons/sesame-tools-facading/src/test/java/facading/foaf/model/OnlineAccount.java
+++ b/commons/sesame-tools-facading/src/test/java/facading/foaf/model/OnlineAccount.java
@@ -16,7 +16,6 @@
package facading.foaf.model;
-import at.newmedialab.sesame.commons.model.Namespaces;
import at.newmedialab.sesame.facading.annotations.RDF;
import at.newmedialab.sesame.facading.annotations.RDFInverse;
import at.newmedialab.sesame.facading.annotations.RDFType;
@@ -26,6 +25,8 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+
/**
* @author Stephanie Stroka
* User: Stephanie Stroka
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/commons/sesame-tools-facading/src/test/java/facading/foaf/model/Person.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/facading/foaf/model/Person.java b/commons/sesame-tools-facading/src/test/java/facading/foaf/model/Person.java
index ac25656..6ce75bf 100644
--- a/commons/sesame-tools-facading/src/test/java/facading/foaf/model/Person.java
+++ b/commons/sesame-tools-facading/src/test/java/facading/foaf/model/Person.java
@@ -1,11 +1,12 @@
package facading.foaf.model;
-import at.newmedialab.sesame.commons.model.Namespaces;
import at.newmedialab.sesame.facading.annotations.RDF;
import at.newmedialab.sesame.facading.annotations.RDFFilter;
import at.newmedialab.sesame.facading.annotations.RDFType;
import at.newmedialab.sesame.facading.model.Facade;
+
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.openrdf.model.URI;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/commons/sesame-tools-facading/src/test/java/facading/locale/model/LocaleFacade.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/facading/locale/model/LocaleFacade.java b/commons/sesame-tools-facading/src/test/java/facading/locale/model/LocaleFacade.java
index 9f5f77f..616d56a 100644
--- a/commons/sesame-tools-facading/src/test/java/facading/locale/model/LocaleFacade.java
+++ b/commons/sesame-tools-facading/src/test/java/facading/locale/model/LocaleFacade.java
@@ -1,11 +1,12 @@
package facading.locale.model;
-import at.newmedialab.sesame.commons.model.Namespaces;
import at.newmedialab.sesame.facading.annotations.RDF;
import at.newmedialab.sesame.facading.model.Facade;
import java.util.Locale;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+
public interface LocaleFacade extends Facade {
@RDF(Namespaces.NS_RDFS + "label")
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
index 514552b..193ffbc 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/engine/ReasoningEngine.java
@@ -57,10 +57,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sqlmapper/SparqlToSQLMapper.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sqlmapper/SparqlToSQLMapper.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sqlmapper/SparqlToSQLMapper.java
index 6fd9d09..5a4cf5c 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sqlmapper/SparqlToSQLMapper.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sqlmapper/SparqlToSQLMapper.java
@@ -19,8 +19,8 @@ import at.newmedialab.lmf.sparql.model.Tables;
import at.newmedialab.lmf.sparql.model.tables.TNodes;
import at.newmedialab.lmf.sparql.model.tables.TTriples;
import at.newmedialab.lmf.sparql.model.tables.records.RNodes;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.commons.util.DateUtils;
import at.newmedialab.sesame.commons.util.HashUtils;
import com.google.common.collect.Sets;
import kiwi.core.api.config.ConfigurationService;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java b/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java
index a6ba20f..9e6d986 100644
--- a/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java
+++ b/libraries/kiwi/kiwi-transactions/src/test/java/org/apache/marmotta/kiwi/test/TransactionTest.java
@@ -16,7 +16,7 @@
package org.apache.marmotta.kiwi.test;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDateLiteral.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDateLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDateLiteral.java
index 876c8b4..c3ef11e 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDateLiteral.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiDateLiteral.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.kiwi.model.rdf;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.util.DateUtils;
import org.openrdf.model.Literal;
import javax.xml.datatype.DatatypeConfigurationException;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
index c22cb95..52c0e42 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.kiwi.model.rdf;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import com.google.common.hash.HashCode;
import com.google.common.hash.HashFunction;
import com.google.common.hash.Hasher;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiUriResource.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiUriResource.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiUriResource.java
index 5b4dce5..62f672c 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiUriResource.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiUriResource.java
@@ -15,10 +15,11 @@
*/
package org.apache.marmotta.kiwi.model.rdf;
-import at.newmedialab.sesame.commons.model.URICommons;
import com.google.common.hash.HashCode;
import com.google.common.hash.HashFunction;
import com.google.common.hash.Hashing;
+
+import org.apache.marmotta.commons.sesame.model.URICommons;
import org.openrdf.model.URI;
/**
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
index faa578c..09fa40f 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java
@@ -15,9 +15,9 @@
*/
package org.apache.marmotta.kiwi.persistence;
-import at.newmedialab.sesame.commons.model.LiteralCommons;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.sesame.model.LiteralCommons;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.commons.util.DateUtils;
import com.google.common.base.Preconditions;
import info.aduna.iteration.CloseableIteration;
import info.aduna.iteration.EmptyIteration;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ResultSetIteration.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ResultSetIteration.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ResultSetIteration.java
index 353eb8f..6e0b53d 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ResultSetIteration.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/util/ResultSetIteration.java
@@ -19,12 +19,7 @@ import info.aduna.iteration.CloseableIteration;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
import java.util.NoSuchElementException;
-import java.util.Set;
/**
* A wrapper class for creating ClosableIterations from a SQL JDBC ResultSet. Takes a
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
index 85967e4..f9dda5c 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java
@@ -15,9 +15,9 @@
*/
package org.apache.marmotta.kiwi.sail;
-import at.newmedialab.sesame.commons.model.LiteralCommons;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.sesame.model.LiteralCommons;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.commons.util.DateUtils;
import org.apache.commons.lang.LocaleUtils;
import org.apache.marmotta.kiwi.model.caching.IntArray;
import org.apache.marmotta.kiwi.model.collection.WeakValueMap;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/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 11f6fc5..88e257f 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
@@ -16,8 +16,10 @@
package org.apache.marmotta.kiwi.test;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import static org.apache.marmotta.commons.sesame.model.LiteralCommons.getRDFLangStringType;
+
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.commons.util.DateUtils;
import info.aduna.iteration.Iterations;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.marmotta.kiwi.model.rdf.*;
@@ -45,7 +47,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Random;
-import static at.newmedialab.sesame.commons.model.LiteralCommons.getRDFLangStringType;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasItems;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/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 c948f43..e6bb179 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
@@ -16,7 +16,7 @@
package org.apache.marmotta.kiwi.test;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -59,7 +59,6 @@ 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;
/**
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiSnapshotConnection.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiSnapshotConnection.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiSnapshotConnection.java
index dbf6c12..8ef2436 100644
--- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiSnapshotConnection.java
+++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/sail/KiWiSnapshotConnection.java
@@ -42,7 +42,6 @@ import org.openrdf.query.QueryInterruptedException;
import org.openrdf.query.algebra.QueryRoot;
import org.openrdf.query.algebra.StatementPattern;
import org.openrdf.query.algebra.TupleExpr;
-import org.openrdf.query.algebra.UpdateExpr;
import org.openrdf.query.algebra.Var;
import org.openrdf.query.algebra.evaluation.EvaluationStrategy;
import org.openrdf.query.algebra.evaluation.TripleSource;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-core/src/main/java/org/apache/marmotta/ldclient/services/ldclient/LDClient.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/src/main/java/org/apache/marmotta/ldclient/services/ldclient/LDClient.java b/libraries/ldclient/ldclient-core/src/main/java/org/apache/marmotta/ldclient/services/ldclient/LDClient.java
index 64d7426..426b62f 100644
--- a/libraries/ldclient/ldclient-core/src/main/java/org/apache/marmotta/ldclient/services/ldclient/LDClient.java
+++ b/libraries/ldclient/ldclient-core/src/main/java/org/apache/marmotta/ldclient/services/ldclient/LDClient.java
@@ -21,7 +21,6 @@ import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.ProtocolException;
-import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.HttpRequestRetryHandler;
import org.apache.http.client.methods.HttpGet;
@@ -58,8 +57,6 @@ import java.util.Set;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import javax.net.ssl.SSLEngineResult.Status;
-
/**
* Add file description here!
* <p/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/AbstractHTMLDataProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/AbstractHTMLDataProvider.java b/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/AbstractHTMLDataProvider.java
index 0d63dc2..bf9d9b3 100644
--- a/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/AbstractHTMLDataProvider.java
+++ b/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/AbstractHTMLDataProvider.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.html;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.apache.marmotta.ldclient.api.provider.DataProvider;
import org.apache.marmotta.ldclient.exception.DataRetrievalException;
import org.apache.marmotta.ldclient.provider.html.mapping.JSoupMapper;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssDateLiteralMapper.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssDateLiteralMapper.java b/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssDateLiteralMapper.java
index 6d8b129..3ec8201 100644
--- a/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssDateLiteralMapper.java
+++ b/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssDateLiteralMapper.java
@@ -15,8 +15,8 @@
*/
package org.apache.marmotta.ldclient.provider.html.mapping;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.commons.util.DateUtils;
import org.jsoup.nodes.Element;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssLiteralAttrMapper.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssLiteralAttrMapper.java b/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssLiteralAttrMapper.java
index 06f9987..80a89ab 100644
--- a/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssLiteralAttrMapper.java
+++ b/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssLiteralAttrMapper.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.html.mapping;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.apache.commons.lang.StringUtils;
import org.jsoup.nodes.Element;
import org.openrdf.model.Value;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssTextLiteralMapper.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssTextLiteralMapper.java b/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssTextLiteralMapper.java
index fa52074..f6f5562 100644
--- a/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssTextLiteralMapper.java
+++ b/libraries/ldclient/ldclient-provider-html/src/main/java/org/apache/marmotta/ldclient/provider/html/mapping/CssTextLiteralMapper.java
@@ -15,8 +15,8 @@
*/
package org.apache.marmotta.ldclient.provider.html.mapping;
-import at.newmedialab.sesame.commons.model.Namespaces;
import org.apache.commons.lang.StringUtils;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.jsoup.nodes.Element;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-ldap/src/main/java/org/apache/marmotta/ldclient/provider/ldap/mapping/TypedLiteralPredicateFactory.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/src/main/java/org/apache/marmotta/ldclient/provider/ldap/mapping/TypedLiteralPredicateFactory.java b/libraries/ldclient/ldclient-provider-ldap/src/main/java/org/apache/marmotta/ldclient/provider/ldap/mapping/TypedLiteralPredicateFactory.java
index a806142..f6b83eb 100644
--- a/libraries/ldclient/ldclient-provider-ldap/src/main/java/org/apache/marmotta/ldclient/provider/ldap/mapping/TypedLiteralPredicateFactory.java
+++ b/libraries/ldclient/ldclient-provider-ldap/src/main/java/org/apache/marmotta/ldclient/provider/ldap/mapping/TypedLiteralPredicateFactory.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.ldap.mapping;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.openrdf.model.URI;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/provider/mediawiki/MediawikiProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/provider/mediawiki/MediawikiProvider.java b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/provider/mediawiki/MediawikiProvider.java
index 0d96819..9348110 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/provider/mediawiki/MediawikiProvider.java
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/provider/mediawiki/MediawikiProvider.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.mediawiki;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.apache.marmotta.ldclient.api.endpoint.Endpoint;
import org.apache.marmotta.ldclient.exception.DataRetrievalException;
import org.apache.marmotta.ldclient.services.provider.AbstractHttpProvider;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBForumProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBForumProvider.java b/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBForumProvider.java
index d231b41..cac5699 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBForumProvider.java
+++ b/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBForumProvider.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.phpbb;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import com.google.common.collect.ImmutableList;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBPostProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBPostProvider.java b/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBPostProvider.java
index c85a69a..6c90d5f 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBPostProvider.java
+++ b/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBPostProvider.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.phpbb;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import com.google.common.collect.ImmutableList;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBTopicProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBTopicProvider.java b/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBTopicProvider.java
index b57ebd1..219d4f0 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBTopicProvider.java
+++ b/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/PHPBBTopicProvider.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.phpbb;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import com.google.common.collect.ImmutableList;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/mapping/PHPBBDateMapper.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/mapping/PHPBBDateMapper.java b/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/mapping/PHPBBDateMapper.java
index cf6950f..dad4740 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/mapping/PHPBBDateMapper.java
+++ b/libraries/ldclient/ldclient-provider-phpbb/src/main/java/org/apache/marmotta/ldclient/provider/phpbb/mapping/PHPBBDateMapper.java
@@ -15,8 +15,8 @@
*/
package org.apache.marmotta.ldclient.provider.phpbb.mapping;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.commons.util.DateUtils;
import org.apache.marmotta.ldclient.provider.html.mapping.CssTextLiteralMapper;
import org.jsoup.nodes.Element;
import org.openrdf.model.Value;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-vimeo/src/main/java/org/apache/marmotta/ldclient/provider/vimeo/VimeoVideoProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/src/main/java/org/apache/marmotta/ldclient/provider/vimeo/VimeoVideoProvider.java b/libraries/ldclient/ldclient-provider-vimeo/src/main/java/org/apache/marmotta/ldclient/provider/vimeo/VimeoVideoProvider.java
index 847b9cb..53b5171 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/src/main/java/org/apache/marmotta/ldclient/provider/vimeo/VimeoVideoProvider.java
+++ b/libraries/ldclient/ldclient-provider-vimeo/src/main/java/org/apache/marmotta/ldclient/provider/vimeo/VimeoVideoProvider.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.vimeo;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import com.google.common.collect.ImmutableList;
import org.apache.marmotta.ldclient.api.endpoint.Endpoint;
import org.apache.marmotta.ldclient.api.provider.DataProvider;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-vimeo/src/main/java/org/apache/marmotta/ldclient/provider/vimeo/mapping/VimeoDateMapper.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/src/main/java/org/apache/marmotta/ldclient/provider/vimeo/mapping/VimeoDateMapper.java b/libraries/ldclient/ldclient-provider-vimeo/src/main/java/org/apache/marmotta/ldclient/provider/vimeo/mapping/VimeoDateMapper.java
index 09c16af..229a66b 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/src/main/java/org/apache/marmotta/ldclient/provider/vimeo/mapping/VimeoDateMapper.java
+++ b/libraries/ldclient/ldclient-provider-vimeo/src/main/java/org/apache/marmotta/ldclient/provider/vimeo/mapping/VimeoDateMapper.java
@@ -15,8 +15,8 @@
*/
package org.apache.marmotta.ldclient.provider.vimeo.mapping;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.commons.util.DateUtils;
import org.apache.marmotta.ldclient.provider.xml.mapping.XPathValueMapper;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/AbstractXMLDataProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/AbstractXMLDataProvider.java b/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/AbstractXMLDataProvider.java
index fd6cfce..bfa771f 100644
--- a/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/AbstractXMLDataProvider.java
+++ b/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/AbstractXMLDataProvider.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.xml;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.apache.marmotta.ldclient.exception.DataRetrievalException;
import org.apache.marmotta.ldclient.provider.xml.mapping.XPathValueMapper;
import org.apache.marmotta.ldclient.services.provider.AbstractHttpProvider;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/mapping/CommaSeparatedMapper.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/mapping/CommaSeparatedMapper.java b/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/mapping/CommaSeparatedMapper.java
index eb66110..f34f74f 100644
--- a/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/mapping/CommaSeparatedMapper.java
+++ b/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/mapping/CommaSeparatedMapper.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.xml.mapping;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/mapping/XPathLiteralMapper.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/mapping/XPathLiteralMapper.java b/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/mapping/XPathLiteralMapper.java
index 3cd5d07..f9be4a4 100644
--- a/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/mapping/XPathLiteralMapper.java
+++ b/libraries/ldclient/ldclient-provider-xml/src/main/java/org/apache/marmotta/ldclient/provider/xml/mapping/XPathLiteralMapper.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.xml.mapping;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.openrdf.model.Value;
import org.openrdf.model.ValueFactory;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubeChannelProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubeChannelProvider.java b/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubeChannelProvider.java
index 584358e..a6cdb50 100644
--- a/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubeChannelProvider.java
+++ b/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubeChannelProvider.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.youtube;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import com.google.common.collect.ImmutableList;
import org.apache.marmotta.ldclient.api.endpoint.Endpoint;
import org.apache.marmotta.ldclient.api.provider.DataProvider;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubePlaylistProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubePlaylistProvider.java b/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubePlaylistProvider.java
index cca6442..2db17c0 100644
--- a/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubePlaylistProvider.java
+++ b/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubePlaylistProvider.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.youtube;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import com.google.common.collect.ImmutableList;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubeVideoProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubeVideoProvider.java b/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubeVideoProvider.java
index 657af44..bbe86d8 100644
--- a/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubeVideoProvider.java
+++ b/libraries/ldclient/ldclient-provider-youtube/src/main/java/org/apache/marmotta/ldclient/provider/youtube/YoutubeVideoProvider.java
@@ -15,7 +15,7 @@
*/
package org.apache.marmotta.ldclient.provider.youtube;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import com.google.common.collect.ImmutableList;
import org.apache.commons.lang.StringUtils;
import org.apache.marmotta.ldclient.api.endpoint.Endpoint;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java b/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
index 67cbef8..750e578 100644
--- a/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
+++ b/libraries/ldpath/ldpath-functions-date/src/test/java/org/apache/marmotta/ldpath/model/functions/date/DateFunctionsTest.java
@@ -35,7 +35,7 @@ import org.openrdf.repository.RepositoryException;
import org.openrdf.repository.sail.SailRepositoryConnection;
import org.openrdf.rio.RDFParseException;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.util.DateUtils;
public class DateFunctionsTest extends AbstractTestBase {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/model/content/MediaContentItem.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/model/content/MediaContentItem.java b/platform/marmotta-core/src/main/java/kiwi/core/model/content/MediaContentItem.java
index ab3ec52..81e9e18 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/model/content/MediaContentItem.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/model/content/MediaContentItem.java
@@ -15,7 +15,7 @@
*/
package kiwi.core.model.content;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import at.newmedialab.sesame.facading.annotations.RDF;
import at.newmedialab.sesame.facading.model.Facade;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/model/module/ModuleConfiguration.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/model/module/ModuleConfiguration.java b/platform/marmotta-core/src/main/java/kiwi/core/model/module/ModuleConfiguration.java
index 16b3c8a..c8ff276 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/model/module/ModuleConfiguration.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/model/module/ModuleConfiguration.java
@@ -15,7 +15,7 @@
*/
package kiwi.core.model.module;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.util.DateUtils;
import com.google.common.base.Preconditions;
import org.apache.commons.configuration.Configuration;
import org.apache.marmotta.commons.collections.CollectionUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/model/user/KiWiUser.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/model/user/KiWiUser.java b/platform/marmotta-core/src/main/java/kiwi/core/model/user/KiWiUser.java
index 60b56e5..3e82a71 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/model/user/KiWiUser.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/model/user/KiWiUser.java
@@ -15,7 +15,7 @@
*/
package kiwi.core.model.user;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import at.newmedialab.sesame.facading.annotations.RDF;
import at.newmedialab.sesame.facading.annotations.RDFType;
import at.newmedialab.sesame.facading.model.Facade;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/model/user/OnlineAccount.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/model/user/OnlineAccount.java b/platform/marmotta-core/src/main/java/kiwi/core/model/user/OnlineAccount.java
index 44f2b6b..9d08c86 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/model/user/OnlineAccount.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/model/user/OnlineAccount.java
@@ -15,7 +15,7 @@
*/
package kiwi.core.model.user;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import at.newmedialab.sesame.facading.annotations.RDF;
import at.newmedialab.sesame.facading.annotations.RDFType;
import at.newmedialab.sesame.facading.model.Facade;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/services/content/FileSystemContentReader.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/services/content/FileSystemContentReader.java b/platform/marmotta-core/src/main/java/kiwi/core/services/content/FileSystemContentReader.java
index f414a20..c409fb8 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/services/content/FileSystemContentReader.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/services/content/FileSystemContentReader.java
@@ -15,6 +15,8 @@
*/
package kiwi.core.services.content;
+import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException;
+
import at.newmedialab.sesame.facading.FacadingFactory;
import com.google.common.io.ByteStreams;
import com.google.common.io.Files;
@@ -40,8 +42,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
-import static at.newmedialab.sesame.commons.repository.ExceptionUtils.handleRepositoryException;
-
/**
* A content reader that reads the content of a resource from the file system.
* It uses the kiwi:hasContentPath property to determine the path of the content to access.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/services/content/FileSystemContentWriter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/services/content/FileSystemContentWriter.java b/platform/marmotta-core/src/main/java/kiwi/core/services/content/FileSystemContentWriter.java
index 91f0711..e2c45f1 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/services/content/FileSystemContentWriter.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/services/content/FileSystemContentWriter.java
@@ -15,6 +15,8 @@
*/
package kiwi.core.services.content;
+import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException;
+
import at.newmedialab.sesame.facading.FacadingFactory;
import com.google.common.io.ByteStreams;
import com.google.common.io.Files;
@@ -41,8 +43,6 @@ import java.io.InputStream;
import java.net.URI;
import java.util.UUID;
-import static at.newmedialab.sesame.commons.repository.ExceptionUtils.handleRepositoryException;
-
/**
* A content writer that writes the content of a resource to the file system.
* It uses the kiwi:hasContentPath property to determine the destination path of the content to write to.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/services/content/HTTPContentReader.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/services/content/HTTPContentReader.java b/platform/marmotta-core/src/main/java/kiwi/core/services/content/HTTPContentReader.java
index 3a6b545..ec619e6 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/services/content/HTTPContentReader.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/services/content/HTTPContentReader.java
@@ -15,6 +15,8 @@
*/
package kiwi.core.services.content;
+import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException;
+
import at.newmedialab.sesame.facading.FacadingFactory;
import com.google.common.io.ByteStreams;
import kiwi.core.api.config.ConfigurationService;
@@ -39,8 +41,6 @@ import javax.inject.Inject;
import java.io.IOException;
import java.io.InputStream;
-import static at.newmedialab.sesame.commons.repository.ExceptionUtils.handleRepositoryException;
-
/**
* Add file description here!
* <p/>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/services/prefix/PrefixServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/services/prefix/PrefixServiceImpl.java b/platform/marmotta-core/src/main/java/kiwi/core/services/prefix/PrefixServiceImpl.java
index 3c492e3..a4f7464 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/services/prefix/PrefixServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/services/prefix/PrefixServiceImpl.java
@@ -26,8 +26,6 @@ import javax.inject.Inject;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.prefix.PrefixService;
import kiwi.core.events.ConfigurationChangedEvent;
-import kiwi.core.events.ConfigurationServiceInitEvent;
-
import kiwi.core.events.SesameStartupEvent;
import org.apache.commons.lang.StringUtils;
import org.apache.marmotta.commons.http.UriUtil;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/services/task/TaskManagerServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/services/task/TaskManagerServiceImpl.java b/platform/marmotta-core/src/main/java/kiwi/core/services/task/TaskManagerServiceImpl.java
index 1d9a969..9370067 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/services/task/TaskManagerServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/services/task/TaskManagerServiceImpl.java
@@ -15,10 +15,11 @@
*/
package kiwi.core.services.task;
-import at.newmedialab.sesame.commons.util.HashUtils;
import kiwi.core.api.task.Task;
import kiwi.core.api.task.TaskInfo;
import kiwi.core.api.task.TaskManagerService;
+
+import org.apache.marmotta.commons.util.HashUtils;
import org.slf4j.Logger;
import javax.annotation.PostConstruct;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/ContextServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/ContextServiceImpl.java b/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/ContextServiceImpl.java
index 1b00b2b..7fe778c 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/ContextServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/ContextServiceImpl.java
@@ -15,9 +15,9 @@
*/
package kiwi.core.services.triplestore;
-import static at.newmedialab.sesame.commons.repository.ExceptionUtils.handleRepositoryException;
+import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.importer.ImportService;
import kiwi.core.api.triplestore.ContextService;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/LdpServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/LdpServiceImpl.java b/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/LdpServiceImpl.java
index 9bd9b30..7f016b3 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/LdpServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/LdpServiceImpl.java
@@ -14,9 +14,7 @@
* limitations under the License.
*/
package kiwi.core.services.triplestore;
-
-import static at.newmedialab.sesame.commons.repository.ExceptionUtils.handleRepositoryException;
-
+import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Date;
@@ -41,7 +39,7 @@ import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
import org.slf4j.Logger;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
/**
* (Experimental) Implementation for supporting LDP (WIP)
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/SesameServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/SesameServiceImpl.java b/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/SesameServiceImpl.java
index 7664cf7..13cef13 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/SesameServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/services/triplestore/SesameServiceImpl.java
@@ -20,8 +20,6 @@ import kiwi.core.api.triplestore.NotifyingSailProvider;
import kiwi.core.api.triplestore.SesameService;
import kiwi.core.api.triplestore.StandardSailProvider;
import kiwi.core.api.triplestore.TransactionalSailProvider;
-import kiwi.core.events.ConfigurationServiceInitEvent;
-import kiwi.core.events.SystemStartupEvent;
import kiwi.core.qualifiers.event.transaction.AfterCommit;
import kiwi.core.qualifiers.event.transaction.AfterRollback;
import kiwi.core.qualifiers.event.transaction.BeforeCommit;
@@ -45,7 +43,6 @@ import org.slf4j.Logger;
import javax.annotation.PreDestroy;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
import javax.enterprise.inject.Instance;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/services/user/UserServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/services/user/UserServiceImpl.java b/platform/marmotta-core/src/main/java/kiwi/core/services/user/UserServiceImpl.java
index 6c8a30f..0083aa1 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/services/user/UserServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/services/user/UserServiceImpl.java
@@ -15,11 +15,10 @@
*/
package kiwi.core.services.user;
-import static at.newmedialab.sesame.commons.model.Namespaces.ADMIN_LOGIN;
-import static at.newmedialab.sesame.commons.model.Namespaces.ANONYMOUS_LOGIN;
-import static at.newmedialab.sesame.commons.repository.ExceptionUtils.handleRepositoryException;
-
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
+import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException;
+import static org.apache.marmotta.commons.sesame.model.Namespaces.ADMIN_LOGIN;
+import static org.apache.marmotta.commons.sesame.model.Namespaces.ANONYMOUS_LOGIN;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
import at.newmedialab.sesame.facading.FacadingFactory;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.triplestore.SesameService;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/webservices/io/ExportWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/webservices/io/ExportWebService.java b/platform/marmotta-core/src/main/java/kiwi/core/webservices/io/ExportWebService.java
index 5587a33..5c79eb5 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/webservices/io/ExportWebService.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/webservices/io/ExportWebService.java
@@ -15,10 +15,10 @@
*/
package kiwi.core.webservices.io;
-import static at.newmedialab.sesame.commons.repository.ExceptionUtils.handleRepositoryException;
+import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
+import org.apache.marmotta.commons.util.DateUtils;
import kiwi.core.api.exporter.ExportService;
import kiwi.core.api.triplestore.SesameService;
import kiwi.core.exception.io.UnsupportedExporterException;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/ContentWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/ContentWebService.java b/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/ContentWebService.java
index 50ac140..a9b1218 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/ContentWebService.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/ContentWebService.java
@@ -15,7 +15,6 @@
*/
package kiwi.core.webservices.resource;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.content.ContentService;
import kiwi.core.api.io.LMFIOService;
@@ -24,6 +23,8 @@ import kiwi.core.events.ContentCreatedEvent;
import kiwi.core.exception.LMFException;
import kiwi.core.exception.WritingNotSupportedException;
import kiwi.core.qualifiers.event.ContentCreated;
+
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
import org.openrdf.repository.RepositoryConnection;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/InspectionWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/InspectionWebService.java b/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/InspectionWebService.java
index 589c646..96314e1 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/InspectionWebService.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/InspectionWebService.java
@@ -15,16 +15,17 @@
*/
package kiwi.core.webservices.resource;
-import static at.newmedialab.sesame.commons.repository.ExceptionUtils.handleRepositoryException;
-import static at.newmedialab.sesame.commons.repository.ResourceUtils.getAnonResource;
-import static at.newmedialab.sesame.commons.repository.ResourceUtils.getLabel;
-import static at.newmedialab.sesame.commons.repository.ResourceUtils.getUriResource;
-import static at.newmedialab.sesame.commons.repository.ResourceUtils.listOutgoing;
+import static org.apache.marmotta.commons.sesame.repository.ResourceUtils.getAnonResource;
+import static org.apache.marmotta.commons.sesame.repository.ResourceUtils.getLabel;
+import static org.apache.marmotta.commons.sesame.repository.ResourceUtils.getUriResource;
+import static org.apache.marmotta.commons.sesame.repository.ResourceUtils.listOutgoing;
+import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException;
-import at.newmedialab.sesame.commons.model.Namespaces;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.content.ContentService;
import kiwi.core.api.triplestore.SesameService;
+
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.apache.marmotta.kiwi.model.rdf.KiWiResource;
import org.apache.marmotta.kiwi.model.rdf.KiWiTriple;
import org.openrdf.model.*;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/MetaWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/MetaWebService.java b/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/MetaWebService.java
index 53bfc6e..e6a3737 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/MetaWebService.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/MetaWebService.java
@@ -47,6 +47,7 @@ import kiwi.core.services.sesame.KiWiSesameUtil;
import kiwi.core.services.sesame.ResourceSubjectMetadata;
import org.apache.marmotta.commons.collections.CollectionUtils;
+import org.apache.marmotta.commons.http.ETagGenerator;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
import org.openrdf.repository.RepositoryConnection;
@@ -59,8 +60,6 @@ import org.openrdf.rio.RDFParseException;
import org.openrdf.rio.RDFWriter;
import org.openrdf.rio.Rio;
-import at.newmedialab.sesame.commons.http.ETagGenerator;
-
/**
* Meta Web Services
*
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/ResourceWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/ResourceWebService.java b/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/ResourceWebService.java
index b433554..d59e457 100644
--- a/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/ResourceWebService.java
+++ b/platform/marmotta-core/src/main/java/kiwi/core/webservices/resource/ResourceWebService.java
@@ -17,8 +17,7 @@ package kiwi.core.webservices.resource;
import static javax.ws.rs.core.Response.status;
-import at.newmedialab.sesame.commons.http.ETagGenerator;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.content.ContentService;
import kiwi.core.api.io.LMFIOService;
@@ -26,6 +25,7 @@ import kiwi.core.api.triplestore.SesameService;
import kiwi.core.services.sesame.KiWiSesameUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.marmotta.commons.http.ContentType;
+import org.apache.marmotta.commons.http.ETagGenerator;
import org.apache.marmotta.commons.http.LMFHttpUtils;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-ldcache/src/main/java/at/newmedialab/lmf/ldcache/webservices/LinkedDataCachingWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/src/main/java/at/newmedialab/lmf/ldcache/webservices/LinkedDataCachingWebService.java b/platform/marmotta-ldcache/src/main/java/at/newmedialab/lmf/ldcache/webservices/LinkedDataCachingWebService.java
index 9f14253..e0ef7e1 100644
--- a/platform/marmotta-ldcache/src/main/java/at/newmedialab/lmf/ldcache/webservices/LinkedDataCachingWebService.java
+++ b/platform/marmotta-ldcache/src/main/java/at/newmedialab/lmf/ldcache/webservices/LinkedDataCachingWebService.java
@@ -17,11 +17,9 @@ package at.newmedialab.lmf.ldcache.webservices;
import at.newmedialab.lmf.ldcache.api.endpoint.LinkedDataEndpointService;
import at.newmedialab.lmf.ldcache.services.ldcache.LDCacheSailProvider;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import kiwi.core.api.triplestore.SesameService;
-import org.apache.marmotta.ldcache.api.LDCachingService;
import org.apache.marmotta.ldclient.api.endpoint.Endpoint;
-import org.apache.marmotta.ldclient.api.ldclient.LDClientService;
import org.apache.marmotta.ldclient.api.provider.DataProvider;
import org.apache.marmotta.ldclient.model.ClientResponse;
import org.apache.marmotta.ldclient.provider.rdf.LinkedDataProvider;
@@ -31,9 +29,7 @@ import org.openrdf.rio.RDFHandler;
import org.openrdf.rio.rdfxml.util.RDFXMLPrettyWriter;
import org.slf4j.Logger;
-import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-ldpath/src/main/java/at/newmedialab/lmf/ldpath/webservices/LDPathUtilWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/src/main/java/at/newmedialab/lmf/ldpath/webservices/LDPathUtilWebService.java b/platform/marmotta-ldpath/src/main/java/at/newmedialab/lmf/ldpath/webservices/LDPathUtilWebService.java
index af5e832..9499437 100644
--- a/platform/marmotta-ldpath/src/main/java/at/newmedialab/lmf/ldpath/webservices/LDPathUtilWebService.java
+++ b/platform/marmotta-ldpath/src/main/java/at/newmedialab/lmf/ldpath/webservices/LDPathUtilWebService.java
@@ -15,14 +15,14 @@
*/
package at.newmedialab.lmf.ldpath.webservices;
-import static at.newmedialab.sesame.commons.repository.ExceptionUtils.handleRepositoryException;
-import static at.newmedialab.sesame.commons.repository.ResourceUtils.listOutgoing;
-import static at.newmedialab.sesame.commons.repository.ResourceUtils.listResourcesByPrefix;
-import static at.newmedialab.sesame.commons.repository.ResultUtils.iterable;
+import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException;
+import static org.apache.marmotta.commons.sesame.repository.ResourceUtils.listOutgoing;
+import static org.apache.marmotta.commons.sesame.repository.ResourceUtils.listResourcesByPrefix;
+import static org.apache.marmotta.commons.sesame.repository.ResultUtils.iterable;
import at.newmedialab.lmf.ldpath.api.LDPathService;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import kiwi.core.api.prefix.PrefixService;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-ldpath/src/main/java/at/newmedialab/lmf/ldpath/webservices/LDPathWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/src/main/java/at/newmedialab/lmf/ldpath/webservices/LDPathWebService.java b/platform/marmotta-ldpath/src/main/java/at/newmedialab/lmf/ldpath/webservices/LDPathWebService.java
index 6ffccce..e196421 100644
--- a/platform/marmotta-ldpath/src/main/java/at/newmedialab/lmf/ldpath/webservices/LDPathWebService.java
+++ b/platform/marmotta-ldpath/src/main/java/at/newmedialab/lmf/ldpath/webservices/LDPathWebService.java
@@ -15,12 +15,13 @@
*/
package at.newmedialab.lmf.ldpath.webservices;
-import static at.newmedialab.sesame.commons.repository.ExceptionUtils.handleRepositoryException;
-import static at.newmedialab.sesame.commons.repository.ResultUtils.iterable;
+import static org.apache.marmotta.commons.sesame.repository.ResultUtils.iterable;
+import static org.apache.marmotta.commons.sesame.repository.ExceptionUtils.handleRepositoryException;
import at.newmedialab.lmf.ldpath.api.LDPathService;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
-import at.newmedialab.sesame.commons.util.JSONUtils;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
+import org.apache.marmotta.commons.util.JSONUtils;
+
import kiwi.core.api.triplestore.SesameService;
import org.apache.marmotta.kiwi.model.rdf.KiWiNode;
import org.apache.marmotta.kiwi.model.rdf.KiWiStringLiteral;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/filters/LMFAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/filters/LMFAuthenticationFilter.java b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/filters/LMFAuthenticationFilter.java
index ee4e507..2703a37 100644
--- a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/filters/LMFAuthenticationFilter.java
+++ b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/filters/LMFAuthenticationFilter.java
@@ -16,7 +16,7 @@
package at.newmedialab.lmf.user.filters;
import at.newmedialab.lmf.user.api.AuthenticationService;
-import at.newmedialab.sesame.commons.model.Namespaces;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.modules.LMFHttpFilter;
import kiwi.core.api.user.UserService;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/model/UserAccount.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/model/UserAccount.java b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/model/UserAccount.java
index 2dd5eee..9aee189 100644
--- a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/model/UserAccount.java
+++ b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/model/UserAccount.java
@@ -15,14 +15,14 @@
*/
package at.newmedialab.lmf.user.model;
-import at.newmedialab.sesame.commons.util.HashUtils;
-
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.marmotta.commons.util.HashUtils;
+
/**
* User: Stephanie Stroka
* Date: 18.05.2011
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/AccountServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/AccountServiceImpl.java b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/AccountServiceImpl.java
index 3a92d95..a070313 100644
--- a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/AccountServiceImpl.java
+++ b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/AccountServiceImpl.java
@@ -18,7 +18,6 @@ package at.newmedialab.lmf.user.services;
import at.newmedialab.lmf.user.api.AccountService;
import at.newmedialab.lmf.user.model.UserAccount;
import at.newmedialab.lmf.user.model.UserAccount.PasswordHash;
-import at.newmedialab.sesame.commons.model.Namespaces;
import com.google.common.base.Preconditions;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.user.UserService;
@@ -30,6 +29,7 @@ import kiwi.core.qualifiers.cache.LMFCache;
import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import org.apache.commons.lang.StringUtils;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
import org.apache.marmotta.kiwi.model.rdf.KiWiUriResource;
import org.openrdf.model.Resource;
import org.openrdf.model.URI;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/webservices/UserManagementWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/webservices/UserManagementWebService.java b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/webservices/UserManagementWebService.java
index 1881ca7..8d4d6e1 100644
--- a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/webservices/UserManagementWebService.java
+++ b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/webservices/UserManagementWebService.java
@@ -17,8 +17,8 @@ package at.newmedialab.lmf.user.webservices;
import at.newmedialab.lmf.user.api.AccountService;
import at.newmedialab.lmf.user.model.UserAccount;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.triplestore.SesameService;
import org.apache.commons.lang.StringUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/webservices/UserWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/webservices/UserWebService.java b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/webservices/UserWebService.java
index ea0aba2..e6b7f2e 100644
--- a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/webservices/UserWebService.java
+++ b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/webservices/UserWebService.java
@@ -17,8 +17,8 @@ package at.newmedialab.lmf.user.webservices;
import at.newmedialab.lmf.user.api.AccountService;
import at.newmedialab.lmf.user.model.UserAccount;
-import at.newmedialab.sesame.commons.model.Namespaces;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
+import org.apache.marmotta.commons.sesame.model.Namespaces;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.triplestore.SesameService;
import kiwi.core.api.user.UserService;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/api/MementoService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/api/MementoService.java b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/api/MementoService.java
index 47501e5..1724518 100644
--- a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/api/MementoService.java
+++ b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/api/MementoService.java
@@ -19,8 +19,6 @@ import at.newmedialab.lmf.versioning.exception.MementoException;
import at.newmedialab.lmf.versioning.model.MementoVersionSet;
import org.apache.marmotta.kiwi.versioning.model.Version;
import org.openrdf.model.Resource;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.Date;
/**
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6102b3f6/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/webservices/MementoWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/webservices/MementoWebService.java b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/webservices/MementoWebService.java
index 773a28f..e6a1b2a 100644
--- a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/webservices/MementoWebService.java
+++ b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/webservices/MementoWebService.java
@@ -29,8 +29,8 @@ import at.newmedialab.lmf.versioning.exception.MementoException;
import at.newmedialab.lmf.versioning.model.MementoVersionSet;
import at.newmedialab.lmf.versioning.services.VersioningSailProvider;
import com.google.common.base.Preconditions;
-import at.newmedialab.sesame.commons.repository.ResourceUtils;
-import at.newmedialab.sesame.commons.util.DateUtils;
+import org.apache.marmotta.commons.sesame.repository.ResourceUtils;
+import org.apache.marmotta.commons.util.DateUtils;
import kiwi.core.api.config.ConfigurationService;
import kiwi.core.api.io.LMFIOService;
import kiwi.core.api.triplestore.SesameService;