Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into MARMOTTA-228
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/1a351ed9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/1a351ed9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/1a351ed9 Branch: refs/heads/MARMOTTA-228 Commit: 1a351ed9d04ad69f321e5828d288e6007c29cec4 Parents: a614867 5fe2a27 Author: tkurz <[email protected]> Authored: Fri May 10 15:43:45 2013 +0200 Committer: tkurz <[email protected]> Committed: Fri May 10 15:43:45 2013 +0200 ---------------------------------------------------------------------- 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 + .../marmotta/ldpath/backend/file/ParserTest.java | 15 +- 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 +- .../core/services/user/UserServiceImpl.java | 47 ++-- 38 files changed, 1269 insertions(+), 210 deletions(-) ----------------------------------------------------------------------
