Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/21378108 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/21378108 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/21378108 Branch: refs/heads/develop Commit: 213781088154b482fa35b72a62b5c3d77c148cda Parents: 297e6e3 2bc2987 Author: Sergio Fernández <[email protected]> Authored: Fri May 17 09:47:18 2013 +0200 Committer: Sergio Fernández <[email protected]> Committed: Fri May 17 09:47:18 2013 +0200 ---------------------------------------------------------------------- .../src/main/resources/archetype-resources/pom.xml | 12 +- .../src/main/resources/archetype-resources/pom.xml | 4 +- client/marmotta-client-java/pom.xml | 16 +- commons/sesame-tools-facading/pom.xml | 11 + .../commons/sesame/facading/impl/FacadingImpl.java | 84 ++++---- .../facading/impl/FacadingInvocationHandler.java | 95 +++++---- .../commons/sesame/facading/util/FacadeUtils.java | 39 ++-- .../sesame/facading/AbstractFacadingTest.java | 15 +- .../builder/FacadingPredicateBuilderTest.java | 3 +- .../collections/CollectionFacadingTest.java | 21 +- .../concurrent/ConcurrentFacadingTest.java | 172 +++++++++++++++ .../facading/concurrent/model/FooFacade.java | 13 + .../facading/concurrent/model/TypeFacade.java | 17 ++ .../sesame/facading/locale/LocaleFacadingTest.java | 4 +- .../facading/primitive/BoxedFacadingTest.java | 139 ++++++++++++ .../facading/primitive/PrimitiveFacadingTest.java | 113 ++++++++++ .../sesame/facading/primitive/model/Boxed.java | 34 +++ .../sesame/facading/primitive/model/Primitive.java | 30 +++ .../facading/primitive/model/PropBuilder.java | 12 + .../src/test/resources/logback.xml | 1 + launchers/marmotta-webapp/pom.xml | 6 +- .../sparql/persistence/KiWiSparqlConnection.java | 8 +- .../kiwi/sparql/test/KiWiSparqlJoinTest.java | 12 + .../marmotta/kiwi/sparql/test/query11.sparql | 8 + .../marmotta/kiwi/sparql/test/query12.sparql | 7 + .../marmotta/kiwi/persistence/KiWiConnection.java | 66 +++--- .../marmotta/kiwi/persistence/KiWiPersistence.java | 29 ++- .../marmotta/kiwi/sail/KiWiSailConnection.java | 3 + .../src/main/resources/ehcache-kiwi.xml | 6 +- libraries/kiwi/pom.xml | 13 - .../marmotta/ldcache/api/LDCachingBackend.java | 8 + .../ldcache/backend/file/LDCachingFileBackend.java | 14 ++ .../backend/file/test/LDCacheBackendTest.java | 6 + .../ldcache/backend/kiwi/LDCachingKiWiBackend.java | 21 ++ .../backend/kiwi/test/LDCacheBackendTest.java | 6 + .../apache/marmotta/ldcache/services/LDCache.java | 12 + .../provider/mediawiki/MediawikiProvider.java | 2 +- .../marmotta/ldpath/backend/file/ParserTest.java | 15 +- libraries/ldpath/ldpath-backend-sesame/pom.xml | 6 - libraries/ldpath/ldpath-core/pom.xml | 4 + .../marmotta/ldpath/model/programs/Program.java | 20 ++ .../ldpath/model/selectors/GroupedSelector.java | 101 +++++++++ .../model/selectors/IntersectionSelector.java | 2 +- .../ldpath/model/selectors/UnionSelector.java | 2 +- .../marmotta/ldpath/model/tests/IsATest.java | 57 +++++ .../ldpath/model/tests/LiteralTypeTest.java | 2 +- .../ldpath/model/tests/PathEqualityTest.java | 6 +- .../model/tests/functions/BinaryNumericTest.java | 1 - .../javacc/at/newmedialab/ldpath/parser/rdfpath.jj | 127 ++++++++---- .../functions/BinaryNumericTestFunctionsTest.java | 2 +- .../ldpath/model/functions/FunctionsTest.java | 2 +- .../apache/marmotta/ldpath/parser/ParserTest.java | 6 +- .../marmotta/ldpath/parser/SelectorsTest.java | 83 +++++++ .../ldpath/parser/StringTestingBackend.java | 81 +++++++ .../apache/marmotta/ldpath/parser/TestsTest.java | 78 +++++++ .../marmotta/ldpath/test/AbstractTestBase.java | 36 ++-- .../src/test/resources/parse/program.ldpath | 2 + .../model/functions/date/DateFunctionsTest.java | 2 +- parent/pom.xml | 121 +++++----- platform/marmotta-core/pom.xml | 15 +- .../core/api/config/ConfigurationService.java | 3 + .../core/api/triplestore/SesameService.java | 3 +- .../services/config/ConfigurationServiceImpl.java | 19 ++- .../services/triplestore/SesameServiceImpl.java | 168 +++++++++------ .../core/services/user/UserServiceImpl.java | 47 ++-- .../core/startup/MarmottaStartupService.java | 2 + .../platform/core/test/base/JettyMarmotta.java | 34 +-- .../model/filter/MarmottaNotCachedFilter.java | 78 +++++++ .../services/ldcache/LDCacheSailProvider.java | 22 ++- .../webservices/LinkedDataCachingWebService.java | 161 ++++++++------ platform/marmotta-reasoner/pom.xml | 12 +- .../reasoner/services/ReasoningSailProvider.java | 59 ++++- platform/marmotta-sparql/pom.xml | 12 +- .../sparql/services/sail/SPARQLSailProvider.java | 3 +- .../services/VersioningSailProvider.java | 3 +- 75 files changed, 1914 insertions(+), 545 deletions(-) ----------------------------------------------------------------------
