You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/02/22 16:21:37 UTC
[1/37] MARMOTTA-105: renamed packages in marmotta-core
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/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 9499437..cbc8ca2 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
@@ -25,9 +25,9 @@ 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;
-import kiwi.core.api.triplestore.SesameService;
-import kiwi.core.services.prefix.PrefixCC;
+import org.apache.marmotta.platform.core.api.prefix.PrefixService;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
+import org.apache.marmotta.platform.core.services.prefix.PrefixCC;
import org.apache.commons.lang.StringUtils;
import org.apache.marmotta.commons.http.UriUtil;
import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/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 e196421..f8b2960 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
@@ -22,7 +22,7 @@ import at.newmedialab.lmf.ldpath.api.LDPathService;
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.platform.core.api.triplestore.SesameService;
import org.apache.marmotta.kiwi.model.rdf.KiWiNode;
import org.apache.marmotta.kiwi.model.rdf.KiWiStringLiteral;
import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-reasoner/src/main/java/kiwi/reasoner/services/ReasoningSailProvider.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/src/main/java/kiwi/reasoner/services/ReasoningSailProvider.java b/platform/marmotta-reasoner/src/main/java/kiwi/reasoner/services/ReasoningSailProvider.java
index 423c431..b74e0ab 100644
--- a/platform/marmotta-reasoner/src/main/java/kiwi/reasoner/services/ReasoningSailProvider.java
+++ b/platform/marmotta-reasoner/src/main/java/kiwi/reasoner/services/ReasoningSailProvider.java
@@ -16,10 +16,10 @@
package kiwi.reasoner.services;
import info.aduna.iteration.CloseableIteration;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.api.triplestore.SesameService;
-import kiwi.core.api.triplestore.TransactionalSailProvider;
-import kiwi.core.events.ConfigurationChangedEvent;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
+import org.apache.marmotta.platform.core.api.triplestore.TransactionalSailProvider;
+import org.apache.marmotta.platform.core.events.ConfigurationChangedEvent;
import org.apache.marmotta.kiwi.reasoner.engine.ReasoningConfiguration;
import org.apache.marmotta.kiwi.reasoner.model.program.Justification;
import org.apache.marmotta.kiwi.reasoner.model.program.Program;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-security/src/main/java/at/newmedialab/lmf/security/filters/LMFAccessControlFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/src/main/java/at/newmedialab/lmf/security/filters/LMFAccessControlFilter.java b/platform/marmotta-security/src/main/java/at/newmedialab/lmf/security/filters/LMFAccessControlFilter.java
index a5db67a..3e7cbb8 100644
--- a/platform/marmotta-security/src/main/java/at/newmedialab/lmf/security/filters/LMFAccessControlFilter.java
+++ b/platform/marmotta-security/src/main/java/at/newmedialab/lmf/security/filters/LMFAccessControlFilter.java
@@ -16,10 +16,10 @@
package at.newmedialab.lmf.security.filters;
import at.newmedialab.lmf.security.api.SecurityService;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.api.modules.LMFHttpFilter;
-import kiwi.core.api.user.UserService;
-import kiwi.core.exception.security.AccessDeniedException;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.modules.LMFHttpFilter;
+import org.apache.marmotta.platform.core.api.user.UserService;
+import org.apache.marmotta.platform.core.exception.security.AccessDeniedException;
import org.slf4j.Logger;
import javax.enterprise.context.ApplicationScoped;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-security/src/main/java/at/newmedialab/lmf/security/services/SecurityServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/src/main/java/at/newmedialab/lmf/security/services/SecurityServiceImpl.java b/platform/marmotta-security/src/main/java/at/newmedialab/lmf/security/services/SecurityServiceImpl.java
index d874252..d33086a 100644
--- a/platform/marmotta-security/src/main/java/at/newmedialab/lmf/security/services/SecurityServiceImpl.java
+++ b/platform/marmotta-security/src/main/java/at/newmedialab/lmf/security/services/SecurityServiceImpl.java
@@ -19,8 +19,8 @@ import at.newmedialab.lmf.security.api.SecurityService;
import at.newmedialab.lmf.security.model.SecurityConstraint;
import at.newmedialab.lmf.security.util.SubnetInfo;
import com.google.common.collect.Lists;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.events.ConfigurationChangedEvent;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.events.ConfigurationChangedEvent;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/api/sparql/SparqlService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/api/sparql/SparqlService.java b/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/api/sparql/SparqlService.java
index 05aa892..b52c74f 100644
--- a/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/api/sparql/SparqlService.java
+++ b/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/api/sparql/SparqlService.java
@@ -16,8 +16,8 @@
package at.newmedialab.lmf.sparql.api.sparql;
import at.newmedialab.lmf.sparql.services.sparqlio.rdf.SPARQLGraphResultWriter;
-import kiwi.core.exception.InvalidArgumentException;
-import kiwi.core.exception.LMFException;
+import org.apache.marmotta.platform.core.exception.InvalidArgumentException;
+import org.apache.marmotta.platform.core.exception.LMFException;
import org.openrdf.model.Value;
import org.openrdf.query.MalformedQueryException;
import org.openrdf.query.QueryEvaluationException;
@@ -50,7 +50,7 @@ public interface SparqlService {
* @param booleanWriter the writer to use to write boolean query results
* @param graphWriter
* @throws InvalidArgumentException if the output format or query language are undefined
- * @throws kiwi.core.exception.LMFException if the query evaluation fails
+ * @throws org.apache.marmotta.platform.core.exception.LMFException if the query evaluation fails
*/
public void query(QueryLanguage queryLanguage, String query, TupleQueryResultWriter tupleWriter, BooleanQueryResultWriter booleanWriter, SPARQLGraphResultWriter graphWriter) throws InvalidArgumentException, LMFException, MalformedQueryException, QueryEvaluationException;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparql/SparqlServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparql/SparqlServiceImpl.java b/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparql/SparqlServiceImpl.java
index 4f26e0b..6498079 100644
--- a/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparql/SparqlServiceImpl.java
+++ b/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparql/SparqlServiceImpl.java
@@ -17,10 +17,10 @@ package at.newmedialab.lmf.sparql.services.sparql;
import at.newmedialab.lmf.sparql.api.sparql.SparqlService;
import at.newmedialab.lmf.sparql.services.sparqlio.rdf.SPARQLGraphResultWriter;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.api.triplestore.SesameService;
-import kiwi.core.exception.InvalidArgumentException;
-import kiwi.core.exception.LMFException;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
+import org.apache.marmotta.platform.core.exception.InvalidArgumentException;
+import org.apache.marmotta.platform.core.exception.LMFException;
import org.apache.marmotta.kiwi.model.rdf.KiWiNode;
import org.openrdf.model.Value;
import org.openrdf.query.*;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java b/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java
index 8e857a5..f64327d 100644
--- a/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java
+++ b/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java
@@ -15,8 +15,8 @@
*/
package at.newmedialab.lmf.sparql.services.sparqlio.sparqlhtml;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.util.KiWiContext;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.util.KiWiContext;
import org.jdom2.Document;
import org.jdom2.output.Format;
import org.jdom2.output.XMLOutputter;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java b/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
index 3fe6ca8..73d9d3a 100644
--- a/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
+++ b/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
@@ -15,8 +15,8 @@
*/
package at.newmedialab.lmf.sparql.services.sparqlio.sparqlhtml;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.util.KiWiContext;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.util.KiWiContext;
import org.jdom2.Document;
import org.jdom2.output.Format;
import org.jdom2.output.XMLOutputter;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/webservices/SparqlWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/webservices/SparqlWebService.java b/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/webservices/SparqlWebService.java
index 49c2246..aa73de0 100644
--- a/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/webservices/SparqlWebService.java
+++ b/platform/marmotta-sparql/src/main/java/at/newmedialab/lmf/sparql/webservices/SparqlWebService.java
@@ -23,10 +23,10 @@ import at.newmedialab.lmf.sparql.services.sparqlio.sparqljson.SPARQLBooleanJSONW
import at.newmedialab.lmf.sparql.services.sparqlio.sparqljson.SPARQLResultsJSONWriter;
import com.google.common.collect.Lists;
import com.google.common.io.CharStreams;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.exception.InvalidArgumentException;
-import kiwi.core.exception.LMFException;
-import kiwi.core.util.WebServiceUtil;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.exception.InvalidArgumentException;
+import org.apache.marmotta.platform.core.exception.LMFException;
+import org.apache.marmotta.platform.core.util.WebServiceUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.marmotta.commons.http.ContentType;
import org.apache.marmotta.commons.http.LMFHttpUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-ssl/src/main/java/at/newmedialab/lmf/ssl/api/SSLService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ssl/src/main/java/at/newmedialab/lmf/ssl/api/SSLService.java b/platform/marmotta-ssl/src/main/java/at/newmedialab/lmf/ssl/api/SSLService.java
index e115e2f..dc8680a 100644
--- a/platform/marmotta-ssl/src/main/java/at/newmedialab/lmf/ssl/api/SSLService.java
+++ b/platform/marmotta-ssl/src/main/java/at/newmedialab/lmf/ssl/api/SSLService.java
@@ -15,7 +15,7 @@
*/
package at.newmedialab.lmf.ssl.api;
-import kiwi.core.events.ConfigurationServiceInitEvent;
+import org.apache.marmotta.platform.core.events.ConfigurationServiceInitEvent;
/**
* A service managing the configuration of the SSL context needed for establishing SSL connections.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-ssl/src/main/java/at/newmedialab/lmf/ssl/services/SSLServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ssl/src/main/java/at/newmedialab/lmf/ssl/services/SSLServiceImpl.java b/platform/marmotta-ssl/src/main/java/at/newmedialab/lmf/ssl/services/SSLServiceImpl.java
index 9271f53..7c173e8 100644
--- a/platform/marmotta-ssl/src/main/java/at/newmedialab/lmf/ssl/services/SSLServiceImpl.java
+++ b/platform/marmotta-ssl/src/main/java/at/newmedialab/lmf/ssl/services/SSLServiceImpl.java
@@ -16,7 +16,7 @@
package at.newmedialab.lmf.ssl.services;
import at.newmedialab.lmf.ssl.api.SSLService;
-import kiwi.core.events.ConfigurationServiceInitEvent;
+import org.apache.marmotta.platform.core.events.ConfigurationServiceInitEvent;
import org.slf4j.Logger;
import javax.enterprise.context.ApplicationScoped;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/api/AccountService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/api/AccountService.java b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/api/AccountService.java
index 0368e0d..9ce7fa5 100644
--- a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/api/AccountService.java
+++ b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/api/AccountService.java
@@ -16,7 +16,7 @@
package at.newmedialab.lmf.user.api;
import at.newmedialab.lmf.user.model.UserAccount;
-import kiwi.core.model.user.KiWiUser;
+import org.apache.marmotta.platform.core.model.user.KiWiUser;
import org.openrdf.model.URI;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/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 2703a37..638c842 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
@@ -17,11 +17,11 @@ package at.newmedialab.lmf.user.filters;
import at.newmedialab.lmf.user.api.AuthenticationService;
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;
-import kiwi.core.exception.UserExistsException;
-import kiwi.core.exception.security.AccessDeniedException;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.modules.LMFHttpFilter;
+import org.apache.marmotta.platform.core.api.user.UserService;
+import org.apache.marmotta.platform.core.exception.UserExistsException;
+import org.apache.marmotta.platform.core.exception.security.AccessDeniedException;
import org.jboss.resteasy.spi.UnhandledException;
import org.openrdf.model.URI;
import org.slf4j.Logger;
@@ -55,7 +55,7 @@ import static org.apache.commons.codec.binary.Base64.decodeBase64;
* authentication information, and it sets the current user for all activities carried out in the thread.</li>
* <li>In case authentication fails, no user information is added to the request.</li>
* </ul>
- * The filter also listens for {@link kiwi.core.exception.security.AccessDeniedException} thrown by
+ * The filter also listens for {@link org.apache.marmotta.platform.core.exception.security.AccessDeniedException} thrown by
* subsequent filters or servlets in the chain, in which case it returns an HTTP authorization request to the
* client. In particular, this functionality is used by the LMFAccessControlFilter to restrict access to
* services based on security profiles.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/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 a070313..15dd0b9 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
@@ -19,13 +19,13 @@ import at.newmedialab.lmf.user.api.AccountService;
import at.newmedialab.lmf.user.model.UserAccount;
import at.newmedialab.lmf.user.model.UserAccount.PasswordHash;
import com.google.common.base.Preconditions;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.api.user.UserService;
-import kiwi.core.events.ConfigurationChangedEvent;
-import kiwi.core.events.SystemStartupEvent;
-import kiwi.core.exception.UserExistsException;
-import kiwi.core.model.user.KiWiUser;
-import kiwi.core.qualifiers.cache.LMFCache;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.user.UserService;
+import org.apache.marmotta.platform.core.events.ConfigurationChangedEvent;
+import org.apache.marmotta.platform.core.events.SystemStartupEvent;
+import org.apache.marmotta.platform.core.exception.UserExistsException;
+import org.apache.marmotta.platform.core.model.user.KiWiUser;
+import org.apache.marmotta.platform.core.qualifiers.cache.LMFCache;
import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import org.apache.commons.lang.StringUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/AuthenticationServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/AuthenticationServiceImpl.java b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/AuthenticationServiceImpl.java
index 74127ca..c7cc8a7 100644
--- a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/AuthenticationServiceImpl.java
+++ b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/AuthenticationServiceImpl.java
@@ -19,9 +19,9 @@ import at.newmedialab.lmf.user.api.AccountService;
import at.newmedialab.lmf.user.api.AuthenticationProvider;
import at.newmedialab.lmf.user.api.AuthenticationService;
import at.newmedialab.lmf.user.model.UserAccount;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.events.ConfigurationChangedEvent;
-import kiwi.core.util.CdiUtils;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.events.ConfigurationChangedEvent;
+import org.apache.marmotta.platform.core.util.CdiUtils;
import org.slf4j.Logger;
import javax.annotation.PostConstruct;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/UserConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/UserConfigurationServiceImpl.java b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/UserConfigurationServiceImpl.java
index 8208e8d..c5112e4 100644
--- a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/UserConfigurationServiceImpl.java
+++ b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/UserConfigurationServiceImpl.java
@@ -18,7 +18,7 @@ package at.newmedialab.lmf.user.services;
import at.newmedialab.lmf.user.api.UserConfigurationService;
import at.newmedialab.lmf.user.model.UserAccount;
import com.google.common.base.Preconditions;
-import kiwi.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.MapConfiguration;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/auth/LdapAuthProvider.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/auth/LdapAuthProvider.java b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/auth/LdapAuthProvider.java
index 3dd3eae..dac5ed7 100644
--- a/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/auth/LdapAuthProvider.java
+++ b/platform/marmotta-user/src/main/java/at/newmedialab/lmf/user/services/auth/LdapAuthProvider.java
@@ -17,7 +17,7 @@ package at.newmedialab.lmf.user.services.auth;
import at.newmedialab.lmf.user.api.AuthenticationProvider;
import at.newmedialab.lmf.user.model.UserAccount;
-import kiwi.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
import org.slf4j.Logger;
import javax.enterprise.context.ApplicationScoped;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/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 8d4d6e1..78f1157 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
@@ -19,8 +19,8 @@ import at.newmedialab.lmf.user.api.AccountService;
import at.newmedialab.lmf.user.model.UserAccount;
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.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
import org.apache.commons.lang.StringUtils;
import org.openrdf.model.Literal;
import org.openrdf.model.Statement;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/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 e6b7f2e..49da884 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
@@ -19,10 +19,10 @@ import at.newmedialab.lmf.user.api.AccountService;
import at.newmedialab.lmf.user.model.UserAccount;
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;
-import kiwi.core.exception.security.AccessDeniedException;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
+import org.apache.marmotta.platform.core.api.user.UserService;
+import org.apache.marmotta.platform.core.exception.security.AccessDeniedException;
import org.openrdf.model.Literal;
import org.openrdf.model.Statement;
import org.openrdf.model.URI;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/filter/MementoFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/filter/MementoFilter.java b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/filter/MementoFilter.java
index 55a127f..227026c 100644
--- a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/filter/MementoFilter.java
+++ b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/filter/MementoFilter.java
@@ -16,8 +16,8 @@
package at.newmedialab.lmf.versioning.filter;
import at.newmedialab.lmf.versioning.utils.MementoUtils;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.api.modules.LMFHttpFilter;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.modules.LMFHttpFilter;
import org.slf4j.Logger;
import javax.enterprise.context.ApplicationScoped;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/io/HtmlVersionSerializer.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/io/HtmlVersionSerializer.java b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/io/HtmlVersionSerializer.java
index 209f4fc..a12d8d4 100644
--- a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/io/HtmlVersionSerializer.java
+++ b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/io/HtmlVersionSerializer.java
@@ -18,7 +18,7 @@ package at.newmedialab.lmf.versioning.io;
import at.newmedialab.lmf.versioning.utils.MementoUtils;
import freemarker.template.Configuration;
import freemarker.template.TemplateException;
-import kiwi.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
import freemarker.template.Template;
import org.apache.marmotta.commons.http.ContentType;
import org.apache.marmotta.kiwi.versioning.model.Version;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/io/LinkVersionSerializer.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/io/LinkVersionSerializer.java b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/io/LinkVersionSerializer.java
index d1e426b..5e489ce 100644
--- a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/io/LinkVersionSerializer.java
+++ b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/io/LinkVersionSerializer.java
@@ -16,7 +16,7 @@
package at.newmedialab.lmf.versioning.io;
import at.newmedialab.lmf.versioning.utils.MementoUtils;
-import kiwi.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
import org.apache.marmotta.commons.http.ContentType;
import org.apache.marmotta.kiwi.versioning.model.Version;
import org.openrdf.model.Resource;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/services/VersioningSailProvider.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/services/VersioningSailProvider.java b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/services/VersioningSailProvider.java
index 96425e4..0905b49 100644
--- a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/services/VersioningSailProvider.java
+++ b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/services/VersioningSailProvider.java
@@ -15,10 +15,10 @@
*/
package at.newmedialab.lmf.versioning.services;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.api.triplestore.SesameService;
-import kiwi.core.api.triplestore.TransactionalSailProvider;
-import kiwi.core.events.ConfigurationChangedEvent;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
+import org.apache.marmotta.platform.core.api.triplestore.TransactionalSailProvider;
+import org.apache.marmotta.platform.core.events.ConfigurationChangedEvent;
import org.apache.marmotta.commons.sesame.filter.AllOfFilter;
import org.apache.marmotta.commons.sesame.filter.SesameFilter;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/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 e6a1b2a..5185034 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
@@ -31,9 +31,9 @@ import at.newmedialab.lmf.versioning.services.VersioningSailProvider;
import com.google.common.base.Preconditions;
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;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.io.LMFIOService;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
import org.apache.marmotta.commons.collections.CollectionUtils;
import org.apache.marmotta.commons.http.ContentType;
import org.apache.marmotta.commons.http.LMFHttpUtils;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/webservices/VersioningWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/webservices/VersioningWebService.java b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/webservices/VersioningWebService.java
index a5a2035..d8293e0 100644
--- a/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/webservices/VersioningWebService.java
+++ b/platform/marmotta-versioning/src/main/java/at/newmedialab/lmf/versioning/webservices/VersioningWebService.java
@@ -21,9 +21,9 @@ import org.apache.marmotta.commons.util.DateUtils;
import org.apache.marmotta.commons.util.JSONUtils;
import info.aduna.iteration.Iterations;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.api.triplestore.SesameService;
-import kiwi.core.events.SystemStartupEvent;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
+import org.apache.marmotta.platform.core.events.SystemStartupEvent;
import org.apache.marmotta.kiwi.model.rdf.KiWiUriResource;
import org.apache.marmotta.kiwi.versioning.model.Version;
import org.openrdf.model.URI;