marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ja...@apache.org
Subject [28/30] git commit: Merge remote-tracking branch 'origin/develop' into MARMOTTA-345
Date Thu, 24 Oct 2013 15:09:49 GMT
Merge remote-tracking branch 'origin/develop' into MARMOTTA-345


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/13366070
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/13366070
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/13366070

Branch: refs/heads/MARMOTTA-345
Commit: 133660709efe0b01445c8f9e90a19ef1d131c8a0
Parents: ff85aef 362ecbe
Author: Jakob Frank <jakob@apache.org>
Authored: Thu Oct 24 14:03:24 2013 +0200
Committer: Jakob Frank <jakob@apache.org>
Committed: Thu Oct 24 14:03:24 2013 +0200

----------------------------------------------------------------------
 build/check-rebel.root.sh                       |  11 +
 client/marmotta-client-java/pom.xml             |   5 +
 commons/marmotta-commons/pom.xml                |   1 -
 .../commons/sesame/model/StatementCommons.java  |   1 +
 .../sesame/repository/ResourceUtils.java        | 120 ++++++-
 .../commons/sesame/rio/vcard/Denis_Hennessy.vcf |   0
 .../commons/sesame/rio/vcard/Tony_Small.vcf     |   0
 .../webjars/snorql/src/main/resources/LICENSE   |   0
 extras/webjars/snorql/src/main/resources/README |   0
 .../webjars/snorql/src/main/resources/link.png  | Bin
 .../snorql/src/main/resources/namespaces.js     |   0
 .../snorql/src/main/resources/prototype.js      |   0
 .../snorql/src/main/resources/rdf_flyer.24.gif  | Bin
 .../src/main/resources/scriptaculous/builder.js |   0
 .../main/resources/scriptaculous/controls.js    |   0
 .../main/resources/scriptaculous/dragdrop.js    |   0
 .../src/main/resources/scriptaculous/effects.js |   0
 .../resources/scriptaculous/scriptaculous.js    |   0
 .../src/main/resources/scriptaculous/slider.js  |   0
 .../src/main/resources/scriptaculous/sound.js   |   0
 .../main/resources/scriptaculous/unittest.js    |   0
 .../webjars/snorql/src/main/resources/snorql.js |   0
 .../webjars/snorql/src/main/resources/sparql.js |   0
 .../webjars/snorql/src/main/resources/style.css |   0
 .../snorql/src/main/resources/xml-to-html.xsl   |   0
 .../apache/marmotta/splash/systray/systray.png  | Bin
 launchers/marmotta-webapp/pom.xml               |   2 +-
 .../kiwi/sparql/test/ContextAwareTest.java      |  40 +++
 .../kiwi/persistence/KiWiPersistence.java       |   4 +-
 .../backends/marmotta-backend-bigdata/pom.xml   | 192 ++++++++++
 .../bigdata/BigDataSesame27Repository.java      | 151 ++++++++
 .../backend/bigdata/BigDataSesame27Sail.java    | 293 +++++++++++++++
 .../backend/bigdata/BigDataStoreProvider.java   | 125 +++++++
 .../src/main/resources/META-INF/beans.xml       |  28 ++
 .../main/resources/config-defaults.properties   |  24 ++
 .../resources/config-descriptions.properties    |  24 ++
 .../src/main/resources/kiwi-module.properties   |  38 ++
 .../src/main/resources/web/admin/about.html     |  43 +++
 .../main/resources/web/admin/configuration.html |  53 +++
 platform/backends/marmotta-backend-kiwi/pom.xml | 172 +++++++++
 .../backend/kiwi/DatabaseWebService.java        | 109 ++++++
 .../kiwi/KiWiGarbageCollectionProvider.java     |  46 +++
 .../backend/kiwi/KiWiStoreProvider.java         | 161 +++++++++
 .../src/main/resources/META-INF/beans.xml       |  28 ++
 .../main/resources/config-defaults.properties   |  75 ++++
 .../resources/config-descriptions.properties    |  61 ++++
 .../src/main/resources/kiwi-module.properties   |  41 +++
 .../src/main/resources/web/admin/about.html     |  62 ++++
 .../main/resources/web/admin/configuration.html |  46 +++
 .../src/main/resources/web/admin/database.html  |  37 ++
 .../resources/web/admin/js/widgets/database.js  | 303 ++++++++++++++++
 .../backends/marmotta-backend-memory/pom.xml    | 154 ++++++++
 .../backend/memory/MemoryStoreProvider.java     |  83 +++++
 .../src/main/resources/META-INF/beans.xml       |  28 ++
 .../src/main/resources/kiwi-module.properties   |  38 ++
 .../backends/marmotta-backend-native/pom.xml    | 170 +++++++++
 .../backend/sesame/NativeStoreProvider.java     |  94 +++++
 .../src/main/resources/META-INF/beans.xml       |  28 ++
 .../src/main/resources/kiwi-module.properties   |  38 ++
 platform/backends/pom.xml                       |  72 ++++
 .../ldcache/marmotta-ldcache-common/pom.xml     | 198 ++++++++++
 .../api/endpoint/LinkedDataEndpointService.java |  87 +++++
 .../api/ldcache/LDCacheSailProvider.java        | 191 ++++++++++
 .../model/filter/LDCacheIgnoreFilter.java       |  32 ++
 .../model/filter/MarmottaNotCachedFilter.java   |  85 +++++
 .../endpoint/LinkedDataEndpointServiceImpl.java | 207 +++++++++++
 .../LinkedDataCachingWebService.java            | 327 +++++++++++++++++
 .../src/main/resources/META-INF/beans.xml       |  28 ++
 .../main/resources/config-defaults.properties   |  49 +++
 .../resources/config-descriptions.properties    |  41 +++
 .../src/main/resources/kiwi-module.properties   |  35 ++
 .../src/main/resources/web/admin/about.html     | 271 ++++++++++++++
 .../main/resources/web/admin/configuration.html |  83 +++++
 .../main/resources/web/admin/img/ld-caching.png | Bin 0 -> 758 bytes
 .../resources/web/admin/widgets/lmf_ldcache.js  | 360 +++++++++++++++++++
 platform/ldcache/marmotta-ldcache-file/pom.xml  | 174 +++++++++
 .../services/kiwi/FileLDCacheSailProvider.java  | 131 +++++++
 .../src/main/resources/META-INF/beans.xml       |  28 ++
 platform/ldcache/marmotta-ldcache-kiwi/pom.xml  | 174 +++++++++
 .../services/kiwi/KiWiLDCacheSailProvider.java  | 113 ++++++
 .../src/main/resources/META-INF/beans.xml       |  28 ++
 platform/ldcache/pom.xml                        |  65 ++++
 platform/marmotta-backend-bigdata/pom.xml       | 193 ----------
 .../bigdata/BigDataSesame27Repository.java      | 145 --------
 .../backend/bigdata/BigDataSesame27Sail.java    | 283 ---------------
 .../backend/bigdata/BigDataStoreProvider.java   | 125 -------
 .../src/main/resources/META-INF/beans.xml       |  28 --
 .../main/resources/config-defaults.properties   |  24 --
 .../resources/config-descriptions.properties    |  24 --
 .../src/main/resources/kiwi-module.properties   |  38 --
 .../src/main/resources/web/admin/about.html     |  43 ---
 .../main/resources/web/admin/configuration.html |  53 ---
 platform/marmotta-backend-kiwi/pom.xml          | 172 ---------
 .../backend/kiwi/DatabaseWebService.java        | 109 ------
 .../kiwi/KiWiGarbageCollectionProvider.java     |  46 ---
 .../backend/kiwi/KiWiStoreProvider.java         | 161 ---------
 .../src/main/resources/META-INF/beans.xml       |  28 --
 .../main/resources/config-defaults.properties   |  75 ----
 .../resources/config-descriptions.properties    |  61 ----
 .../src/main/resources/kiwi-module.properties   |  41 ---
 .../src/main/resources/web/admin/about.html     |  62 ----
 .../main/resources/web/admin/configuration.html |  46 ---
 .../src/main/resources/web/admin/database.html  |  37 --
 .../resources/web/admin/js/widgets/database.js  | 303 ----------------
 platform/marmotta-backend-native/pom.xml        | 170 ---------
 .../backend/sesame/NativeStoreProvider.java     |  94 -----
 .../src/main/resources/META-INF/beans.xml       |  28 --
 .../src/main/resources/kiwi-module.properties   |  41 ---
 platform/marmotta-core/pom.xml                  |  38 +-
 .../platform/core/api/user/UserToken.java       |  84 -----
 .../platform/core/rio/RDFHtmlWriterImpl.java    |   6 +-
 .../config/ConfigurationServiceImpl.java        |   1 +
 .../content/FileSystemContentReader.java        |  33 +-
 .../content/FileSystemContentWriter.java        |  18 +-
 .../services/content/HTTPContentReader.java     |  36 +-
 .../core/services/sesame/KiWiSesameUtil.java    |  63 ----
 .../sesame/ResourceSubjectMetadata.java         |   6 +-
 .../platform/core/util/JerseyUtils.java         |  45 ---
 .../marmotta/platform/core/util/KiWiIO.java     |  35 +-
 .../platform/core/util/WebServiceUtil.java      |  16 +
 .../resource/InspectionWebService.java          |  44 +--
 .../webservices/resource/MetaWebService.java    |   3 +-
 .../resource/ResourceWebService.java            |   3 +-
 .../triplestore/ContextWebService.java          |  42 +--
 .../triplestore/KnowledgeSpaceWebService.java   | 122 -------
 .../webservices/triplestore/LdpWebService.java  |  33 +-
 .../src/main/resources/kiwi-module.properties   |   1 -
 .../main/resources/web/public/img/icon/link.png | Bin
 .../core/test/base/TestStoreProvider.java       |  85 +++++
 .../src/test/resources/META-INF/beans.xml       |   4 +
 platform/marmotta-ldcache-common/pom.xml        | 198 ----------
 .../api/endpoint/LinkedDataEndpointService.java |  87 -----
 .../api/ldcache/LDCacheSailProvider.java        | 191 ----------
 .../model/filter/LDCacheIgnoreFilter.java       |  32 --
 .../model/filter/MarmottaNotCachedFilter.java   |  85 -----
 .../endpoint/LinkedDataEndpointServiceImpl.java | 207 -----------
 .../LinkedDataCachingWebService.java            | 314 ----------------
 .../src/main/resources/META-INF/beans.xml       |  28 --
 .../main/resources/config-defaults.properties   |  49 ---
 .../resources/config-descriptions.properties    |  41 ---
 .../src/main/resources/kiwi-module.properties   |  35 --
 .../src/main/resources/web/admin/about.html     | 271 --------------
 .../main/resources/web/admin/configuration.html |  83 -----
 .../main/resources/web/admin/img/ld-caching.png | Bin 758 -> 0 bytes
 .../resources/web/admin/widgets/lmf_ldcache.js  | 360 -------------------
 platform/marmotta-ldcache-file/pom.xml          | 174 ---------
 .../services/kiwi/FileLDCacheSailProvider.java  | 131 -------
 .../src/main/resources/META-INF/beans.xml       |  28 --
 platform/marmotta-ldcache-kiwi/pom.xml          | 174 ---------
 .../services/kiwi/KiWiLDCacheSailProvider.java  | 113 ------
 .../src/main/resources/META-INF/beans.xml       |  28 --
 .../ldpath/model/functions/ContentFunction.java |  12 +-
 .../ldpath/webservices/LDPathWebService.java    |  23 +-
 .../resources/web/admin/img/ld_path_small.png   | Bin
 .../resources/web/admin/img/reasoner_small.png  | Bin
 platform/marmotta-sparql/pom.xml                |   7 +-
 .../resources/web/admin/img/sparql_small.png    | Bin
 .../src/main/resources/web/admin/link.png       | Bin
 .../src/main/resources/web/admin/snorql.html    |   0
 .../src/main/resources/META-INF/beans.xml       |  28 --
 .../src/main/resources/kiwi-module.properties   |  34 --
 .../resources/web/admin/img/clock_small.png     | Bin
 platform/pom.xml                                |  10 +-
 163 files changed, 5929 insertions(+), 5670 deletions(-)
----------------------------------------------------------------------



Mime
View raw message