Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/532fa9f5 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/532fa9f5 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/532fa9f5 Branch: refs/heads/ldp Commit: 532fa9f542deb585788962be86033d1704da562d Parents: 2619fcf a2246ca Author: Sebastian Schaffert <[email protected]> Authored: Tue Mar 18 17:16:57 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Tue Mar 18 17:16:57 2014 +0100 ---------------------------------------------------------------------- build/git-tag-revision.sh | 20 ++++++- .../maven/plugins/marmotta/MarmottaMojo.java | 2 +- .../marmotta/SplashScreenBuilderMojo.java | 36 +++++++---- build/scripts/check-parent-pom.sh | 18 ++++++ build/scripts/check-rebel.root.sh | 17 ++++++ .../marmotta/commons/vocabulary/DCTERMS.java | 1 - .../marmotta/commons/vocabulary/FOAF.java | 1 - .../apache/marmotta/commons/vocabulary/GEO.java | 1 - .../apache/marmotta/commons/vocabulary/MA.java | 1 - .../marmotta/commons/vocabulary/SCHEMA.java | 1 - .../marmotta/commons/vocabulary/SIOC.java | 1 - .../marmotta/commons/vocabulary/SKOS.java | 1 - .../marmotta/commons/vocabulary/SPARQL_SD.java | 16 +++++ .../apache/marmotta/commons/vocabulary/XSD.java | 1 - .../src/main/resources/mode/ldpath/ldpath.css | 32 +++++----- .../src/main/resources/mode/skwrl/skwrl.css | 18 ++++++ .../src/main/resources/mode/skwrl/skwrl.html | 2 - .../splash/startup/StartupListenerTest.java | 17 ++++++ .../marmotta-webapp/src/deb/control/control | 17 +++++- .../marmotta-webapp/src/deb/control/postinst | 18 +++++- .../marmotta-webapp/src/deb/control/postrm | 18 +++++- .../marmotta-webapp/src/deb/control/preinst | 18 +++++- launchers/marmotta-webapp/src/deb/control/prerm | 18 +++++- .../marmotta-webapp/src/deb/tomcat/marmotta.xml | 17 ++++++ .../kiwi/loader/KiWiLoaderConfiguration.java | 16 +++++ .../kiwi/loader/csv/LanguageProcessor.java | 16 +++++ .../kiwi/loader/csv/NodeIDProcessor.java | 16 +++++ .../kiwi/loader/csv/NodeTypeProcessor.java | 24 +++++--- .../kiwi/loader/csv/SQLBooleanProcessor.java | 16 +++++ .../kiwi/loader/csv/SQLDateProcessor.java | 16 +++++ .../kiwi/loader/csv/SQLTimestampProcessor.java | 16 +++++ .../kiwi/loader/generic/KiWiHandler.java | 16 +++++ .../kiwi/loader/pgsql/KiWiPostgresHandler.java | 16 +++++ .../marmotta/kiwi/loader/pgsql/PGCopyUtil.java | 32 +++++----- .../kiwi/loader/pgsql/create_indexes.sql | 15 +++++ .../marmotta/kiwi/loader/pgsql/drop_indexes.sql | 15 +++++ .../marmotta/kiwi/loader/KiWiHandlerTest.java | 16 +++++ .../marmotta/kiwi/loader/PGCopyUtilTest.java | 16 +++++ .../sparql/function/FulltextQueryFunction.java | 16 +++++ .../sparql/function/FulltextSearchFunction.java | 16 +++++ .../kiwi/sparql/test/ContextAwareTest.java | 16 +++++ .../marmotta/kiwi/vocabulary/FN_MARMOTTA.java | 16 +++++ .../berkeley/BerkeleyDBLoaderBackend.java | 17 ++++++ .../marmotta/loader/api/LoaderBackend.java | 17 ++++++ .../marmotta/loader/api/LoaderHandler.java | 17 ++++++ .../marmotta/loader/api/LoaderOptions.java | 17 ++++++ .../marmotta/loader/context/ContextHandler.java | 17 ++++++ .../marmotta/loader/core/MarmottaLoader.java | 17 ++++++ .../functions/BackendIdentifierFunction.java | 17 ++++++ .../loader/sesame/SesameLoaderHandler.java | 17 ++++++ .../loader/statistics/StatisticsHandler.java | 17 ++++++ .../marmotta/loader/util/DirectoryFilter.java | 17 ++++++ .../loader/wrapper/LoaderHandlerWrapper.java | 17 ++++++ .../marmotta/loader/core/test/CLITest.java | 17 ++++++ .../marmotta/loader/core/test/FilesTest.java | 17 ++++++ .../core/test/dummy/DummyLoaderBackend.java | 17 ++++++ .../core/test/dummy/DummyLoaderHandler.java | 17 ++++++ .../src/main/assembly/launcher.xml | 17 ++++++ .../loader/hbase/HBaseLoaderBackend.java | 17 ++++++ .../marmotta/loader/kiwi/KiWiLoaderBackend.java | 17 ++++++ .../marmotta/loader/kiwi/KiWiLoaderHandler.java | 17 ++++++ .../loader/titan/TitanLoaderHandler.java | 17 ++++++ .../marmotta/loader/titan/TitanRDFHandler.java | 17 ++++++ parent/pom.xml | 2 - .../backend/bigdata/BigDataLoggingModule.java | 16 +++++ .../bigdata/BigDataSesame27Repository.java | 15 ++--- .../backend/bigdata/BigDataStoreProvider.java | 1 - platform/backends/marmotta-backend-http/pom.xml | 16 +++++ .../backend/kiwi/KiWiLoggingModule.java | 17 ++++++ .../backends/marmotta-backend-memory/pom.xml | 16 +++++ .../backends/marmotta-backend-sparql/pom.xml | 16 +++++ .../ldcache/logging/LDCacheLoggingModule.java | 17 ++++++ .../ldcache/logging/LDClientLoggingModule.java | 17 ++++++ .../core/api/logging/LoggingModule.java | 17 ++++++ .../core/events/ConfigurationChangedEvent.java | 2 +- .../core/events/ContentCreatedEvent.java | 2 +- .../platform/core/events/LoggingStartEvent.java | 17 ++++++ .../core/events/SesameStartupEvent.java | 2 +- .../core/events/SystemRestartedEvent.java | 2 +- .../core/events/SystemRestartingEvent.java | 2 +- .../core/events/SystemStartupEvent.java | 2 +- .../core/logging/BaseLoggingModule.java | 17 ++++++ .../core/logging/CacheLoggingModule.java | 17 ++++++ .../logging/ConfigurationLoggingModule.java | 17 ++++++ .../core/logging/LinkedDataLoggingModule.java | 17 ++++++ .../core/logging/ResteasyLoggingModule.java | 17 ++++++ .../core/logging/SesameLoggingModule.java | 17 ++++++ .../core/logging/SystemLoggingModule.java | 17 ++++++ .../core/logging/WeldLoggingModule.java | 17 ++++++ .../core/model/logging/ConsoleOutput.java | 17 ++++++ .../core/model/logging/LogFileOutput.java | 17 ++++++ .../core/model/logging/LoggingOutput.java | 17 ++++++ .../core/model/logging/SyslogOutput.java | 17 ++++++ .../core/webservices/io/ExportWebService.java | 2 +- .../core/webservices/io/ImportWebService.java | 41 +++++-------- .../webservices/logging/LoggingWebService.java | 63 +++++++++++--------- .../src/main/resources/web/admin/dataview.html | 14 +++-- .../ldpath/logging/LDPathLoggingModule.java | 17 ++++++ .../reasoner/logging/ReasonerLoggingModule.java | 17 ++++++ .../security/logging/SecurityLoggingModule.java | 17 ++++++ .../sparql/logging/SparqlLoggingModule.java | 17 ++++++ .../user/logging/UserLoggingModule.java | 17 ++++++ platform/marmotta-zookeeper/pom.xml | 16 +++++ .../logging/ZookeeperLoggingModule.java | 16 +++++ pom.xml | 2 +- 105 files changed, 1433 insertions(+), 148 deletions(-) ----------------------------------------------------------------------
