marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sschaff...@apache.org
Subject [2/2] git commit: Merge remote-tracking branch 'origin/develop' into develop
Date Fri, 22 Nov 2013 14:12:53 GMT
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/33a128ad
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/33a128ad
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/33a128ad

Branch: refs/heads/develop
Commit: 33a128add2505c1fd61e56125dae4bfd1784a5e0
Parents: fe6b7d0 1a5cd17
Author: Sebastian Schaffert <sschaffert@apache.org>
Authored: Fri Nov 22 15:12:32 2013 +0100
Committer: Sebastian Schaffert <sschaffert@apache.org>
Committed: Fri Nov 22 15:12:32 2013 +0100

----------------------------------------------------------------------
 DISCLAIMER.txt                                  |  16 ------
 README.txt                                      |  16 ++----
 .../marmotta-archetype-module/pom.xml           |   2 +-
 .../marmotta-archetype-webapp/pom.xml           |   2 +-
 build/archetypes/pom.xml                        |   2 +-
 build/checkstyle-resources/pom.xml              |   2 +-
 build/dependency-resource-supplement/pom.xml    |   2 +-
 build/plugins/buildinfo-maven-plugin/pom.xml    |   2 +-
 build/plugins/marmotta-maven-plugin/pom.xml     |   2 +-
 build/plugins/pom.xml                           |   2 +-
 build/plugins/refpack-maven-plugin/pom.xml      |   2 +-
 build/plugins/repocheck-maven-plugin/pom.xml    |   2 +-
 build/pom.xml                                   |   2 +-
 client/marmotta-client-java/pom.xml             |   2 +-
 client/marmotta-client-js-sample-webapp/pom.xml |   2 +-
 client/marmotta-client-js/pom.xml               |   2 +-
 client/marmotta-client-php/pom.xml              |   2 +-
 client/pom.xml                                  |   2 +-
 commons/marmotta-commons/pom.xml                |   2 +-
 commons/pom.xml                                 |   2 +-
 commons/sesame-filter/pom.xml                   |   2 +-
 commons/sesame-tools-facading/pom.xml           |   2 +-
 commons/sesame-tools-rio-api/pom.xml            |   2 +-
 commons/sesame-tools-rio-ical/pom.xml           |   2 +-
 commons/sesame-tools-rio-rss/pom.xml            |   2 +-
 commons/sesame-tools-rio-vcard/pom.xml          |   2 +-
 extras/pom.xml                                  |   2 +-
 extras/webjars/codemirror/pom.xml               |   2 +-
 .../codemirror/src/main/resources/ldpath.html   |   4 +-
 .../codemirror/src/main/resources/skwrl.html    |   4 +-
 extras/webjars/pom.xml                          |   2 +-
 extras/webjars/sgvizler/pom.xml                 |   2 +-
 extras/webjars/snorql/pom.xml                   |   2 +-
 .../webjars/snorql/src/main/resources/snorql.js |   2 +-
 extras/webjars/strftime/pom.xml                 |   2 +-
 launchers/marmotta-installer/pom.xml            |   2 +-
 .../src/main/resources/images/splashscreen.png  | Bin 78597 -> 69972 bytes
 .../src/main/resources/images/splashscreen.psd  | Bin 545248 -> 398736 bytes
 .../src/main/resources/installer/standalone.xml |   2 +-
 launchers/marmotta-splash/pom.xml               |   2 +-
 .../splash/systray/SystrayListener.java         |   4 +-
 launchers/marmotta-webapp-bigdata/pom.xml       |   2 +-
 .../src/main/doc/README.txt                     |   4 +-
 .../src/main/webapp/META-INF/DISCLAIMER         |  16 ------
 launchers/marmotta-webapp/pom.xml               |   2 +-
 .../marmotta-webapp/src/main/doc/README.txt     |   4 +-
 .../src/main/webapp/META-INF/DISCLAIMER         |  16 ------
 launchers/pom.xml                               |   2 +-
 libraries/kiwi/kiwi-contextaware/pom.xml        |   2 +-
 libraries/kiwi/kiwi-loader/pom.xml              |   2 +-
 libraries/kiwi/kiwi-reasoner/pom.xml            |   2 +-
 libraries/kiwi/kiwi-sparql/pom.xml              |   2 +-
 libraries/kiwi/kiwi-transactions/pom.xml        |   2 +-
 libraries/kiwi/kiwi-triplestore/pom.xml         |   2 +-
 libraries/kiwi/kiwi-tripletable/pom.xml         |   2 +-
 libraries/kiwi/kiwi-versioning/pom.xml          |   2 +-
 .../versioning/test/SnapshotRepositoryTest.java |  52 +++++++++----------
 .../test/VersioningRepositoryTest.java          |  16 +++---
 .../kiwi/versioning/test/version-base.rdf       |   4 +-
 .../kiwi/versioning/test/version-update1.rdf    |   4 +-
 .../kiwi/versioning/test/version-update2.rdf    |   4 +-
 libraries/kiwi/pom.xml                          |   3 +-
 libraries/ldcache/ldcache-api/pom.xml           |   2 +-
 .../ldcache/ldcache-backend-ehcache/pom.xml     |   2 +-
 libraries/ldcache/ldcache-backend-file/pom.xml  |   2 +-
 libraries/ldcache/ldcache-backend-kiwi/pom.xml  |   2 +-
 libraries/ldcache/ldcache-backend-mapdb/pom.xml |   2 +-
 libraries/ldcache/ldcache-core/pom.xml          |   2 +-
 libraries/ldcache/ldcache-sail-generic/pom.xml  |   2 +-
 libraries/ldcache/ldcache-sail-kiwi/pom.xml     |   2 +-
 libraries/ldcache/pom.xml                       |   2 +-
 libraries/ldclient/ldclient-api/pom.xml         |   2 +-
 libraries/ldclient/ldclient-core/pom.xml        |   2 +-
 .../ldclient/ldclient-provider-facebook/pom.xml |   2 +-
 .../ldclient/ldclient-provider-html/pom.xml     |   2 +-
 .../ldclient/ldclient-provider-ldap/pom.xml     |   2 +-
 .../ldclient-provider-mediawiki/pom.xml         |   2 +-
 .../ldclient/ldclient-provider-phpbb/pom.xml    |   2 +-
 .../ldclient/ldclient-provider-rdf/pom.xml      |   2 +-
 .../ldclient/test/rdf/ohloh-marmotta.sparql     |   4 +-
 .../ldclient/ldclient-provider-rdfa/pom.xml     |   2 +-
 .../ldclient/ldclient-provider-vimeo/pom.xml    |   2 +-
 .../ldclient/ldclient-provider-xml/pom.xml      |   2 +-
 .../ldclient/ldclient-provider-youtube/pom.xml  |   2 +-
 libraries/ldclient/pom.xml                      |   2 +-
 libraries/ldpath/ldpath-api/pom.xml             |   2 +-
 libraries/ldpath/ldpath-backend-file/pom.xml    |   2 +-
 libraries/ldpath/ldpath-backend-jena/pom.xml    |   2 +-
 .../ldpath/ldpath-backend-linkeddata/pom.xml    |   2 +-
 .../src/main/doc/README.txt                     |   4 +-
 libraries/ldpath/ldpath-backend-sesame/pom.xml  |   2 +-
 libraries/ldpath/ldpath-core/pom.xml            |   2 +-
 .../ldpath/ldpath-functions-collections/pom.xml |   2 +-
 libraries/ldpath/ldpath-functions-date/pom.xml  |   2 +-
 libraries/ldpath/ldpath-functions-html/pom.xml  |   2 +-
 libraries/ldpath/ldpath-functions-math/pom.xml  |   2 +-
 libraries/ldpath/ldpath-functions-text/pom.xml  |   2 +-
 .../tests/functions/text/StringTestTest.java    |   2 +-
 libraries/ldpath/ldpath-functions-xml/pom.xml   |   2 +-
 .../ldpath/ldpath-template-linkeddata/pom.xml   |   2 +-
 libraries/ldpath/ldpath-template/pom.xml        |   2 +-
 libraries/ldpath/pom.xml                        |   2 +-
 libraries/pom.xml                               |   2 +-
 parent/pom.xml                                  |   6 +--
 .../backends/marmotta-backend-bigdata/pom.xml   |   2 +-
 platform/backends/marmotta-backend-http/pom.xml |   2 +-
 platform/backends/marmotta-backend-kiwi/pom.xml |   2 +-
 .../src/main/resources/web/admin/about.html     |   2 +-
 .../backends/marmotta-backend-memory/pom.xml    |   2 +-
 .../backends/marmotta-backend-native/pom.xml    |   2 +-
 .../backends/marmotta-backend-sparql/pom.xml    |   2 +-
 platform/backends/pom.xml                       |   2 +-
 .../ldcache/marmotta-ldcache-common/pom.xml     |   2 +-
 platform/ldcache/marmotta-ldcache-file/pom.xml  |   2 +-
 platform/ldcache/marmotta-ldcache-kiwi/pom.xml  |   2 +-
 platform/ldcache/pom.xml                        |   2 +-
 platform/marmotta-core/pom.xml                  |   2 +-
 .../main/resources/config-defaults.properties   |   2 +-
 .../src/main/resources/web/admin/about.html     |   2 +-
 platform/marmotta-ldpath/pom.xml                |   2 +-
 platform/marmotta-reasoner-kiwi/pom.xml         |   2 +-
 platform/marmotta-security/pom.xml              |   2 +-
 platform/marmotta-sparql/pom.xml                |   2 +-
 platform/marmotta-user/pom.xml                  |   2 +-
 platform/marmotta-versioning-common/pom.xml     |   2 +-
 platform/marmotta-versioning-kiwi/pom.xml       |   2 +-
 platform/marmotta-zookeeper/pom.xml             |   2 +-
 platform/pom.xml                                |   2 +-
 pom.xml                                         |  40 +++++++-------
 129 files changed, 192 insertions(+), 245 deletions(-)
----------------------------------------------------------------------



Mime
View raw message