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:36 UTC
[25/37] git commit: MARMOTTA-105: renamed packages in marmotta-core
MARMOTTA-105: renamed packages in marmotta-core
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/4d3eebdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/4d3eebdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/4d3eebdd
Branch: refs/heads/master
Commit: 4d3eebdd73dc2471e8b2e9ffb1890e46974a54d5
Parents: 963a614
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Feb 22 14:34:01 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Feb 22 14:34:01 2013 +0100
----------------------------------------------------------------------
.../src/main/resources/logback.xml | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 18 +-
.../archetype-resources/src/main/webapp/index.jsp | 4 +-
.../test/resources/META-INF/test-persistence.xml | 24 +-
.../src/test/resources/WEB-INF/test-web.xml | 4 +-
.../src/test/resources/logback.xml | 2 +-
.../lmf/client/test/config/ConfigurationIT.java | 4 +-
.../newmedialab/lmf/client/test/io/ImportIT.java | 8 +-
.../lmf/client/test/ldpath/LDPathIT.java | 6 +-
.../lmf/client/test/sparql/SPARQLIT.java | 6 +-
.../commons/sesame/facading/annotations/RDF.java | 4 +-
.../marmotta-webapp/src/main/resources/logback.xml | 2 +-
.../src/main/webapp/WEB-INF/web.xml | 16 +-
.../marmotta-webapp/src/main/webapp/index.jsp | 4 +-
.../test/resources/META-INF/test-persistence.xml | 24 +-
.../src/test/resources/WEB-INF/test-web.xml | 4 +-
.../marmotta-webapp/src/test/resources/logback.xml | 2 +-
.../reasoner/model/query/QueryResultIterator.java | 4 +-
.../sqlmapper/LMFNativeEvaluationStrategy.java | 12 +-
.../kiwi/sparql/sqlmapper/SparqlToSQLMapper.java | 10 +-
.../java/kiwi/core/api/cache/CachingService.java | 39 -
.../kiwi/core/api/config/ConfigurationService.java | 514 -------
.../kiwi/core/api/config/DependenciesService.java | 40 -
.../java/kiwi/core/api/content/ContentReader.java | 97 --
.../java/kiwi/core/api/content/ContentService.java | 121 --
.../java/kiwi/core/api/content/ContentWriter.java | 70 -
.../java/kiwi/core/api/exporter/ExportService.java | 171 ---
.../java/kiwi/core/api/http/HttpClientService.java | 166 --
.../java/kiwi/core/api/importer/ImportService.java | 109 --
.../main/java/kiwi/core/api/importer/Importer.java | 109 --
.../main/java/kiwi/core/api/io/LMFIOService.java | 56 -
.../main/java/kiwi/core/api/io/RDFHtmlWriter.java | 29 -
.../java/kiwi/core/api/io/RDFWriterPriority.java | 27 -
.../java/kiwi/core/api/logging/LoggingService.java | 39 -
.../java/kiwi/core/api/modules/LMFHttpFilter.java | 57 -
.../kiwi/core/api/modules/LMFResourceService.java | 50 -
.../java/kiwi/core/api/modules/ModuleService.java | 130 --
.../java/kiwi/core/api/modules/ResourceEntry.java | 119 --
.../java/kiwi/core/api/prefix/PrefixProvider.java | 42 -
.../java/kiwi/core/api/prefix/PrefixService.java | 110 --
.../kiwi/core/api/statistics/StatisticsModule.java | 64 -
.../core/api/statistics/StatisticsService.java | 99 --
.../src/main/java/kiwi/core/api/task/Task.java | 74 -
.../src/main/java/kiwi/core/api/task/TaskInfo.java | 92 --
.../kiwi/core/api/task/TaskManagerService.java | 43 -
.../core/api/templating/TemplatingService.java | 53 -
.../kiwi/core/api/triplestore/ContextService.java | 188 ---
.../java/kiwi/core/api/triplestore/LdpService.java | 84 -
.../api/triplestore/NotifyingSailProvider.java | 36 -
.../kiwi/core/api/triplestore/SailProvider.java | 38 -
.../kiwi/core/api/triplestore/SesameService.java | 85 -
.../core/api/triplestore/StandardSailProvider.java | 36 -
.../api/triplestore/TransactionalSailProvider.java | 36 -
.../main/java/kiwi/core/api/ui/LMFSystrayLink.java | 49 -
.../main/java/kiwi/core/api/user/UserService.java | 140 --
.../main/java/kiwi/core/api/user/UserToken.java | 82 -
.../core/events/ConfigurationChangedEvent.java | 53 -
.../core/events/ConfigurationServiceInitEvent.java | 27 -
.../java/kiwi/core/events/ContentCreatedEvent.java | 40 -
.../java/kiwi/core/events/SesameStartupEvent.java | 24 -
.../kiwi/core/events/SystemRestartedEvent.java | 24 -
.../kiwi/core/events/SystemRestartingEvent.java | 24 -
.../java/kiwi/core/events/SystemStartupEvent.java | 27 -
.../core/exception/InvalidArgumentException.java | 58 -
.../core/exception/LMFConfigurationException.java | 40 -
.../java/kiwi/core/exception/LMFException.java | 49 -
.../kiwi/core/exception/ResolvingException.java | 33 -
.../kiwi/core/exception/TemplatingException.java | 33 -
.../kiwi/core/exception/UserExistsException.java | 59 -
.../exception/WritingNotSupportedException.java | 48 -
.../authentication/LoginFailedException.java | 32 -
.../kiwi/core/exception/io/LMFExportException.java | 85 -
.../kiwi/core/exception/io/LMFImportException.java | 48 -
.../exception/io/UnsupportedExporterException.java | 49 -
.../exception/security/AccessDeniedException.java | 82 -
.../exception/webservice/NotFoundException.java | 43 -
.../core/exception/webservice/ServerException.java | 44 -
.../kiwi/core/filters/LMFServerNameFilter.java | 119 --
.../kiwi/core/filters/ModuleResourceFilter.java | 178 ---
.../java/kiwi/core/filters/TemplatingFilter.java | 190 ---
.../src/main/java/kiwi/core/jndi/LMFContext.java | 813 ----------
.../java/kiwi/core/jndi/LMFContextFactory.java | 63 -
.../java/kiwi/core/jndi/LMFInitialContext.java | 87 --
.../core/jndi/LMFInitialContextFactoryBuilder.java | 50 -
.../main/java/kiwi/core/jndi/LMFJndiListener.java | 64 -
.../main/java/kiwi/core/model/content/Content.java | 52 -
.../java/kiwi/core/model/content/MediaContent.java | 76 -
.../kiwi/core/model/content/MediaContentItem.java | 55 -
.../kiwi/core/model/filter/LMFLocalFilter.java | 75 -
.../core/model/module/ModuleConfiguration.java | 139 --
.../java/kiwi/core/model/template/MenuItem.java | 47 -
.../main/java/kiwi/core/model/user/KiWiUser.java | 65 -
.../java/kiwi/core/model/user/OnlineAccount.java | 39 -
.../java/kiwi/core/qualifiers/cache/LMFCache.java | 41 -
.../kiwi/core/qualifiers/event/ContentCreated.java | 34 -
.../java/kiwi/core/qualifiers/event/Created.java | 34 -
.../java/kiwi/core/qualifiers/event/Removed.java | 34 -
.../java/kiwi/core/qualifiers/event/Updated.java | 34 -
.../qualifiers/event/transaction/AfterCommit.java | 39 -
.../event/transaction/AfterRollback.java | 39 -
.../qualifiers/event/transaction/BeforeCommit.java | 39 -
.../event/transaction/BeforeRollback.java | 39 -
.../core/qualifiers/event/transaction/OnAbort.java | 39 -
.../qualifiers/kspace/ActiveKnowledgeSpaces.java | 35 -
.../qualifiers/kspace/CurrentKnowledgeSpace.java | 35 -
.../qualifiers/kspace/DefaultKnowledgeSpace.java | 34 -
.../qualifiers/kspace/InferredKnowledgeSpace.java | 34 -
.../qualifiers/kspace/SystemKnowledgeSpace.java | 34 -
.../java/kiwi/core/qualifiers/user/AdminUser.java | 30 -
.../kiwi/core/qualifiers/user/AnonymousUser.java | 37 -
.../kiwi/core/qualifiers/user/CurrentUser.java | 41 -
.../src/main/java/kiwi/core/rio/RDFHtmlFormat.java | 42 -
.../java/kiwi/core/rio/RDFHtmlWriterFactory.java | 69 -
.../main/java/kiwi/core/rio/RDFHtmlWriterImpl.java | 326 ----
.../core/services/cache/CachingServiceImpl.java | 139 --
.../services/config/ConfigurationServiceImpl.java | 1179 ---------------
.../services/config/DependenciesServiceImpl.java | 129 --
.../core/services/content/ContentServiceImpl.java | 327 ----
.../services/content/FileSystemContentReader.java | 310 ----
.../services/content/FileSystemContentWriter.java | 233 ---
.../core/services/content/HTTPContentReader.java | 302 ----
.../services/exporter/ExporterServiceImpl.java | 331 ----
.../core/services/http/HttpClientServiceImpl.java | 808 ----------
.../core/services/http/MonitoredHttpEntity.java | 213 ---
.../http/response/LastModifiedResponseHandler.java | 63 -
.../http/response/StatusCodeResponseHandler.java | 36 -
.../http/response/StringBodyResponseHandler.java | 38 -
.../core/services/importer/ImportServiceImpl.java | 89 --
.../services/importer/rdf/RDFImporterImpl.java | 297 ----
.../kiwi/core/services/io/LMFIOServiceImpl.java | 109 --
.../logging/LMFLogbackPropertyDefiner.java | 109 --
.../core/services/logging/LoggingServiceImpl.java | 132 --
.../services/modules/LMFResourceServiceImpl.java | 252 ---
.../core/services/modules/ModuleServiceImpl.java | 291 ----
.../java/kiwi/core/services/prefix/PrefixCC.java | 107 --
.../kiwi/core/services/prefix/PrefixServiceCC.java | 110 --
.../core/services/prefix/PrefixServiceImpl.java | 184 ---
.../kiwi/core/services/sesame/KiWiSesameUtil.java | 61 -
.../services/sesame/ResourceSubjectMetadata.java | 78 -
.../services/statistics/StatisticsServiceImpl.java | 186 ---
.../ehcache/EHCacheStatisticsModule.java | 138 --
.../statistics/system/SystemStatisticsModule.java | 112 --
.../java/kiwi/core/services/task/TaskImpl.java | 50 -
.../core/services/task/TaskManagerServiceImpl.java | 268 ----
.../core/services/templating/TemplatingHelper.java | 77 -
.../services/templating/TemplatingServiceImpl.java | 307 ----
.../services/triplestore/ContextServiceImpl.java | 389 -----
.../core/services/triplestore/LdpServiceImpl.java | 355 -----
.../services/triplestore/SesameServiceImpl.java | 310 ----
.../kiwi/core/services/user/UserServiceImpl.java | 372 -----
.../kiwi/core/servlet/KiWiH2ConsoleFilter.java | 89 --
.../kiwi/core/servlet/KiWiPostStartupFilter.java | 121 --
.../kiwi/core/servlet/KiWiPreStartupFilter.java | 116 --
.../kiwi/core/servlet/KiWiPreStartupListener.java | 61 -
.../java/kiwi/core/servlet/KiWiResourceFilter.java | 218 ---
.../java/kiwi/core/servlet/LMFOptionsFilter.java | 168 --
.../java/kiwi/core/startup/LMFStartupService.java | 244 ---
.../src/main/java/kiwi/core/util/CdiUtils.java | 44 -
.../src/main/java/kiwi/core/util/DateUtil.java | 50 -
.../java/kiwi/core/util/FallbackConfiguration.java | 59 -
.../src/main/java/kiwi/core/util/JerseyUtils.java | 43 -
.../src/main/java/kiwi/core/util/KiWiContext.java | 124 --
.../src/main/java/kiwi/core/util/KiWiIO.java | 114 --
.../kiwi/core/util/LinkedHashSetBlockingQueue.java | 415 -----
.../main/java/kiwi/core/util/ReflectionUtils.java | 160 --
.../main/java/kiwi/core/util/WebServiceUtil.java | 77 -
.../java/kiwi/core/util/http/HttpRequestUtil.java | 91 --
.../kiwi/core/webservices/CoreApplication.java | 106 --
.../config/ConfigurationWebService.java | 238 ---
.../webservices/config/DependenciesWebService.java | 62 -
.../kiwi/core/webservices/io/ExportWebService.java | 169 --
.../kiwi/core/webservices/io/ImportWebService.java | 310 ----
.../core/webservices/modules/ModuleWebService.java | 137 --
.../core/webservices/prefix/PrefixWebService.java | 132 --
.../resource/AnonResourceWebService.java | 38 -
.../webservices/resource/ContentWebService.java | 328 ----
.../webservices/resource/InspectionWebService.java | 549 -------
.../core/webservices/resource/MetaWebService.java | 361 -----
.../webservices/resource/ResourceWebService.java | 613 --------
.../resource/ResourceWebServiceHelper.java | 151 --
.../statistics/StatisticsWebService.java | 162 --
.../core/webservices/system/SystemWebService.java | 104 --
.../webservices/task/TaskManagerWebService.java | 134 --
.../webservices/triplestore/ContextWebService.java | 193 ---
.../triplestore/KnowledgeSpaceWebService.java | 120 --
.../webservices/triplestore/LdpWebService.java | 151 --
.../platform/core/api/cache/CachingService.java | 39 +
.../core/api/config/ConfigurationService.java | 514 +++++++
.../core/api/config/DependenciesService.java | 40 +
.../platform/core/api/content/ContentReader.java | 97 ++
.../platform/core/api/content/ContentService.java | 121 ++
.../platform/core/api/content/ContentWriter.java | 70 +
.../platform/core/api/exporter/ExportService.java | 171 +++
.../platform/core/api/http/HttpClientService.java | 166 ++
.../platform/core/api/importer/ImportService.java | 109 ++
.../platform/core/api/importer/Importer.java | 109 ++
.../platform/core/api/io/LMFIOService.java | 56 +
.../platform/core/api/io/RDFHtmlWriter.java | 29 +
.../platform/core/api/io/RDFWriterPriority.java | 27 +
.../platform/core/api/logging/LoggingService.java | 39 +
.../platform/core/api/modules/LMFHttpFilter.java | 57 +
.../core/api/modules/LMFResourceService.java | 50 +
.../platform/core/api/modules/ModuleService.java | 130 ++
.../platform/core/api/modules/ResourceEntry.java | 119 ++
.../platform/core/api/prefix/PrefixProvider.java | 42 +
.../platform/core/api/prefix/PrefixService.java | 110 ++
.../core/api/statistics/StatisticsModule.java | 64 +
.../core/api/statistics/StatisticsService.java | 99 ++
.../marmotta/platform/core/api/task/Task.java | 74 +
.../marmotta/platform/core/api/task/TaskInfo.java | 92 ++
.../platform/core/api/task/TaskManagerService.java | 43 +
.../core/api/templating/TemplatingService.java | 53 +
.../core/api/triplestore/ContextService.java | 188 +++
.../platform/core/api/triplestore/LdpService.java | 84 +
.../api/triplestore/NotifyingSailProvider.java | 36 +
.../core/api/triplestore/SailProvider.java | 38 +
.../core/api/triplestore/SesameService.java | 85 +
.../core/api/triplestore/StandardSailProvider.java | 36 +
.../api/triplestore/TransactionalSailProvider.java | 36 +
.../platform/core/api/ui/LMFSystrayLink.java | 49 +
.../platform/core/api/user/UserService.java | 140 ++
.../marmotta/platform/core/api/user/UserToken.java | 82 +
.../core/events/ConfigurationChangedEvent.java | 53 +
.../core/events/ConfigurationServiceInitEvent.java | 27 +
.../platform/core/events/ContentCreatedEvent.java | 40 +
.../platform/core/events/SesameStartupEvent.java | 24 +
.../platform/core/events/SystemRestartedEvent.java | 24 +
.../core/events/SystemRestartingEvent.java | 24 +
.../platform/core/events/SystemStartupEvent.java | 27 +
.../core/exception/InvalidArgumentException.java | 58 +
.../core/exception/LMFConfigurationException.java | 40 +
.../platform/core/exception/LMFException.java | 49 +
.../core/exception/ResolvingException.java | 33 +
.../core/exception/TemplatingException.java | 33 +
.../core/exception/UserExistsException.java | 59 +
.../exception/WritingNotSupportedException.java | 48 +
.../authentication/LoginFailedException.java | 32 +
.../core/exception/io/LMFExportException.java | 85 +
.../core/exception/io/LMFImportException.java | 48 +
.../exception/io/UnsupportedExporterException.java | 49 +
.../exception/security/AccessDeniedException.java | 82 +
.../exception/webservice/NotFoundException.java | 43 +
.../core/exception/webservice/ServerException.java | 44 +
.../platform/core/filters/LMFServerNameFilter.java | 119 ++
.../core/filters/ModuleResourceFilter.java | 178 +++
.../platform/core/filters/TemplatingFilter.java | 190 +++
.../marmotta/platform/core/jndi/LMFContext.java | 813 ++++++++++
.../platform/core/jndi/LMFContextFactory.java | 63 +
.../platform/core/jndi/LMFInitialContext.java | 87 ++
.../core/jndi/LMFInitialContextFactoryBuilder.java | 50 +
.../platform/core/jndi/LMFJndiListener.java | 64 +
.../platform/core/model/content/Content.java | 52 +
.../platform/core/model/content/MediaContent.java | 76 +
.../core/model/content/MediaContentItem.java | 55 +
.../platform/core/model/filter/LMFLocalFilter.java | 75 +
.../core/model/module/ModuleConfiguration.java | 139 ++
.../platform/core/model/template/MenuItem.java | 47 +
.../platform/core/model/user/KiWiUser.java | 65 +
.../platform/core/model/user/OnlineAccount.java | 39 +
.../platform/core/qualifiers/cache/LMFCache.java | 41 +
.../core/qualifiers/event/ContentCreated.java | 34 +
.../platform/core/qualifiers/event/Created.java | 34 +
.../platform/core/qualifiers/event/Removed.java | 34 +
.../platform/core/qualifiers/event/Updated.java | 34 +
.../qualifiers/event/transaction/AfterCommit.java | 39 +
.../event/transaction/AfterRollback.java | 39 +
.../qualifiers/event/transaction/BeforeCommit.java | 39 +
.../event/transaction/BeforeRollback.java | 39 +
.../core/qualifiers/event/transaction/OnAbort.java | 39 +
.../qualifiers/kspace/ActiveKnowledgeSpaces.java | 35 +
.../qualifiers/kspace/CurrentKnowledgeSpace.java | 35 +
.../qualifiers/kspace/DefaultKnowledgeSpace.java | 34 +
.../qualifiers/kspace/InferredKnowledgeSpace.java | 34 +
.../qualifiers/kspace/SystemKnowledgeSpace.java | 34 +
.../platform/core/qualifiers/user/AdminUser.java | 30 +
.../core/qualifiers/user/AnonymousUser.java | 37 +
.../platform/core/qualifiers/user/CurrentUser.java | 41 +
.../marmotta/platform/core/rio/RDFHtmlFormat.java | 42 +
.../platform/core/rio/RDFHtmlWriterFactory.java | 69 +
.../platform/core/rio/RDFHtmlWriterImpl.java | 326 ++++
.../core/services/cache/CachingServiceImpl.java | 139 ++
.../services/config/ConfigurationServiceImpl.java | 1179 +++++++++++++++
.../services/config/DependenciesServiceImpl.java | 129 ++
.../core/services/content/ContentServiceImpl.java | 327 ++++
.../services/content/FileSystemContentReader.java | 310 ++++
.../services/content/FileSystemContentWriter.java | 233 +++
.../core/services/content/HTTPContentReader.java | 302 ++++
.../services/exporter/ExporterServiceImpl.java | 331 ++++
.../core/services/http/HttpClientServiceImpl.java | 808 ++++++++++
.../core/services/http/MonitoredHttpEntity.java | 213 +++
.../http/response/LastModifiedResponseHandler.java | 63 +
.../http/response/StatusCodeResponseHandler.java | 36 +
.../http/response/StringBodyResponseHandler.java | 38 +
.../core/services/importer/ImportServiceImpl.java | 89 ++
.../services/importer/rdf/RDFImporterImpl.java | 297 ++++
.../core/services/io/LMFIOServiceImpl.java | 109 ++
.../logging/LMFLogbackPropertyDefiner.java | 109 ++
.../core/services/logging/LoggingServiceImpl.java | 132 ++
.../services/modules/LMFResourceServiceImpl.java | 252 +++
.../core/services/modules/ModuleServiceImpl.java | 291 ++++
.../platform/core/services/prefix/PrefixCC.java | 107 ++
.../core/services/prefix/PrefixServiceCC.java | 110 ++
.../core/services/prefix/PrefixServiceImpl.java | 184 +++
.../core/services/sesame/KiWiSesameUtil.java | 61 +
.../services/sesame/ResourceSubjectMetadata.java | 78 +
.../services/statistics/StatisticsServiceImpl.java | 186 +++
.../ehcache/EHCacheStatisticsModule.java | 138 ++
.../statistics/system/SystemStatisticsModule.java | 112 ++
.../platform/core/services/task/TaskImpl.java | 50 +
.../core/services/task/TaskManagerServiceImpl.java | 268 ++++
.../core/services/templating/TemplatingHelper.java | 77 +
.../services/templating/TemplatingServiceImpl.java | 307 ++++
.../services/triplestore/ContextServiceImpl.java | 389 +++++
.../core/services/triplestore/LdpServiceImpl.java | 355 +++++
.../services/triplestore/SesameServiceImpl.java | 310 ++++
.../core/services/user/UserServiceImpl.java | 372 +++++
.../platform/core/servlet/KiWiH2ConsoleFilter.java | 89 ++
.../core/servlet/KiWiPostStartupFilter.java | 121 ++
.../core/servlet/KiWiPreStartupFilter.java | 116 ++
.../core/servlet/KiWiPreStartupListener.java | 61 +
.../platform/core/servlet/KiWiResourceFilter.java | 218 +++
.../platform/core/servlet/LMFOptionsFilter.java | 168 ++
.../platform/core/startup/LMFStartupService.java | 244 +++
.../marmotta/platform/core/util/CdiUtils.java | 44 +
.../marmotta/platform/core/util/DateUtil.java | 50 +
.../platform/core/util/FallbackConfiguration.java | 59 +
.../marmotta/platform/core/util/JerseyUtils.java | 43 +
.../marmotta/platform/core/util/KiWiContext.java | 124 ++
.../apache/marmotta/platform/core/util/KiWiIO.java | 114 ++
.../core/util/LinkedHashSetBlockingQueue.java | 415 +++++
.../platform/core/util/ReflectionUtils.java | 160 ++
.../platform/core/util/WebServiceUtil.java | 77 +
.../platform/core/util/http/HttpRequestUtil.java | 91 ++
.../platform/core/webservices/CoreApplication.java | 106 ++
.../config/ConfigurationWebService.java | 238 +++
.../webservices/config/DependenciesWebService.java | 62 +
.../core/webservices/io/ExportWebService.java | 169 ++
.../core/webservices/io/ImportWebService.java | 310 ++++
.../core/webservices/modules/ModuleWebService.java | 137 ++
.../core/webservices/prefix/PrefixWebService.java | 132 ++
.../resource/AnonResourceWebService.java | 38 +
.../webservices/resource/ContentWebService.java | 328 ++++
.../webservices/resource/InspectionWebService.java | 549 +++++++
.../core/webservices/resource/MetaWebService.java | 361 +++++
.../webservices/resource/ResourceWebService.java | 613 ++++++++
.../resource/ResourceWebServiceHelper.java | 151 ++
.../statistics/StatisticsWebService.java | 162 ++
.../core/webservices/system/SystemWebService.java | 104 ++
.../webservices/task/TaskManagerWebService.java | 134 ++
.../webservices/triplestore/ContextWebService.java | 193 +++
.../triplestore/KnowledgeSpaceWebService.java | 120 ++
.../webservices/triplestore/LdpWebService.java | 151 ++
.../src/main/resources/META-INF/ehcache.xml | 10 +-
.../src/main/resources/config-defaults.properties | 6 +-
.../src/main/resources/jndi.properties | 2 +-
.../src/main/resources/kiwi-module.properties | 34 +-
.../src/main/resources/logback-template.xml | 4 +-
.../test/disabled/ConfigurationServiceTest.java | 4 +-
.../src/test/disabled/LMFBaseTest.java | 2 +-
.../src/test/disabled/PrefixCCTest.java | 2 +-
.../src/test/disabled/PrefixServiceCCTests.java | 2 +-
.../src/test/disabled/PrefixServiceTests.java | 4 +-
.../src/test/disabled/ResourceServiceTest.java | 4 +-
.../src/test/disabled/SparqlServiceTest.java | 4 +-
.../test/java/kiwi/core/test/base/AbstractLMF.java | 109 --
.../test/java/kiwi/core/test/base/EmbeddedLMF.java | 28 -
.../test/java/kiwi/core/test/base/JettyLMF.java | 130 --
.../kiwi/core/test/base/jetty/TestApplication.java | 26 -
.../core/test/base/jetty/TestInjectorFactory.java | 100 --
.../core/test/config/ConfigurationServiceTest.java | 142 --
.../test/config/ConfigurationWebServiceTest.java | 94 --
.../kiwi/core/test/embedded/EmbeddedLMFTest.java | 25 -
.../java/kiwi/core/test/user/UserServiceTest.java | 87 --
.../java/kiwi/core/util/http/UriUtilTests.java | 175 ---
.../platform/core/test/base/AbstractLMF.java | 109 ++
.../platform/core/test/base/EmbeddedLMF.java | 28 +
.../marmotta/platform/core/test/base/JettyLMF.java | 130 ++
.../core/test/base/jetty/TestApplication.java | 26 +
.../core/test/base/jetty/TestInjectorFactory.java | 100 ++
.../core/test/config/ConfigurationServiceTest.java | 142 ++
.../test/config/ConfigurationWebServiceTest.java | 94 ++
.../core/test/embedded/EmbeddedLMFTest.java | 25 +
.../platform/core/test/user/UserServiceTest.java | 87 ++
.../platform/core/util/http/UriUtilTests.java | 175 +++
.../src/test/resources/ehcache-db.xml | 8 +-
.../test/resources/kiwi/core/test/literal/lmf2.png | Bin 52680 -> 0 bytes
.../resources/kiwi/core/test/sesame/demo-data.foaf | 62 -
.../marmotta-core/src/test/resources/logback.xml | 2 +-
.../marmotta/platform/core/test/literal/lmf2.png | Bin 0 -> 52680 bytes
.../platform/core/test/sesame/demo-data.foaf | 62 +
.../endpoint/LinkedDataEndpointServiceImpl.java | 2 +-
.../services/ldcache/LDCacheSailProvider.java | 12 +-
.../webservices/LinkedDataCachingWebService.java | 2 +-
.../newmedialab/lmf/ldpath/backend/LMFBackend.java | 2 +-
.../ldpath/model/functions/ContentFunction.java | 2 +-
.../lmf/ldpath/services/LDPathServiceImpl.java | 2 +-
.../ldpath/webservices/LDPathUtilWebService.java | 6 +-
.../lmf/ldpath/webservices/LDPathWebService.java | 2 +-
.../reasoner/services/ReasoningSailProvider.java | 8 +-
.../security/filters/LMFAccessControlFilter.java | 8 +-
.../lmf/security/services/SecurityServiceImpl.java | 4 +-
.../lmf/sparql/api/sparql/SparqlService.java | 6 +-
.../sparql/services/sparql/SparqlServiceImpl.java | 8 +-
.../sparqlhtml/SPARQLBooleanHTMLWriter.java | 4 +-
.../sparqlhtml/SPARQLResultsHTMLWriter.java | 4 +-
.../lmf/sparql/webservices/SparqlWebService.java | 8 +-
.../at/newmedialab/lmf/ssl/api/SSLService.java | 2 +-
.../lmf/ssl/services/SSLServiceImpl.java | 2 +-
.../newmedialab/lmf/user/api/AccountService.java | 2 +-
.../lmf/user/filters/LMFAuthenticationFilter.java | 12 +-
.../lmf/user/services/AccountServiceImpl.java | 14 +-
.../user/services/AuthenticationServiceImpl.java | 6 +-
.../services/UserConfigurationServiceImpl.java | 2 +-
.../lmf/user/services/auth/LdapAuthProvider.java | 2 +-
.../user/webservices/UserManagementWebService.java | 4 +-
.../lmf/user/webservices/UserWebService.java | 8 +-
.../lmf/versioning/filter/MementoFilter.java | 4 +-
.../lmf/versioning/io/HtmlVersionSerializer.java | 2 +-
.../lmf/versioning/io/LinkVersionSerializer.java | 2 +-
.../services/VersioningSailProvider.java | 8 +-
.../versioning/webservices/MementoWebService.java | 6 +-
.../webservices/VersioningWebService.java | 6 +-
422 files changed, 23343 insertions(+), 23343 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
index 6b3235e..9ce3eca 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
@@ -46,7 +46,7 @@
</encoder>
</appender>
- <logger name="kiwi.core" level="INFO" />
+ <logger name="org.apache.marmotta.platform.core" level="INFO" />
<logger name="kiwi.reasoner" level="INFO" />
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index fd0d24b..1d0058b 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -27,7 +27,7 @@
<!-- enable LMF custom JNDI implementation -->
<listener>
- <listener-class>kiwi.core.jndi.LMFJndiListener</listener-class>
+ <listener-class>org.apache.marmotta.platform.core.jndi.LMFJndiListener</listener-class>
</listener>
@@ -39,7 +39,7 @@
<!-- Initialise the KiWi system -->
<listener>
- <listener-class>kiwi.core.servlet.KiWiPreStartupListener</listener-class>
+ <listener-class>org.apache.marmotta.platform.core.servlet.KiWiPreStartupListener</listener-class>
</listener>
@@ -61,7 +61,7 @@
-->
<filter>
<filter-name>KiWiPreStartupFilter</filter-name>
- <filter-class>kiwi.core.servlet.KiWiPreStartupFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.KiWiPreStartupFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>KiWiPreStartupFilter</filter-name>
@@ -73,7 +73,7 @@
<!-- handle OPTIONS requests -->
<filter>
<filter-name>LMFOptionsFilter</filter-name>
- <filter-class>kiwi.core.servlet.LMFOptionsFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.LMFOptionsFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>LMFOptionsFilter</filter-name>
@@ -85,7 +85,7 @@
<!-- Serve static resources from file system and from .jar files of the respective modules -->
<filter>
<filter-name>KiWiResourceFilter</filter-name>
- <filter-class>kiwi.core.servlet.KiWiResourceFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.KiWiResourceFilter</filter-class>
<init-param>
<!-- cache resources loaded from module jar files? -->
<param-name>kiwi.resourceCaching</param-name>
@@ -100,7 +100,7 @@
<filter>
<filter-name>KiWiTransactionFilter</filter-name>
- <filter-class>kiwi.core.servlet.KiWiTransactionFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.KiWiTransactionFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>KiWiTransactionFilter</filter-name>
@@ -113,7 +113,7 @@
<!-- H2 Configuration -->
<filter>
<filter-name>KiWiH2ConsoleFilter</filter-name>
- <filter-class>kiwi.core.servlet.KiWiH2ConsoleFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.KiWiH2ConsoleFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>KiWiH2ConsoleFilter</filter-name>
@@ -157,7 +157,7 @@
</filter-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
- <param-value>kiwi.core.webservices.CoreApplication</param-value>
+ <param-value>org.apache.marmotta.platform.core.webservices.CoreApplication</param-value>
</init-param>
</filter>
@@ -174,7 +174,7 @@
<filter>
<filter-name>KiWiPostStartupFilter</filter-name>
<filter-class>
- kiwi.core.servlet.KiWiPostStartupFilter
+ org.apache.marmotta.platform.core.servlet.KiWiPostStartupFilter
</filter-class>
</filter>
<filter-mapping>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp
index c9f0e9c..656abb7 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/index.jsp
@@ -18,8 +18,8 @@
#set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
-<%@ page import="kiwi.core.api.config.ConfigurationService" %>
-<%@ page import="kiwi.core.util.KiWiContext" %>
+<%@ page import="org.apache.marmotta.platform.core.api.config.ConfigurationService" %>
+<%@ page import="org.apache.marmotta.platform.core.util.KiWiContext" %>
<%--
~ Copyright (c) 2012 Salzburg Research.
~
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/test-persistence.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/test-persistence.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/test-persistence.xml
index 2de4af0..626b48f 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/test-persistence.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/test-persistence.xml
@@ -34,19 +34,19 @@
<persistence-unit name="KiWi" transaction-type="RESOURCE_LOCAL">
- <class>kiwi.core.model.rdf.KiWiNode</class>
- <class>kiwi.core.model.rdf.KiWiResource</class>
- <class>kiwi.core.model.rdf.KiWiUriResource</class>
- <class>kiwi.core.model.rdf.KiWiAnonResource</class>
- <class>kiwi.core.model.rdf.KiWiLiteral</class>
- <class>kiwi.core.model.rdf.KiWiStringLiteral</class>
- <class>kiwi.core.model.rdf.KiWiIntLiteral</class>
- <class>kiwi.core.model.rdf.KiWiDoubleLiteral</class>
- <class>kiwi.core.model.rdf.KiWiTextContentLiteral</class>
- <class>kiwi.core.model.rdf.KiWiMediaContentLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiNode</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiResource</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiUriResource</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiAnonResource</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiStringLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiIntLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiDoubleLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiTextContentLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiMediaContentLiteral</class>
- <class>kiwi.core.model.rdf.KiWiNamespace</class>
- <class>kiwi.core.model.rdf.KiWiTriple</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiNamespace</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiTriple</class>
<class>${package}.user.model.UserAccount</class>
<!--<class>kiwi.core.model.user.KiWiUser</class>-->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/WEB-INF/test-web.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/WEB-INF/test-web.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/WEB-INF/test-web.xml
index ee5f013..91a1517 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/WEB-INF/test-web.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/WEB-INF/test-web.xml
@@ -35,7 +35,7 @@
<filter>
<filter-name>KiWiInitFilter</filter-name>
- <filter-class>kiwi.core.servlet.KiWiResourceFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.KiWiResourceFilter</filter-class>
<init-param>
<param-name>kiwi.home</param-name>
<param-value>/tmp/kiwi-test</param-value>
@@ -162,7 +162,7 @@
</filter-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
- <param-value>kiwi.core.webservices.CoreApplication</param-value>
+ <param-value>org.apache.marmotta.platform.core.webservices.CoreApplication</param-value>
</init-param>
</filter>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/logback.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/logback.xml
index 9ef7084..e29a317 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/logback.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/logback.xml
@@ -53,7 +53,7 @@
-->
- <logger name="kiwi.core" level="DEBUG" />
+ <logger name="org.apache.marmotta.platform.core" level="DEBUG" />
<logger name="kiwi.test" level="DEBUG" />
<logger name="org.hibernate" level="INFO" />
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/config/ConfigurationIT.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/config/ConfigurationIT.java b/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/config/ConfigurationIT.java
index 24610a0..c8b5651 100644
--- a/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/config/ConfigurationIT.java
+++ b/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/config/ConfigurationIT.java
@@ -21,8 +21,8 @@ import at.newmedialab.lmf.client.clients.ConfigurationClient;
import at.newmedialab.lmf.client.exception.LMFClientException;
import at.newmedialab.lmf.client.model.config.Configuration;
import com.google.common.collect.Lists;
-import kiwi.core.test.base.JettyLMF;
-import kiwi.core.webservices.config.ConfigurationWebService;
+import org.apache.marmotta.platform.core.test.base.JettyLMF;
+import org.apache.marmotta.platform.core.webservices.config.ConfigurationWebService;
import org.hamcrest.Matchers;
import org.junit.AfterClass;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/io/ImportIT.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/io/ImportIT.java b/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/io/ImportIT.java
index f0884d6..c66b948 100644
--- a/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/io/ImportIT.java
+++ b/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/io/ImportIT.java
@@ -21,10 +21,10 @@ import at.newmedialab.lmf.client.clients.ImportClient;
import at.newmedialab.lmf.client.clients.ResourceClient;
import at.newmedialab.lmf.client.exception.LMFClientException;
import at.newmedialab.lmf.client.model.meta.Metadata;
-import kiwi.core.test.base.JettyLMF;
-import kiwi.core.webservices.io.ImportWebService;
-import kiwi.core.webservices.resource.MetaWebService;
-import kiwi.core.webservices.resource.ResourceWebService;
+import org.apache.marmotta.platform.core.test.base.JettyLMF;
+import org.apache.marmotta.platform.core.webservices.io.ImportWebService;
+import org.apache.marmotta.platform.core.webservices.resource.MetaWebService;
+import org.apache.marmotta.platform.core.webservices.resource.ResourceWebService;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/ldpath/LDPathIT.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/ldpath/LDPathIT.java b/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/ldpath/LDPathIT.java
index 0f74081..054a8d7 100644
--- a/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/ldpath/LDPathIT.java
+++ b/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/ldpath/LDPathIT.java
@@ -20,9 +20,9 @@ import at.newmedialab.lmf.client.ClientConfiguration;
import at.newmedialab.lmf.client.clients.LDPathClient;
import at.newmedialab.lmf.client.model.rdf.RDFNode;
import at.newmedialab.lmf.ldpath.webservices.LDPathWebService;
-import kiwi.core.api.importer.ImportService;
-import kiwi.core.exception.io.LMFImportException;
-import kiwi.core.test.base.JettyLMF;
+import org.apache.marmotta.platform.core.api.importer.ImportService;
+import org.apache.marmotta.platform.core.exception.io.LMFImportException;
+import org.apache.marmotta.platform.core.test.base.JettyLMF;
import org.hamcrest.CoreMatchers;
import org.junit.AfterClass;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/sparql/SPARQLIT.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/sparql/SPARQLIT.java b/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/sparql/SPARQLIT.java
index 442f268..9a56dcc 100644
--- a/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/sparql/SPARQLIT.java
+++ b/client/marmotta-client-java/src/test/java/at/newmedialab/lmf/client/test/sparql/SPARQLIT.java
@@ -20,9 +20,9 @@ import at.newmedialab.lmf.client.ClientConfiguration;
import at.newmedialab.lmf.client.clients.SPARQLClient;
import at.newmedialab.lmf.client.model.sparql.SPARQLResult;
import at.newmedialab.lmf.client.test.ldpath.LDPathIT;
-import kiwi.core.api.importer.ImportService;
-import kiwi.core.exception.io.LMFImportException;
-import kiwi.core.test.base.JettyLMF;
+import org.apache.marmotta.platform.core.api.importer.ImportService;
+import org.apache.marmotta.platform.core.exception.io.LMFImportException;
+import org.apache.marmotta.platform.core.test.base.JettyLMF;
import org.hamcrest.Matcher;
import org.junit.AfterClass;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/annotations/RDF.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/annotations/RDF.java b/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/annotations/RDF.java
index 3bb0e21..6f789ee 100644
--- a/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/annotations/RDF.java
+++ b/commons/sesame-tools-facading/src/main/java/org/apache/marmotta/commons/sesame/facading/annotations/RDF.java
@@ -29,14 +29,14 @@ import java.lang.annotation.Target;
* The TripleStore class checks for <b>RDF</b> annotations
* during persist and load. <br>
* Classes using this annotation must currently implement the
- * {@link kiwi.core.model.rdf.KiWiEntity} interface, so that the
+ * {@link org.apache.marmotta.platform.core.model.rdf.KiWiEntity} interface, so that the
* KnowledgeSpace has access to the resource associated with the
* entity.<br>
* This is a runtime annotation and it is applicable on fields
* and on getter methods.<br>
*
* @author Sebastian Schaffert
- * @see kiwi.core.model.rdf.KiWiEntity
+ * @see org.apache.marmotta.platform.core.model.rdf.KiWiEntity
*/
@Retention(RetentionPolicy.RUNTIME)
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/launchers/marmotta-webapp/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/resources/logback.xml b/launchers/marmotta-webapp/src/main/resources/logback.xml
index f50bd49..ae6ca77 100644
--- a/launchers/marmotta-webapp/src/main/resources/logback.xml
+++ b/launchers/marmotta-webapp/src/main/resources/logback.xml
@@ -27,7 +27,7 @@
</encoder>
</appender>
- <logger name="kiwi.core" level="INFO" />
+ <logger name="org.apache.marmotta.platform.core" level="INFO" />
<logger name="kiwi.reasoner" level="INFO" />
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
index 8859823..f4c5356 100644
--- a/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/launchers/marmotta-webapp/src/main/webapp/WEB-INF/web.xml
@@ -24,7 +24,7 @@
<!-- enable LMF custom JNDI implementation -->
<listener>
- <listener-class>kiwi.core.jndi.LMFJndiListener</listener-class>
+ <listener-class>org.apache.marmotta.platform.core.jndi.LMFJndiListener</listener-class>
</listener>
@@ -36,7 +36,7 @@
<!-- Initialise the KiWi system -->
<listener>
- <listener-class>kiwi.core.servlet.KiWiPreStartupListener</listener-class>
+ <listener-class>org.apache.marmotta.platform.core.servlet.KiWiPreStartupListener</listener-class>
</listener>
@@ -58,7 +58,7 @@
-->
<filter>
<filter-name>KiWiPreStartupFilter</filter-name>
- <filter-class>kiwi.core.servlet.KiWiPreStartupFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.KiWiPreStartupFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>KiWiPreStartupFilter</filter-name>
@@ -70,7 +70,7 @@
<!-- handle OPTIONS requests -->
<filter>
<filter-name>LMFOptionsFilter</filter-name>
- <filter-class>kiwi.core.servlet.LMFOptionsFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.LMFOptionsFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>LMFOptionsFilter</filter-name>
@@ -82,7 +82,7 @@
<!-- Serve static resources from file system and from .jar files of the respective modules -->
<filter>
<filter-name>KiWiResourceFilter</filter-name>
- <filter-class>kiwi.core.servlet.KiWiResourceFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.KiWiResourceFilter</filter-class>
<init-param>
<!-- cache resources loaded from module jar files? -->
<param-name>kiwi.resourceCaching</param-name>
@@ -99,7 +99,7 @@
<!-- H2 Configuration -->
<filter>
<filter-name>KiWiH2ConsoleFilter</filter-name>
- <filter-class>kiwi.core.servlet.KiWiH2ConsoleFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.KiWiH2ConsoleFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>KiWiH2ConsoleFilter</filter-name>
@@ -143,7 +143,7 @@
</filter-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
- <param-value>kiwi.core.webservices.CoreApplication</param-value>
+ <param-value>org.apache.marmotta.platform.core.webservices.CoreApplication</param-value>
</init-param>
</filter>
@@ -160,7 +160,7 @@
<filter>
<filter-name>KiWiPostStartupFilter</filter-name>
<filter-class>
- kiwi.core.servlet.KiWiPostStartupFilter
+ org.apache.marmotta.platform.core.servlet.KiWiPostStartupFilter
</filter-class>
</filter>
<filter-mapping>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/launchers/marmotta-webapp/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/index.jsp b/launchers/marmotta-webapp/src/main/webapp/index.jsp
index 6038c3e..379fd0c 100644
--- a/launchers/marmotta-webapp/src/main/webapp/index.jsp
+++ b/launchers/marmotta-webapp/src/main/webapp/index.jsp
@@ -15,8 +15,8 @@
limitations under the License.
--%>
-<%@ page import="kiwi.core.api.config.ConfigurationService" %>
-<%@ page import="kiwi.core.util.KiWiContext" %>
+<%@ page import="org.apache.marmotta.platform.core.api.config.ConfigurationService" %>
+<%@ page import="org.apache.marmotta.platform.core.util.KiWiContext" %>
<%--
~ Copyright (c) 2012 Salzburg Research.
~
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/launchers/marmotta-webapp/src/test/resources/META-INF/test-persistence.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/META-INF/test-persistence.xml b/launchers/marmotta-webapp/src/test/resources/META-INF/test-persistence.xml
index a5e7216..ad9f8c0 100644
--- a/launchers/marmotta-webapp/src/test/resources/META-INF/test-persistence.xml
+++ b/launchers/marmotta-webapp/src/test/resources/META-INF/test-persistence.xml
@@ -31,19 +31,19 @@
<persistence-unit name="KiWi" transaction-type="RESOURCE_LOCAL">
- <class>kiwi.core.model.rdf.KiWiNode</class>
- <class>kiwi.core.model.rdf.KiWiResource</class>
- <class>kiwi.core.model.rdf.KiWiUriResource</class>
- <class>kiwi.core.model.rdf.KiWiAnonResource</class>
- <class>kiwi.core.model.rdf.KiWiLiteral</class>
- <class>kiwi.core.model.rdf.KiWiStringLiteral</class>
- <class>kiwi.core.model.rdf.KiWiIntLiteral</class>
- <class>kiwi.core.model.rdf.KiWiDoubleLiteral</class>
- <class>kiwi.core.model.rdf.KiWiTextContentLiteral</class>
- <class>kiwi.core.model.rdf.KiWiMediaContentLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiNode</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiResource</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiUriResource</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiAnonResource</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiStringLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiIntLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiDoubleLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiTextContentLiteral</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiMediaContentLiteral</class>
- <class>kiwi.core.model.rdf.KiWiNamespace</class>
- <class>kiwi.core.model.rdf.KiWiTriple</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiNamespace</class>
+ <class>org.apache.marmotta.platform.core.model.rdf.KiWiTriple</class>
<class>at.newmedialab.lmf.user.model.UserAccount</class>
<!--<class>kiwi.core.model.user.KiWiUser</class>-->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml b/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
index 8618b68..6b545e0 100644
--- a/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
+++ b/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
@@ -32,7 +32,7 @@
<filter>
<filter-name>KiWiInitFilter</filter-name>
- <filter-class>kiwi.core.servlet.KiWiResourceFilter</filter-class>
+ <filter-class>org.apache.marmotta.platform.core.servlet.KiWiResourceFilter</filter-class>
<init-param>
<param-name>kiwi.home</param-name>
<param-value>/tmp/kiwi-test</param-value>
@@ -159,7 +159,7 @@
</filter-class>
<init-param>
<param-name>javax.ws.rs.Application</param-name>
- <param-value>kiwi.core.webservices.CoreApplication</param-value>
+ <param-value>org.apache.marmotta.platform.core.webservices.CoreApplication</param-value>
</init-param>
</filter>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/launchers/marmotta-webapp/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/logback.xml b/launchers/marmotta-webapp/src/test/resources/logback.xml
index da002ac..7cf9566 100644
--- a/launchers/marmotta-webapp/src/test/resources/logback.xml
+++ b/launchers/marmotta-webapp/src/test/resources/logback.xml
@@ -50,7 +50,7 @@
-->
- <logger name="kiwi.core" level="DEBUG" />
+ <logger name="org.apache.marmotta.platform.core" level="DEBUG" />
<logger name="kiwi.test" level="DEBUG" />
<logger name="org.hibernate" level="INFO" />
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResultIterator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResultIterator.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResultIterator.java
index 11ec6ac..21b0c30 100644
--- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResultIterator.java
+++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/model/query/QueryResultIterator.java
@@ -22,8 +22,8 @@ import java.sql.SQLException;
/**
* An iterator over query results. Allows lazy iterating over the database results of the query.
*
- * @see kiwi.core.api.persistence.ResultIterator
- * @see kiwi.core.services.persistence.PersistenceServiceImpl#evaluateNamedCursorQuery(String, java.util.Map)
+ * @see org.apache.marmotta.platform.core.api.persistence.ResultIterator
+ * @see org.apache.marmotta.platform.core.services.persistence.PersistenceServiceImpl#evaluateNamedCursorQuery(String, java.util.Map)
*
* <p/>
* Author: Sebastian Schaffert
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sqlmapper/LMFNativeEvaluationStrategy.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sqlmapper/LMFNativeEvaluationStrategy.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sqlmapper/LMFNativeEvaluationStrategy.java
index fbe975e..2960ded 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sqlmapper/LMFNativeEvaluationStrategy.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/sqlmapper/LMFNativeEvaluationStrategy.java
@@ -17,12 +17,12 @@ package at.newmedialab.lmf.sparql.services.evaluation.sql;
import at.newmedialab.sesame.commons.model.LiteralCommons;
import info.aduna.iteration.CloseableIteration;
-import kiwi.core.api.config.ConfigurationService;
-import kiwi.core.api.persistence.PersistenceService;
-import kiwi.core.api.triplestore.SesameService;
-import kiwi.core.events.DBInitialisationEvent;
-import kiwi.core.model.rdf.KiWiNode;
-import kiwi.core.services.sail.LMFEvaluationStrategy;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.persistence.PersistenceService;
+import org.apache.marmotta.platform.core.api.triplestore.SesameService;
+import org.apache.marmotta.platform.core.events.DBInitialisationEvent;
+import org.apache.marmotta.platform.core.model.rdf.KiWiNode;
+import org.apache.marmotta.platform.core.services.sail.LMFEvaluationStrategy;
import org.apache.commons.validator.routines.UrlValidator;
import org.jooq.Cursor;
import org.jooq.Record;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/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 5a4cf5c..f5f8684 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
@@ -23,11 +23,11 @@ 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;
-import kiwi.core.api.triplestore.ResourceService;
-import kiwi.core.model.rdf.KiWiNode;
-import kiwi.core.model.rdf.KiWiUriResource;
-import kiwi.core.util.KiWiContext;
+import org.apache.marmotta.platform.core.api.config.ConfigurationService;
+import org.apache.marmotta.platform.core.api.triplestore.ResourceService;
+import org.apache.marmotta.platform.core.model.rdf.KiWiNode;
+import org.apache.marmotta.platform.core.model.rdf.KiWiUriResource;
+import org.apache.marmotta.platform.core.util.KiWiContext;
import org.jooq.*;
import org.jooq.conf.RenderNameStyle;
import org.jooq.conf.StatementType;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-core/src/main/java/kiwi/core/api/cache/CachingService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/api/cache/CachingService.java b/platform/marmotta-core/src/main/java/kiwi/core/api/cache/CachingService.java
deleted file mode 100644
index 60e485a..0000000
--- a/platform/marmotta-core/src/main/java/kiwi/core/api/cache/CachingService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package kiwi.core.api.cache;
-
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Ehcache;
-
-import javax.enterprise.inject.spi.InjectionPoint;
-
-/**
- * Add file description here!
- * <p/>
- * User: sschaffe
- */
-public interface CachingService {
-
- public Ehcache getCache(InjectionPoint injectionPoint);
-
- public String[] getCacheNames();
-
- public void clearAll();
-
- Ehcache getCacheByName(String cacheName);
-
- CacheManager getCacheManager();
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-core/src/main/java/kiwi/core/api/config/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/api/config/ConfigurationService.java b/platform/marmotta-core/src/main/java/kiwi/core/api/config/ConfigurationService.java
deleted file mode 100644
index 5edf972..0000000
--- a/platform/marmotta-core/src/main/java/kiwi/core/api/config/ConfigurationService.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package kiwi.core.api.config;
-
-import org.apache.commons.configuration.Configuration;
-
-import javax.servlet.ServletContext;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Manage the system configuration.
- *
- * @author Sebastian Schaffert
- * @author Sergio Fernández
- *
- */
-public interface ConfigurationService {
-
- static final String RESOURCE_PATH = "resource";
-
- static final String ANONYMOUS_PATH = "anon";
-
- static final String META_PATH = "meta";
-
- static final String CONTENT_PATH = "content";
-
- static final String INSPECT_PATH = "inspect";
-
- static final String LDP_PATH = "ldp"; //to be removed
- static final String CONTAINER_PATH = "container";
-
- @Deprecated
- static final String KNOWLEDGESPACE_PATH = "knowledgedspace";
-
- static final String CONTEXT_PATH = "context";
-
- static final String CONTEXT_DEFAULT = "default";
-
- static final String CONTEXT_CACHE = "cache";
-
- static final String CONTEXT_ENHANCEMENT = "enhanced";
-
- static final String CONTEXT_INFERRED = "inferred";
-
- static final String CONTEXT_SYSTEM = "system";
-
- /**
- * Get the base URI of the system.
- * The base URI is used by the LMF to create local resource URIs. In this way, all LMF resources
- * are "Linked Open Data" compatible.
- *
- * The base URI is calculated based on the request URI given by the user.
- * In most cases it is the same as {@link #getServerUri()}, but this is not guaranteed.
- *
- * @return the base URI
- */
- String getBaseUri();
-
- /**
- * Get the base path of the system, which is the relative path from the server host.
- * For example, in the case of http://localhost:8080/LMF, /LMF would be returned as the path.
- * @return a String representing the path
- */
- String getPath();
-
- /**
- * Get the server URI of the system.
- * The server URI is used to accesses the
- * server that runs the KiWi (and SOLR) applications.
- *
- * Can be used to compute the paths of the web services or
- * other applications relative to the current application.
- *
- * Computed like the base URI.
- *
- * @return the server URI
- */
- String getServerUri();
-
- /**
- * List all configuration keys defined for the system configuration of KiWi.
- * @return
- */
- List<String> listConfigurationKeys();
-
- /**
- * List all configuration keys defined for the system configuration of KiWi having prefix.
- * @param prefix the prefix of keys that should be returned
- * @return
- */
- List<String> listConfigurationKeys(String prefix);
-
- /**
- * Check whether a certain configuration property is set.
- * @param key
- * @return
- */
- boolean isConfigurationSet(String key);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, a new one is
- * created with empty value (returns null).
- *
- * @param key unique configuration key for lookup
- * @return a configuration object with either the configured value or null as value
- */
- Object getConfiguration(String key);
-
- /**
- * Return the comment for the configuration with the given key as string. If there is no such
- * configuration, null is returned
- *
- * @param key unique configuration key for lookup
- * @return a string describing the configuration option or null if no comment was given
- */
- String getComment(String key);
-
- /**
- * Return the comment for the configuration with the given key as string. If there is no such
- * configuration, null is returned
- * @param key unique configuration key for lookup
- * @return a string describing the type for key or DEFAULT_TYPE (String) if no type was given
- */
- String getType(String key);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, a new one is
- * created with empty value (returns null).
- *
- * @param key unique configuration key for lookup
- * @return a configuration object with either the configured value or null as value
- */
- String getStringConfiguration(String key);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, a new one is
- * created using the provided defaultValue as string value.
- *
- * @param key unique configuration key for lookup
- * @param defaultValue default value if configuration not found
- * @return a configuration object with either the configured value or defaultValue
- */
- String getStringConfiguration(String key, String defaultValue);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, 0.0 is returned
- *
- * @param key unique configuration key for lookup
- * @return a double value with either the configured value or 0.0
- */
-
- double getDoubleConfiguration(String key);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, a new one is
- * created using the provided defaultValue as double value.
- *
- * @param key unique configuration key for lookup
- * @param defaultValue default value if configuration not found
- * @return a configuration object with either the configured value or defaultValue
- */
- double getDoubleConfiguration(String key, double defaultValue);
-
- /**
- * Set the system configuration with the given key to the given double value.
- *
- * @param key
- * @param value
- */
- void setDoubleConfiguration(String key, double value);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, 0 is returned
- *
- * @param key unique configuration key for lookup
- * @return a int value with either the configured value or 0
- */
- int getIntConfiguration(String key);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, a new one is
- * created using the provided defaultValue as double value.
- *
- * @param key unique configuration key for lookup
- * @param defaultValue default value if configuration not found
- * @return a configuration object with either the configured value or defaultValue
- */
- int getIntConfiguration(String key, int defaultValue);
-
- /**
- * Set the system configuration with the given key to the given int value.
- *
- * @param key
- * @param value
- */
- void setIntConfiguration(String key, int value);
-
-
-
- /**
- * Get the configuration for the given key. If there is no such configuration, 0 is returned
- *
- * @param key unique configuration key for lookup
- * @return a int value with either the configured value or 0
- */
- long getLongConfiguration(String key);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, a new one is
- * created using the provided defaultValue as double value.
- *
- * @param key unique configuration key for lookup
- * @param defaultValue default value if configuration not found
- * @return a configuration object with either the configured value or defaultValue
- */
- long getLongConfiguration(String key, long defaultValue);
-
- /**
- * Set the system configuration with the given key to the given int value.
- *
- * @param key
- * @param value
- */
- void setLongConfiguration(String key, long value);
-
-
- /**
- * Get the configuration for the given key. If there is no such configuration, true is returned
- *
- * @param key unique configuration key for lookup
- * @return a int value with either the configured value or true
- */
- boolean getBooleanConfiguration(String key);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, a new one is
- * created using the provided defaultValue as boolean value.
- *
- * @param key unique configuration key for lookup
- * @param defaultValue default value if configuration not found
- * @return a configuration object with either the configured value or defaultValue
- */
- boolean getBooleanConfiguration(String key, boolean defaultValue);
-
- /**
- * Set the system configuration with the given key to the given boolean value.
- *
- * @param key
- * @param value
- */
- void setBooleanConfiguration(String key, boolean value);
-
- /**
- * Get the configuration for the given key as properties. The configuration is persisted in the following form:
- * key = k=v,k=v,k=v
- *
- * @param key unique configuration key for lookup
- * @return properties with the configured key value pairs
- */
- Properties getPropertiesConfiguration(String key);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, an empty list is returned
- *
- * @param key unique configuration key for lookup
- * @return a list with either the configured value or empty list
- */
-
- List<String> getListConfiguration(String key);
-
- /**
- * Get the configuration for the given key. If there is no such configuration, a new one is
- * created using the provided defaultValue as double value.
- *
- * @param key unique configuration key for lookup
- * @param defaultValue default value if configuration not found
- * @return a configuration object with either the configured value or defaultValue
- */
- List<String> getListConfiguration(String key, List<String> defaultValue);
-
- /**
- * Set the system configuration with the given key to the given int value.
- *
- * @param key
- * @param value
- */
- void setListConfiguration(String key, List<String> value);
-
- /**
- * Set a configuration value without firing an event. This is in rare cases needed to avoid
- * propagation of events.
- *
- * @param key
- * @param value
- */
- void setConfigurationWithoutEvent(String key, Object value);
-
-
- /**
- * Set the configuration "key" to the string value "value".
- * @param key
- * @param value
- */
- void setConfiguration(String key, Object value);
-
- /**
- * Set the configuration "key" to the string value "value".
- * @param key
- * @param value
- */
- void setConfiguration(String key, String value);
-
- /**
- * Set the configuration "key" to the string value "value".
- * @param key
- * @param values
- */
- void setConfiguration(String key, List<String> values);
-
- /**
- * Remove the configuration identified by "key" from the database.
- * @param key
- */
- void removeConfiguration(String key);
-
- /**
- * @return a string representation of work direction
- */
- String getWorkDir();
-
- /**
- * Initialise the configuration service using the given home directory, and optionally a configuration override
- * @param lmfHome
- * @param override
- */
- void initialize(String lmfHome, Configuration override);
-
-
- /**
- * Set a flag at runtime that is discarded on system shutdown; used e.g. to indicate that certain
- * processes have already been carried out.
- * @param value
- */
- void setRuntimeFlag(String flag,boolean value);
-
- /**
- * Return the value of the runtime flag passed as argument.
- * @param flag
- * @return
- */
- boolean getRuntimeFlag(String flag);
-
- /**
- * Set the LMF_HOME value to the correct path. Used during the initialisation process.
- *
- * @param home
- */
- void setLMFHome(String home);
-
- /**
- * Return the value of the LMF_HOME setting. Used during the initialisation process.
- * @return
- */
- String getLMFHome();
-
- /**
- * Get the base URI for contexts
- * @return
- */
- String getBaseContext();
-
- /**
- * Return the context used for storing system information.
- *
- * @return a URI representing the system context
- */
- String getSystemContext();
-
- /**
- * Get the uri of the inferred context
- *
- * @return uri of this inferred context
- */
- String getInferredContext();
-
- /**
- * Get the uri of the default context
- *
- * @return
- */
- String getDefaultContext();
-
- /**
- * Get the uri of the context used for caching linked data
- * @return
- */
- String getCacheContext();
-
- /**
- * Get the uri of the context used for enhancements.
- *
- * @return
- */
- String getEnhancerContex();
-
- /**
- * Batch update.
- *
- * @param values
- * @see #setConfiguration(String, String)
- */
- void setConfigurations(Map<String, ?> values);
-
- /**
- * Set type for a configuration key
- *
- * @param key key for configuration fields
- * @param type type for configuratino field
- */
- void setType(String key, String type);
-
- /**
- * Set type for a configuration key
- *
- * @param key key for configuration fields
- * @param comment type for configuratino field
- */
- void setComment(String key, String comment);
-
- /**
- * Pass the servlet context over to the configuration service to provide runtime information about
- * the environment to the rest of the system.
- * @param context
- */
- void setServletContext(ServletContext context);
-
- /**
- * Get the servlet context used when initialising the system
- * @return
- */
- ServletContext getServletContext();
-
- /**
- * Get a string describing the type and version of the application server running the LMF.
- *
- * @return
- */
- String getServerInfo();
-
- /**
- * Try figuring out on which port the server is running ...
- */
- int getServerPort();
-
- /**
- * Try figuring out the local name of the server
- * @return
- */
- String getServerName();
-
- /**
- * Return the context path of this application
- * @return
- */
- String getServerContext();
-
- /**
- * Return true if Jetty 6.x is detected; tests for presence of class org.mortbay.jetty.Server
- * @return
- */
- boolean isJetty6();
-
- /**
- * Return true if Jetty 7.x is detected; tests for presence of class org.eclipse.jetty.server.Server
- * @return
- */
- boolean isJetty7();
-
- /**
- * Return true if Tomcat 6.x is detected; tests for presence of class org.apache.catalina.ServerFactory
- * @return
- */
- boolean isTomcat6();
-
- /**
- * Return true if Tomcat 7.x is detected; tests for presence of class org.apache.catalina.CatalinaFactory
- * @return
- */
- boolean isTomcat7();
-
- /**
- * Shutdown the application server running this web application; tries to determine the kind of server we are
- * running under and send the proper shutdown signal before exiting with System.exit
- */
- void performServerShutdown();
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-core/src/main/java/kiwi/core/api/config/DependenciesService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/api/config/DependenciesService.java b/platform/marmotta-core/src/main/java/kiwi/core/api/config/DependenciesService.java
deleted file mode 100644
index f0e118e..0000000
--- a/platform/marmotta-core/src/main/java/kiwi/core/api/config/DependenciesService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package kiwi.core.api.config;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Provides meta information about the current dependencies
- *
- * @author Sergio Fernández
- *
- */
-public interface DependenciesService {
-
- String PATH = "/dependencies.txt";
- String GROUP = "groupId";
- String ARTIFACT = "artifactId";
- String VERSION = "version";
-
- List<Map<String, String>> getArtifacs();
-
- List<Map<String, String>> getArtifacs(String groupId);
-
- String getVersion(String groupId, String artifactId);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-core/src/main/java/kiwi/core/api/content/ContentReader.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/api/content/ContentReader.java b/platform/marmotta-core/src/main/java/kiwi/core/api/content/ContentReader.java
deleted file mode 100644
index 122bad0..0000000
--- a/platform/marmotta-core/src/main/java/kiwi/core/api/content/ContentReader.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package kiwi.core.api.content;
-
-import org.openrdf.model.Resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * API for plugins that can read content from some source. All implementing classes must provide
- * the getContentData method that returns the byte content for a resource.
- *
- * <p/>
- * User: Sebastian Schaffert
- */
-public interface ContentReader {
-
- /**
- * Return the name of the content reader. Used to identify and display the content reader to admin users.
- * @return
- */
- public String getName();
-
- /**
- * Retrieve the content of the specified mime type for the specified resource. Returns a byte array containing
- * the byte data of the content, or null, indicating that a content of the specified mime type does not exist
- * for the resource.
- * <p/>
- * Specialised content readers could even transform the resource content from its original form to the new
- * mimetype, e.g. converting an image from JPEG to PNG.
- *
- * @param resource the resource for which to return the content
- * @param mimetype the mime type to retrieve of the content
- * @return a byte array containing the content of the resource, or null if no content exists
- */
- public byte[] getContentData(Resource resource, String mimetype) throws IOException;
-
-
- /**
- * Retrieve the content of the specified mime type for the specified resource. Returns a input stream containing
- * the byte data of the content, or null, indicating that a content of the specified mime type does not exist
- * for the resource.
- * <p/>
- * Specialised content readers could even transform the resource content from its original form to the new
- * mimetype, e.g. converting an image from JPEG to PNG.
- * <p/>
- * This method is preferrable for resources with large amounts of data.
- *
- * @param resource the resource for which to return the content
- * @param mimetype the mime type to retrieve of the content
- * @return a InputStream containing the content of the resource, or null if no content exists
- */
- public InputStream getContentStream(Resource resource, String mimetype) throws IOException;
-
-
- /**
- * Check whether the specified resource has content of the specified mimetype for this reader. Returns true
- * in this case, false otherwise.
- *
- * @param resource the resource to check
- * @param mimetype the mimetype to look for
- * @return true if content of this mimetype is associated with the resource, false otherwise
- */
- public boolean hasContent(Resource resource, String mimetype);
-
-
- /**
- * Return the MIME content type of the resource passed as argument.
- *
- * @param resource resource for which to return the content type
- * @return the MIME content type of the resource
- */
- public String getContentType(Resource resource);
-
-
- /**
- * Return the number of bytes the content of this resource contains.
- *
- * @param resource resource for which to return the content length
- * @return byte count for the resource content
- */
- public long getContentLength(Resource resource, String mimetype);
-}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/4d3eebdd/platform/marmotta-core/src/main/java/kiwi/core/api/content/ContentService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/kiwi/core/api/content/ContentService.java b/platform/marmotta-core/src/main/java/kiwi/core/api/content/ContentService.java
deleted file mode 100644
index 57478a8..0000000
--- a/platform/marmotta-core/src/main/java/kiwi/core/api/content/ContentService.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Copyright (C) 2013 Salzburg Research.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package kiwi.core.api.content;
-
-import kiwi.core.exception.LMFException;
-import kiwi.core.exception.WritingNotSupportedException;
-import org.openrdf.model.Resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * User: Thomas Kurz
- * Date: 07.02.11
- * Time: 12:30
- */
-public interface ContentService {
-
- /**
- * Initialise the content service, setting up all content readers and writers.
- */
- public void initialise();
-
-
- /**
- * Store the content of the specified mime type for the specified resource. Accepts a byte array containing
- * the byte data of the content that is then written to the destination configured for this writer.
- * <p/>
- * @param resource the resource for which to store the content
- * @param mimeType the mime type of the content
- * @param data a byte array containing the content of the resource
- */
- public void setContentData(Resource resource, byte[] data, String mimeType) throws WritingNotSupportedException;
-
-
- /**
- * Store the content of the specified mime type for the specified resource. Accepts an input stream containing
- * the byte data of the content that is read and written to the destination configured for this writer.
- * <p/>
- * This method is preferrable for resources with large amounts of data.
- *
- * @param resource the resource for which to return the content
- * @param mimeType the mime type to retrieve of the content
- * @param in a InputStream containing the content of the resource
- */
- public void setContentStream(Resource resource, InputStream in, String mimeType) throws WritingNotSupportedException;
-
-
- /**
- * Retrieve the content of the specified mime type for the specified resource. Returns a byte array containing
- * the byte data of the content, or null, indicating that a content of the specified mime type does not exist
- * for the resource.
- * <p/>
- * Specialised content readers could even transform the resource content from its original form to the new
- * mimetype, e.g. converting an image from JPEG to PNG.
- *
- * @param resource the resource for which to return the content
- * @param mimeType the mime type to retrieve of the content
- * @return a byte array containing the content of the resource, or null if no content exists
- */
- public byte[] getContentData(Resource resource, String mimeType);
-
-
- /**
- * Retrieve the content of the specified mime type for the specified resource. Returns a input stream containing
- * the byte data of the content, or null, indicating that a content of the specified mime type does not exist
- * for the resource.
- * <p/>
- * Specialised content readers could even transform the resource content from its original form to the new
- * mimetype, e.g. converting an image from JPEG to PNG.
- * <p/>
- * This method is preferrable for resources with large amounts of data.
- *
- * @param resource the resource for which to return the content
- * @param mimetype the mime type to retrieve of the content
- * @return a InputStream containing the content of the resource, or null if no content exists
- */
- public InputStream getContentStream(Resource resource, String mimetype) throws IOException;
-
-
- /**
- * Check whether the specified resource has content of the specified mimetype for this reader. Returns true
- * in this case, false otherwise.
- *
- * @param resource the resource to check
- * @param mimetype the mimetype to look for
- * @return true if content of this mimetype is associated with the resource, false otherwise
- */
- public boolean hasContent(Resource resource, String mimetype);
-
- public String getContentType(Resource resource);
-
- /**
- * Return the number of bytes the content of this resource contains.
- *
- * @param resource resource for which to return the content length
- * @return byte count for the resource content
- */
-
- public long getContentLength(Resource resource, String mimetype);
- /**
- * Delete the content of the specified resource.
- *
- * @param resource the resource for which to delete the content
- */
- public boolean deleteContent(Resource resource) throws LMFException;
-
-}