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/9ef140d9 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9ef140d9 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9ef140d9 Branch: refs/heads/develop Commit: 9ef140d917ba365f262829da80126ad4decda4e8 Parents: ee1817c 883aa78 Author: Sebastian Schaffert <[email protected]> Authored: Fri Dec 20 14:59:49 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Fri Dec 20 14:59:49 2013 +0100 ---------------------------------------------------------------------- client/marmotta-client-java/pom.xml | 8 ++-- .../client/clients/ConfigurationClient.java | 21 +++++---- .../marmotta/client/clients/ImportClient.java | 19 ++++---- .../marmotta/client/clients/LDPathClient.java | 19 ++++---- .../commons/sesame/rio/ical/ICalFormat.java | 35 +++++++++++++- .../commons/sesame/rio/ical/ICalParser.java | 4 +- .../commons/sesame/rio/ical/TestICalParser.java | 22 ++++++--- .../commons/sesame/rio/rss/TestAtomParser.java | 4 +- .../commons/sesame/rio/rss/TestRSSParser.java | 4 +- .../sesame/rio/vcard/TestVCardParser.java | 4 +- .../marmotta/kiwi/test/PersistenceTest.java | 6 +-- .../marmotta/kiwi/test/RepositoryTest.java | 17 +++---- .../kiwi/test/generator/SnowflakeTest.java | 1 + .../kiwi/test/generator/UUIDRandomTest.java | 1 + .../kiwi/test/generator/UUIDTimeTest.java | 1 + .../sesame/repository/KiWiRepositoryTest.java | 8 ---- .../ldclient/ldclient-provider-facebook/pom.xml | 9 ++-- .../facebook/FacebookGraphProvider.java | 49 ++++++++++++-------- libraries/ldpath/pom.xml | 8 ---- parent/pom.xml | 32 +++++++------ platform/marmotta-core/pom.xml | 18 +++---- .../platform/core/api/task/TaskInfo.java | 4 +- .../platform/core/util/WebServiceUtil.java | 10 ++-- .../config/ConfigurationWebService.java | 30 ++++++------ .../webservices/logging/LoggingWebService.java | 45 +++++++++--------- .../src/main/resources/web/admin/contexts.html | 2 +- .../config/ConfigurationWebServiceTest.java | 5 +- .../platform/core/test/ld/LinkedDataTest.java | 26 ++++++----- .../resources/web/admin/widget/conf_reasoner.js | 6 ++- 29 files changed, 244 insertions(+), 174 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/9ef140d9/parent/pom.xml ----------------------------------------------------------------------
