You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/03/26 09:19:58 UTC

[50/50] [abbrv] git commit: merged latest changes from develop into ldp branch

merged latest changes from develop into ldp branch


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

Branch: refs/heads/ldp
Commit: b55373568c2776bb124af669b88954b1d7002549
Parents: 3fdc8ae de18b2c
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Mar 26 09:18:40 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Mar 26 09:18:40 2014 +0100

----------------------------------------------------------------------
 .gitignore                                      |   15 +-
 LICENSE.txt                                     |  466 +-
 NOTICE.txt                                      |    6 -
 .../marmotta-archetype-module/pom.xml           |   36 +
 .../META-INF/maven/archetype-metadata.xml       |    4 +-
 .../main/resources/archetype-resources/pom.xml  |   56 +-
 .../src/main/java/api/MyService.java            |    2 +-
 .../main/java/exceptions/DoThisException.java   |   38 +
 .../main/java/jaxrs/DoThisExceptionMapper.java  |   39 +
 .../java/logging/MyServiceLoggingModule.java    |   76 +
 .../src/main/java/services/MyServiceImpl.java   |    2 +-
 .../src/main/java/webservices/MyWebService.java |   16 +-
 .../src/main/resources/META-INF/beans.xml       |    6 +-
 .../src/test/java/services/MyServiceTest.java   |    4 +-
 .../test/java/webservices/MyWebServiceTest.java |   80 +-
 .../projects/basic/archetype.properties         |    2 +-
 .../src/test/resources/projects/basic/goal.txt  |    1 +
 .../marmotta-archetype-webapp/pom.xml           |  101 +-
 .../META-INF/maven/archetype-metadata.xml       |   13 +-
 .../main/resources/archetype-resources/pom.xml  |  403 +-
 .../src/main/resources/ehcache-lmf.xml          |  422 --
 .../src/main/resources/logback.xml              |   16 +-
 .../src/main/webapp/META-INF/context.xml        |   23 +
 .../src/main/webapp/WEB-INF/web.xml             |   70 +
 .../src/main/webapp/index.jsp                   |    2 +-
 .../resources/META-INF/test-persistence.xml     |   86 -
 .../src/test/resources/arquillian.xml           |   31 -
 .../src/test/resources/ehcache.xml              |  380 --
 .../src/test/resources/logback.xml              |   12 +-
 .../src/test/resources/verification.xml         |   31 +
 .../projects/basic/archetype.properties         |    2 +-
 .../src/test/resources/projects/basic/goal.txt  |    1 +
 build/archetypes/pom.xml                        |   10 +
 build/git-tag-revision.sh                       |   20 +-
 build/plugins/buildinfo-maven-plugin/pom.xml    |   10 +
 .../maven/plugins/marmotta/MarmottaMojo.java    |    2 +-
 .../marmotta/SplashScreenBuilderMojo.java       |   36 +-
 build/plugins/pom.xml                           |   11 +-
 .../maven/plugins/refpack/RefPackMojo.java      |    4 +-
 build/pom.xml                                   |   13 +
 build/scripts/check-parent-pom.sh               |   18 +
 build/scripts/check-rebel.root.sh               |   17 +
 client/pom.xml                                  |   10 +
 commons/marmotta-commons/pom.xml                |   19 +-
 .../marmotta/commons/http/ETagGenerator.java    |   24 +-
 .../org/apache/marmotta/commons/io/DataIO.java  |   70 +
 .../commons/sesame/hashing/URIFunnel.java       |   44 +
 .../commons/sesame/model/LiteralCommons.java    |   13 +-
 .../marmotta/commons/vocabulary/DCTERMS.java    |    1 -
 .../marmotta/commons/vocabulary/FOAF.java       |    1 -
 .../apache/marmotta/commons/vocabulary/GEO.java |    1 -
 .../apache/marmotta/commons/vocabulary/MA.java  |    1 -
 .../marmotta/commons/vocabulary/SCHEMA.java     |    1 -
 .../marmotta/commons/vocabulary/SIOC.java       |    1 -
 .../marmotta/commons/vocabulary/SKOS.java       |    1 -
 .../marmotta/commons/vocabulary/SPARQL_SD.java  |   16 +
 .../apache/marmotta/commons/vocabulary/XSD.java |    1 -
 .../marmotta-rio-ical/pom.xml                   |   12 +
 .../marmotta-rio-rss/pom.xml                    |   13 +
 .../src/main/resources/META-INF/NOTICE          |   11 -
 .../marmotta-rio-vcard/pom.xml                  |   13 +
 commons/marmotta-sesame-tools/pom.xml           |   12 +
 commons/pom.xml                                 |   11 +
 .../src/main/resources/mode/ldpath/ldpath.css   |   32 +-
 .../src/main/resources/mode/skwrl/skwrl.css     |   18 +
 .../src/main/resources/mode/skwrl/skwrl.html    |    2 -
 extras/webjars/pom.xml                          |    2 -
 extras/webjars/sgvizler/pom.xml                 |   88 -
 .../webjars/sgvizler/src/main/resources/LICENSE |   16 -
 .../sgvizler/src/main/resources/REVISION        |    1 -
 .../src/main/resources/lib/d3.v2.min.js         |    4 -
 .../resources/lib/raphael-dracula.pack.min.js   |    7 -
 .../src/main/resources/sgvizler.chart.css       |   37 -
 .../sgvizler/src/main/resources/sgvizler.html   |  114 -
 .../sgvizler/src/main/resources/sgvizler.js     | 1277 ------
 extras/webjars/snorql/pom.xml                   |  110 -
 .../webjars/snorql/src/main/resources/LICENSE   |  202 -
 extras/webjars/snorql/src/main/resources/README |   11 -
 .../webjars/snorql/src/main/resources/link.png  |  Bin 165 -> 0 bytes
 .../snorql/src/main/resources/namespaces.js     |   14 -
 .../snorql/src/main/resources/prototype.js      | 4221 ------------------
 .../snorql/src/main/resources/rdf_flyer.24.gif  |  Bin 330 -> 0 bytes
 .../src/main/resources/scriptaculous/builder.js |  136 -
 .../main/resources/scriptaculous/controls.js    |  965 ----
 .../main/resources/scriptaculous/dragdrop.js    |  974 ----
 .../src/main/resources/scriptaculous/effects.js | 1122 -----
 .../resources/scriptaculous/scriptaculous.js    |   58 -
 .../src/main/resources/scriptaculous/slider.js  |  275 --
 .../src/main/resources/scriptaculous/sound.js   |   55 -
 .../main/resources/scriptaculous/unittest.js    |  568 ---
 .../webjars/snorql/src/main/resources/snorql.js |  579 ---
 .../webjars/snorql/src/main/resources/sparql.js |  490 --
 .../webjars/snorql/src/main/resources/style.css |   85 -
 .../snorql/src/main/resources/xml-to-html.xsl   |  183 -
 launchers/marmotta-installer/pom.xml            |   17 +-
 .../src/main/resources/installer/LICENSE.txt    |  124 +-
 .../src/main/resources/installer/standalone.xml |    1 -
 .../splash/startup/StartupListenerTest.java     |   17 +
 launchers/marmotta-webapp/assembly.xml          |    8 +-
 launchers/marmotta-webapp/pom.xml               |  116 +-
 .../marmotta-webapp/src/deb/control/control     |   17 +-
 .../marmotta-webapp/src/deb/control/postinst    |   18 +-
 .../marmotta-webapp/src/deb/control/postrm      |   18 +-
 .../marmotta-webapp/src/deb/control/preinst     |   18 +-
 launchers/marmotta-webapp/src/deb/control/prerm |   18 +-
 .../marmotta-webapp/src/deb/tomcat/marmotta.xml |   17 +
 .../src/main/webapp/META-INF/LICENSE            |   62 -
 .../src/main/webapp/META-INF/context.xml        |   16 +
 .../src/test/resources/arquillian.xml           |   27 -
 .../src/test/resources/ehcache.xml              |  377 --
 launchers/pom.xml                               |   12 +
 libraries/kiwi/kiwi-caching-ehcache/pom.xml     |  131 +
 .../kiwi/ehcache/caching/EHCacheManager.java    |  201 +
 .../ehcache/caching/EHCacheManagerFactory.java  |   41 +
 .../marmotta/kiwi/ehcache/util/CacheMap.java    |  144 +
 ...he.marmotta.kiwi.caching.CacheManagerFactory |    1 +
 .../src/main/resources/ehcache-kiwi.xml         |  767 ++++
 .../EHCacheRepositoryConnectionTest.java        |   63 +
 .../test/caching/EHCacheRepositoryTest.java     |   61 +
 libraries/kiwi/kiwi-caching-hazelcast/pom.xml   |  131 +
 .../caching/HazelcastCacheManager.java          |  295 ++
 .../caching/HazelcastCacheManagerFactory.java   |   44 +
 .../hazelcast/serializer/BNodeSerializer.java   |   56 +
 .../serializer/BooleanLiteralSerializer.java    |   55 +
 .../serializer/DateLiteralSerializer.java       |   55 +
 .../serializer/DoubleLiteralSerializer.java     |   54 +
 .../hazelcast/serializer/ExternalizerIds.java   |   43 +
 .../serializer/IntLiteralSerializer.java        |   55 +
 .../serializer/StringLiteralSerializer.java     |   55 +
 .../hazelcast/serializer/TripleSerializer.java  |   53 +
 .../hazelcast/serializer/UriSerializer.java     |   54 +
 .../marmotta/kiwi/hazelcast/util/AsyncMap.java  |  102 +
 ...he.marmotta.kiwi.caching.CacheManagerFactory |    1 +
 .../kiwi/test/cluster/HazelcastClusterTest.java |   36 +
 .../HazelcastRepositoryConnectionTest.java      |   66 +
 .../test/cluster/HazelcastRepositoryTest.java   |   64 +
 .../kiwi/test/cluster/SerializerTest.java       |  245 +
 libraries/kiwi/kiwi-caching-infinispan/pom.xml  |  141 +
 .../InfinispanEmbeddedCacheManager.java         |  513 +++
 .../InfinispanEmbeddedCacheManagerFactory.java  |   44 +
 .../externalizer/BNodeExternalizer.java         |   58 +
 .../externalizer/BaseExternalizer.java          |   80 +
 .../BooleanLiteralExternalizer.java             |   56 +
 .../externalizer/DateLiteralExternalizer.java   |   56 +
 .../externalizer/DoubleLiteralExternalizer.java |   56 +
 .../externalizer/ExternalizerIds.java           |   43 +
 .../externalizer/IntLiteralExternalizer.java    |   56 +
 .../externalizer/StringLiteralExternalizer.java |   56 +
 .../externalizer/TripleExternalizer.java        |   56 +
 .../externalizer/UriExternalizer.java           |   57 +
 .../remote/CustomClassExternalizerFactory.java  |   70 +
 .../infinispan/remote/CustomClassTable.java     |  113 +
 .../remote/CustomJBossMarshaller.java           |   41 +
 .../remote/InfinispanRemoteCacheManager.java    |  215 +
 .../InfinispanRemoteCacheManagerFactory.java    |   44 +
 .../marmotta/kiwi/infinispan/util/AsyncMap.java |  102 +
 ...he.marmotta.kiwi.caching.CacheManagerFactory |    2 +
 .../kiwi/test/embedded/EmbeddedClusterTest.java |   37 +
 .../EmbeddedRepositoryConnectionTest.java       |   67 +
 .../test/embedded/EmbeddedRepositoryTest.java   |   65 +
 .../test/externalizer/ExternalizerTest.java     |  260 ++
 .../kiwi/test/remote/HotRodClusterTest.java     |   57 +
 .../kiwi/test/remote/HotRodPersistenceTest.java |   42 +
 .../remote/HotRodRepositoryConnectionTest.java  |   73 +
 .../kiwi/test/remote/HotRodRepositoryTest.java  |   73 +
 .../kiwi/test/remote/HotRodServerRule.java      |  156 +
 libraries/kiwi/kiwi-caching/pom.xml             |  197 -
 .../config/KiWiQueryCacheConfiguration.java     |   69 -
 .../caching/iteration/BufferingIteration.java   |  118 -
 .../caching/iteration/CachingIteration.java     |  136 -
 .../kiwi/caching/sail/KiWiCachingSail.java      |  164 -
 .../caching/sail/KiWiCachingSailConnection.java |  503 ---
 .../GeronimoTransactionManagerLookup.java       |   46 -
 .../KiWiCachingRepositoryConnectionTest.java    |   64 -
 .../caching/test/KiWiCachingRepositoryTest.java |   61 -
 libraries/kiwi/kiwi-loader/pom.xml              |    9 -
 .../kiwi/loader/KiWiLoaderConfiguration.java    |   16 +
 .../kiwi/loader/csv/LanguageProcessor.java      |   16 +
 .../kiwi/loader/csv/NodeIDProcessor.java        |   16 +
 .../kiwi/loader/csv/NodeTypeProcessor.java      |   24 +-
 .../kiwi/loader/csv/SQLBooleanProcessor.java    |   16 +
 .../kiwi/loader/csv/SQLDateProcessor.java       |   16 +
 .../kiwi/loader/csv/SQLTimestampProcessor.java  |   16 +
 .../kiwi/loader/generic/KiWiHandler.java        |   16 +
 .../kiwi/loader/pgsql/KiWiPostgresHandler.java  |   16 +
 .../marmotta/kiwi/loader/pgsql/PGCopyUtil.java  |   32 +-
 .../kiwi/loader/pgsql/create_indexes.sql        |   15 +
 .../marmotta/kiwi/loader/pgsql/drop_indexes.sql |   15 +
 .../marmotta/kiwi/loader/KiWiHandlerTest.java   |   16 +
 .../marmotta/kiwi/loader/PGCopyUtilTest.java    |   16 +
 .../persistence/KiWiReasoningConnection.java    |    7 +-
 libraries/kiwi/kiwi-sparql/pom.xml              |   14 +
 .../sparql/function/FulltextQueryFunction.java  |   16 +
 .../sparql/function/FulltextSearchFunction.java |   16 +
 .../kiwi/sparql/test/ContextAwareTest.java      |   16 +
 libraries/kiwi/kiwi-triplestore/pom.xml         |   15 +-
 .../kiwi/caching/BNodeExternalizer.java         |   74 -
 .../caching/BooleanLiteralExternalizer.java     |   72 -
 .../marmotta/kiwi/caching/CacheManager.java     |  134 +
 .../kiwi/caching/CacheManagerFactory.java       |   37 +
 .../kiwi/caching/DateLiteralExternalizer.java   |   72 -
 .../kiwi/caching/DoubleLiteralExternalizer.java |   72 -
 .../marmotta/kiwi/caching/ExternalizerIds.java  |   41 -
 .../kiwi/caching/GuavaCacheManager.java         |  233 +
 .../kiwi/caching/GuavaCacheManagerFactory.java  |   42 +
 .../kiwi/caching/IntLiteralExternalizer.java    |   72 -
 .../marmotta/kiwi/caching/KiWiCacheManager.java |  528 ---
 .../kiwi/caching/StringLiteralExternalizer.java |   95 -
 .../kiwi/caching/TripleExternalizer.java        |  127 -
 .../marmotta/kiwi/caching/UriExternalizer.java  |   72 -
 .../marmotta/kiwi/config/CachingBackends.java   |   64 +
 .../marmotta/kiwi/config/KiWiConfiguration.java |   83 +-
 .../marmotta/kiwi/hashing/NodeFunnel.java       |   58 +
 .../kiwi/hashing/PrimitiveSinkOutput.java       |  108 +
 .../marmotta/kiwi/hashing/TripleFunnel.java     |   60 +
 .../org/apache/marmotta/kiwi/io/KiWiIO.java     |  852 ++++
 .../kiwi/persistence/KiWiConnection.java        |   66 +-
 .../marmotta/kiwi/persistence/KiWiDialect.java  |   22 +-
 .../kiwi/persistence/KiWiPersistence.java       |   45 +-
 .../marmotta/kiwi/persistence/h2/H2Dialect.java |   44 +-
 .../kiwi/persistence/mysql/MySQLDialect.java    |   46 +-
 .../persistence/pgsql/PostgreSQLDialect.java    |   52 +-
 .../registry/CacheTripleRegistry.java           |    9 +-
 .../apache/marmotta/kiwi/sail/KiWiStore.java    |   16 -
 .../marmotta/kiwi/vocabulary/FN_MARMOTTA.java   |   16 +
 ...he.marmotta.kiwi.caching.CacheManagerFactory |    1 +
 .../apache/marmotta/kiwi/test/ClusterTest.java  |  157 -
 .../marmotta/kiwi/test/PersistenceTest.java     |   52 +-
 .../kiwi/test/cluster/BaseClusterTest.java      |  224 +
 .../test/externalizer/ExternalizerTest.java     |  188 -
 .../persistence/KiWiVersioningConnection.java   |    4 +-
 libraries/kiwi/pom.xml                          |   18 +-
 .../LDCachingKiWiPersistenceConnection.java     |    6 +-
 .../ldcache/services/test/LDCacheKiWiTest.java  |    5 +
 libraries/ldcache/ldcache-core/pom.xml          |   11 +
 libraries/ldcache/pom.xml                       |   13 +
 libraries/ldclient/ldclient-core/pom.xml        |   11 +
 libraries/ldclient/pom.xml                      |   12 +
 libraries/ldpath/ldpath-core-bundle/LICENSE     |  202 -
 libraries/ldpath/ldpath-core-bundle/pom.xml     |    1 +
 libraries/ldpath/ldpath-core/LICENSE            |  202 -
 .../src/main/resources/META-INF/MANIFEST.MF     |    1 -
 .../ldpath/ldpath-functions-collections/pom.xml |   11 +-
 .../src/main/resources/META-INF/MANIFEST.MF     |    1 -
 libraries/ldpath/ldpath-functions-date/pom.xml  |   11 +-
 .../src/main/resources/META-INF/MANIFEST.MF     |    1 -
 libraries/ldpath/ldpath-functions-html/pom.xml  |   11 +-
 .../src/main/resources/META-INF/MANIFEST.MF     |    1 -
 libraries/ldpath/ldpath-functions-math/pom.xml  |   11 +-
 .../src/main/resources/META-INF/MANIFEST.MF     |    1 -
 libraries/ldpath/ldpath-functions-text/pom.xml  |   11 +-
 .../src/main/resources/META-INF/MANIFEST.MF     |    1 -
 libraries/ldpath/ldpath-functions-xml/pom.xml   |   11 +-
 .../src/main/resources/META-INF/MANIFEST.MF     |    1 -
 libraries/ldpath/pom.xml                        |   10 +
 libraries/pom.xml                               |   13 +
 .../berkeley/BerkeleyDBLoaderBackend.java       |   17 +
 loader/marmotta-loader-core/pom.xml             |   17 +
 .../marmotta/loader/api/LoaderBackend.java      |   17 +
 .../marmotta/loader/api/LoaderHandler.java      |   17 +
 .../marmotta/loader/api/LoaderOptions.java      |   17 +
 .../marmotta/loader/context/ContextHandler.java |   17 +
 .../marmotta/loader/core/MarmottaLoader.java    |   17 +
 .../functions/BackendIdentifierFunction.java    |   17 +
 .../loader/sesame/SesameLoaderHandler.java      |   17 +
 .../loader/statistics/StatisticsHandler.java    |   17 +
 .../marmotta/loader/util/DirectoryFilter.java   |   17 +
 .../loader/wrapper/LoaderHandlerWrapper.java    |   17 +
 .../marmotta/loader/core/test/CLITest.java      |   17 +
 .../marmotta/loader/core/test/FilesTest.java    |   17 +
 .../core/test/dummy/DummyLoaderBackend.java     |   17 +
 .../core/test/dummy/DummyLoaderHandler.java     |   17 +
 .../src/main/assembly/launcher.xml              |   17 +
 .../loader/hbase/HBaseLoaderBackend.java        |   17 +
 .../marmotta/loader/kiwi/KiWiLoaderBackend.java |   17 +
 .../marmotta/loader/kiwi/KiWiLoaderHandler.java |   17 +
 .../loader/titan/TitanLoaderHandler.java        |   17 +
 .../marmotta/loader/titan/TitanRDFHandler.java  |   17 +
 loader/pom.xml                                  |   10 +
 parent/pom.xml                                  |  119 +-
 .../backend/bigdata/BigDataLoggingModule.java   |   16 +
 .../bigdata/BigDataSesame27Repository.java      |   15 +-
 .../backend/bigdata/BigDataStoreProvider.java   |    1 -
 platform/backends/marmotta-backend-http/pom.xml |   16 +
 platform/backends/marmotta-backend-kiwi/pom.xml |    4 -
 .../backend/kiwi/DatabaseWebService.java        |    2 +-
 .../backend/kiwi/KiWiLoggingModule.java         |   17 +
 .../platform/backend/kiwi/KiWiOptions.java      |   51 +
 .../backend/kiwi/KiWiStoreProvider.java         |  120 +-
 .../main/resources/config-defaults.properties   |   12 +-
 .../resources/config-descriptions.properties    |   31 +-
 .../src/main/resources/web/admin/about.html     |    2 +-
 .../backends/marmotta-backend-memory/pom.xml    |   16 +
 .../backends/marmotta-backend-sparql/pom.xml    |   16 +
 platform/backends/pom.xml                       |   10 +
 .../ldcache/logging/LDCacheLoggingModule.java   |   17 +
 .../ldcache/logging/LDClientLoggingModule.java  |   17 +
 platform/ldcache/pom.xml                        |   10 +
 platform/marmotta-core/pom.xml                  |   25 +-
 .../platform/core/api/cache/CachingService.java |   32 +-
 .../core/api/jaxrs/ExceptionMapperService.java  |    1 +
 .../core/api/jaxrs/InterceptorService.java      |   31 +
 .../core/api/logging/LoggingModule.java         |   17 +
 .../core/events/ConfigurationChangedEvent.java  |    2 +-
 .../core/events/ContentCreatedEvent.java        |    2 +-
 .../platform/core/events/LoggingStartEvent.java |   17 +
 .../core/events/SesameStartupEvent.java         |    2 +-
 .../core/events/SystemRestartedEvent.java       |    2 +-
 .../core/events/SystemRestartingEvent.java      |    2 +-
 .../core/events/SystemStartupEvent.java         |    2 +-
 .../core/exception/HttpErrorException.java      |  107 +
 .../platform/core/jaxrs/CDIExceptionMapper.java |   28 -
 .../platform/core/jaxrs/ErrorResponse.java      |  126 -
 .../core/jaxrs/IllegalStateExceptionMapper.java |   47 -
 .../core/jaxrs/MarmottaExceptionMapper.java     |   49 -
 .../jaxrs/MarmottaImportExceptionMapper.java    |   49 -
 .../core/jaxrs/RepositoryExceptionMapper.java   |   50 -
 .../core/jaxrs/URISyntaxExceptionMapper.java    |   47 -
 .../UnsupportedOperationExceptionMapper.java    |   47 -
 .../exceptionmappers/CDIExceptionMapper.java    |   28 +
 .../jaxrs/exceptionmappers/ErrorResponse.java   |  126 +
 .../HttpErrorExceptionMapper.java               |   90 +
 .../IllegalStateExceptionMapper.java            |   46 +
 .../MarmottaExceptionMapper.java                |   48 +
 .../MarmottaImportExceptionMapper.java          |   48 +
 .../RepositoryExceptionMapper.java              |   49 +
 .../URISyntaxExceptionMapper.java               |   47 +
 .../UnsupportedOperationExceptionMapper.java    |   46 +
 .../core/jaxrs/interceptors/CDIInterceptor.java |   30 +
 .../jaxrs/interceptors/JsonPInterceptor.java    |   45 +
 .../core/logging/BaseLoggingModule.java         |   17 +
 .../core/logging/CacheLoggingModule.java        |   17 +
 .../logging/ConfigurationLoggingModule.java     |   17 +
 .../core/logging/LinkedDataLoggingModule.java   |   17 +
 .../core/logging/ResteasyLoggingModule.java     |   17 +
 .../core/logging/SesameLoggingModule.java       |   17 +
 .../core/logging/SystemLoggingModule.java       |   17 +
 .../core/logging/WeldLoggingModule.java         |   17 +
 .../platform/core/model/config/CoreOptions.java |   36 +
 .../core/model/logging/ConsoleOutput.java       |   17 +
 .../core/model/logging/LogFileOutput.java       |   17 +
 .../core/model/logging/LoggingOutput.java       |   17 +
 .../core/model/logging/SyslogOutput.java        |   17 +
 .../core/services/cache/CachingServiceImpl.java |  192 +-
 .../config/ConfigurationServiceImpl.java        |   69 +-
 .../services/http/HttpClientServiceImpl.java    |   19 +-
 .../jaxrs/ExceptionMapperServiceImpl.java       |   10 +-
 .../services/jaxrs/InterceptorServiceImpl.java  |   73 +
 .../modules/MarmottaResourceServiceImpl.java    |    4 +-
 .../templating/TemplatingServiceImpl.java       |    2 +
 .../core/services/user/UserServiceImpl.java     |    4 -
 .../core/startup/MarmottaStartupService.java    |   33 +-
 .../core/webservices/io/ExportWebService.java   |    2 +-
 .../core/webservices/io/ImportWebService.java   |   41 +-
 .../webservices/logging/LoggingWebService.java  |   63 +-
 .../webservices/resource/ContentWebService.java |   83 +-
 .../webservices/resource/MetaWebService.java    |  194 +-
 .../resource/ResourceWebService.java            |  282 +-
 .../resource/ResourceWebServiceHelper.java      |   65 +-
 .../webservices/system/SystemWebService.java    |    2 +-
 .../src/main/resources/META-INF/MANIFEST.MF     |    2 -
 .../src/main/resources/META-INF/ehcache.xml     |  500 ---
 .../main/resources/config-defaults.properties   |   38 +-
 .../resources/config-descriptions.properties    |   29 +-
 .../src/main/resources/templates/error.ftl      |   83 +
 .../src/main/resources/web/admin/about.html     |    2 +-
 .../src/main/resources/web/admin/dataview.html  |  432 +-
 .../web/public/img/logo/marmotta-sad.png        |  Bin 0 -> 37916 bytes
 .../resources/web/public/style/blue/error.css   |   31 +
 .../resources/web/public/style/white/error.css  |   31 +
 .../platform/core/test/base/JettyMarmotta.java  |   52 +-
 .../ldpath/logging/LDPathLoggingModule.java     |   17 +
 .../reasoner/logging/ReasonerLoggingModule.java |   17 +
 .../security/logging/SecurityLoggingModule.java |   17 +
 .../security-profile.restricted.properties      |   16 +-
 .../security-profile.standard.properties        |   16 +-
 platform/marmotta-sparql/pom.xml                |   30 +-
 .../sparql/logging/SparqlLoggingModule.java     |   17 +
 .../sparql/webservices/SparqlWebService.java    |  131 +-
 .../src/main/resources/META-INF/LICENSE         |   65 +-
 .../src/main/resources/kiwi-module.properties   |    9 +-
 .../main/resources/web/admin/configuration.js   |    1 -
 .../src/main/resources/web/admin/sgvizler.html  |  186 +-
 .../src/main/resources/web/admin/snorql.html    |  153 -
 .../src/main/resources/web/admin/squebi.html    |  104 +
 .../src/main/resources/web/admin/update.html    |  161 -
 .../src/main/resources/web/style/sparql.css     |  109 -
 .../user/logging/UserLoggingModule.java         |   17 +
 .../user/services/AccountServiceImpl.java       |    4 +-
 platform/marmotta-versioning-kiwi/pom.xml       |    8 +
 .../resources/templates/memento_timemap.ftl     |   44 +-
 platform/marmotta-zookeeper/pom.xml             |   16 +
 .../logging/ZookeeperLoggingModule.java         |   16 +
 platform/pom.xml                                |   12 +
 pom.xml                                         |   29 +-
 395 files changed, 13102 insertions(+), 19897 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/b5537356/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/marmotta/blob/b5537356/commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/DCTERMS.java
----------------------------------------------------------------------
diff --cc commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/DCTERMS.java
index a694cc9,0000000..c4b756d
mode 100644,000000..100644
--- a/commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/DCTERMS.java
+++ b/commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/DCTERMS.java
@@@ -1,619 -1,0 +1,618 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *      http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
- 
 +package org.apache.marmotta.commons.vocabulary;
 +
 +import org.openrdf.model.URI;
 +import org.openrdf.model.ValueFactory;
 +import org.openrdf.model.impl.ValueFactoryImpl;
 +
 +/**
 + * Namespace DCTERMS
 + */
 +public class DCTERMS {
 +
 +    public static final String NAMESPACE = "http://purl.org/dc/terms/";
 +
 +    public static final String PREFIX = "dcterms";
 +
 +    /**
 +     * A resource that acts or has the power to act.
 +     */
 +    public static final URI Agent;
 +
 +    /**
 +     * A group of agents.
 +     */
 +    public static final URI AgentClass;
 +
 +    /**
 +     * A book, article, or other documentary resource.
 +     */
 +    public static final URI BibliographicResource;
 +
 +    /**
 +     * The set of regions in space defined by their geographic coordinates according to the DCMI Box Encoding Scheme.
 +     */
 +    public static final URI Box;
 +
 +    /**
 +     * The set of classes specified by the DCMI Type Vocabulary, used to categorize the nature or genre of the resource.
 +     */
 +    public static final URI DCMIType;
 +
 +    /**
 +     * The set of conceptual resources specified by the Dewey Decimal Classification.
 +     */
 +    public static final URI DDC;
 +
 +    /**
 +     * A digital resource format.
 +     */
 +    public static final URI FileFormat;
 +
 +    /**
 +     * A rate at which something recurs.
 +     */
 +    public static final URI Frequency;
 +
 +    /**
 +     * The set of media types specified by the Internet Assigned Numbers Authority.
 +     */
 +    public static final URI IMT;
 +
 +    /**
 +     * The set of codes listed in ISO 3166-1 for the representation of names of countries.
 +     */
 +    public static final URI ISO3166;
 +
 +    /**
 +     * The three-letter alphabetic codes listed in ISO639-2 for the representation of names of languages.
 +     */
 +    public static final URI ISO639_2;
 +
 +    /**
 +     * The set of three-letter codes listed in ISO 639-3 for the representation of names of languages.
 +     */
 +    public static final URI ISO639_3;
 +
 +    /**
 +     * The extent or range of judicial, law enforcement, or other authority.
 +     */
 +    public static final URI Jurisdiction;
 +
 +    /**
 +     * The set of conceptual resources specified by the Library of Congress Classification.
 +     */
 +    public static final URI LCC;
 +
 +    /**
 +     * The set of labeled concepts specified by the Library of Congress Subject Headings.
 +     */
 +    public static final URI LCSH;
 +
 +    /**
 +     * A legal document giving official permission to do something with a Resource.
 +     */
 +    public static final URI LicenseDocument;
 +
 +    /**
 +     * A system of signs, symbols, sounds, gestures, or rules used in communication.
 +     */
 +    public static final URI LinguisticSystem;
 +
 +    /**
 +     * A spatial region or named place.
 +     */
 +    public static final URI Location;
 +
 +    /**
 +     * A location, period of time, or jurisdiction.
 +     */
 +    public static final URI LocationPeriodOrJurisdiction;
 +
 +    /**
 +     * The set of labeled concepts specified by the Medical Subject Headings.
 +     */
 +    public static final URI MESH;
 +
 +    /**
 +     * A file format or physical medium.
 +     */
 +    public static final URI MediaType;
 +
 +    /**
 +     * A media type or extent.
 +     */
 +    public static final URI MediaTypeOrExtent;
 +
 +    /**
 +     * A method by which resources are added to a collection.
 +     */
 +    public static final URI MethodOfAccrual;
 +
 +    /**
 +     * A process that is used to engender knowledge, attitudes, and skills.
 +     */
 +    public static final URI MethodOfInstruction;
 +
 +    /**
 +     * The set of conceptual resources specified by the National Library of Medicine Classification.
 +     */
 +    public static final URI NLM;
 +
 +    /**
 +     * The set of time intervals defined by their limits according to the DCMI Period Encoding Scheme.
 +     */
 +    public static final URI Period;
 +
 +    /**
 +     * An interval of time that is named or defined by its start and end dates.
 +     */
 +    public static final URI PeriodOfTime;
 +
 +    /**
 +     * A physical material or carrier.
 +     */
 +    public static final URI PhysicalMedium;
 +
 +    /**
 +     * A material thing.
 +     */
 +    public static final URI PhysicalResource;
 +
 +    /**
 +     * The set of points in space defined by their geographic coordinates according to the DCMI Point Encoding Scheme.
 +     */
 +    public static final URI Point;
 +
 +    /**
 +     * A plan or course of action by an authority, intended to influence and determine decisions, actions, and other matters.
 +     */
 +    public static final URI Policy;
 +
 +    /**
 +     * A statement of any changes in ownership and custody of a resource since its creation that are significant for its authenticity, integrity, and interpretation.
 +     */
 +    public static final URI ProvenanceStatement;
 +
 +    /**
 +     * The set of tags, constructed according to RFC 1766, for the identification of languages.
 +     */
 +    public static final URI RFC1766;
 +
 +    /**
 +     * The set of tags constructed according to RFC 3066 for the identification of languages.
 +     */
 +    public static final URI RFC3066;
 +
 +    /**
 +     * The set of tags constructed according to RFC 4646 for the identification of languages.
 +     */
 +    public static final URI RFC4646;
 +
 +    /**
 +     * A statement about the intellectual property rights (IPR) held in or over a Resource, a legal document giving official permission to do something with a resource, or a statement about access rights.
 +     */
 +    public static final URI RightsStatement;
 +
 +    /**
 +     * A dimension or extent, or a time taken to play or execute.
 +     */
 +    public static final URI SizeOrDuration;
 +
 +    /**
 +     * A basis for comparison; a reference point against which other things can be evaluated.
 +     */
 +    public static final URI Standard;
 +
 +    /**
 +     * The set of places specified by the Getty Thesaurus of Geographic Names.
 +     */
 +    public static final URI TGN;
 +
 +    /**
 +     * The set of conceptual resources specified by the Universal Decimal Classification.
 +     */
 +    public static final URI UDC;
 +
 +    /**
 +     * The set of identifiers constructed according to the generic syntax for Uniform Resource Identifiers as specified by the Internet Engineering Task Force.
 +     */
 +    public static final URI URI;
 +
 +    /**
 +     * The set of dates and times constructed according to the W3C Date and Time Formats Specification.
 +     */
 +    public static final URI W3CDTF;
 +
 +    /**
 +     * A summary of the resource.
 +     */
 +    public static final URI abstract_;
 +
 +    /**
 +     * Information about who can access the resource or an indication of its security status.
 +     */
 +    public static final URI accessRights;
 +
 +    /**
 +     * The method by which items are added to a collection.
 +     */
 +    public static final URI accrualMethod;
 +
 +    /**
 +     * The frequency with which items are added to a collection.
 +     */
 +    public static final URI accrualPeriodicity;
 +
 +    /**
 +     * The policy governing the addition of items to a collection.
 +     */
 +    public static final URI accrualPolicy;
 +
 +    /**
 +     * An alternative name for the resource.
 +     */
 +    public static final URI alternative;
 +
 +    /**
 +     * A class of entity for whom the resource is intended or useful.
 +     */
 +    public static final URI audience;
 +
 +    /**
 +     * Date (often a range) that the resource became or will become available.
 +     */
 +    public static final URI available;
 +
 +    /**
 +     * A bibliographic reference for the resource.
 +     */
 +    public static final URI bibliographicCitation;
 +
 +    /**
 +     * An established standard to which the described resource conforms.
 +     */
 +    public static final URI conformsTo;
 +
 +    /**
 +     * An entity responsible for making contributions to the resource.
 +     */
 +    public static final URI contributor;
 +
 +    /**
 +     * The spatial or temporal topic of the resource, the spatial applicability of the resource, or the jurisdiction under which the resource is relevant.
 +     */
 +    public static final URI coverage;
 +
 +    /**
 +     * Date of creation of the resource.
 +     */
 +    public static final URI created;
 +
 +    /**
 +     * An entity primarily responsible for making the resource.
 +     */
 +    public static final URI creator;
 +
 +    /**
 +     * A point or period of time associated with an event in the lifecycle of the resource.
 +     */
 +    public static final URI date;
 +
 +    /**
 +     * Date of acceptance of the resource.
 +     */
 +    public static final URI dateAccepted;
 +
 +    /**
 +     * Date of copyright.
 +     */
 +    public static final URI dateCopyrighted;
 +
 +    /**
 +     * Date of submission of the resource.
 +     */
 +    public static final URI dateSubmitted;
 +
 +    /**
 +     * An account of the resource.
 +     */
 +    public static final URI description;
 +
 +    /**
 +     * A class of entity, defined in terms of progression through an educational or training context, for which the described resource is intended.
 +     */
 +    public static final URI educationLevel;
 +
 +    /**
 +     * The size or duration of the resource.
 +     */
 +    public static final URI extent;
 +
 +    /**
 +     * The file format, physical medium, or dimensions of the resource.
 +     */
 +    public static final URI format;
 +
 +    /**
 +     * A related resource that is substantially the same as the pre-existing described resource, but in another format.
 +     */
 +    public static final URI hasFormat;
 +
 +    /**
 +     * A related resource that is included either physically or logically in the described resource.
 +     */
 +    public static final URI hasPart;
 +
 +    /**
 +     * A related resource that is a version, edition, or adaptation of the described resource.
 +     */
 +    public static final URI hasVersion;
 +
 +    /**
 +     * An unambiguous reference to the resource within a given context.
 +     */
 +    public static final URI identifier;
 +
 +    /**
 +     * A process, used to engender knowledge, attitudes and skills, that the described resource is designed to support.
 +     */
 +    public static final URI instructionalMethod;
 +
 +    /**
 +     * A related resource that is substantially the same as the described resource, but in another format.
 +     */
 +    public static final URI isFormatOf;
 +
 +    /**
 +     * A related resource in which the described resource is physically or logically included.
 +     */
 +    public static final URI isPartOf;
 +
 +    /**
 +     * A related resource that references, cites, or otherwise points to the described resource.
 +     */
 +    public static final URI isReferencedBy;
 +
 +    /**
 +     * A related resource that supplants, displaces, or supersedes the described resource.
 +     */
 +    public static final URI isReplacedBy;
 +
 +    /**
 +     * A related resource that requires the described resource to support its function, delivery, or coherence.
 +     */
 +    public static final URI isRequiredBy;
 +
 +    /**
 +     * A related resource of which the described resource is a version, edition, or adaptation.
 +     */
 +    public static final URI isVersionOf;
 +
 +    /**
 +     * Date of formal issuance (e.g., publication) of the resource.
 +     */
 +    public static final URI issued;
 +
 +    /**
 +     * A language of the resource.
 +     */
 +    public static final URI language;
 +
 +    /**
 +     * A legal document giving official permission to do something with the resource.
 +     */
 +    public static final URI license;
 +
 +    /**
 +     * An entity that mediates access to the resource and for whom the resource is intended or useful.
 +     */
 +    public static final URI mediator;
 +
 +    /**
 +     * The material or physical carrier of the resource.
 +     */
 +    public static final URI medium;
 +
 +    /**
 +     * Date on which the resource was changed.
 +     */
 +    public static final URI modified;
 +
 +    /**
 +     * A statement of any changes in ownership and custody of the resource since its creation that are significant for its authenticity, integrity, and interpretation.
 +     */
 +    public static final URI provenance;
 +
 +    /**
 +     * An entity responsible for making the resource available.
 +     */
 +    public static final URI publisher;
 +
 +    /**
 +     * A related resource that is referenced, cited, or otherwise pointed to by the described resource.
 +     */
 +    public static final URI references;
 +
 +    /**
 +     * A related resource.
 +     */
 +    public static final URI relation;
 +
 +    /**
 +     * A related resource that is supplanted, displaced, or superseded by the described resource.
 +     */
 +    public static final URI replaces;
 +
 +    /**
 +     * A related resource that is required by the described resource to support its function, delivery, or coherence.
 +     */
 +    public static final URI requires;
 +
 +    /**
 +     * Information about rights held in and over the resource.
 +     */
 +    public static final URI rights;
 +
 +    /**
 +     * A person or organization owning or managing rights over the resource.
 +     */
 +    public static final URI rightsHolder;
 +
 +    /**
 +     * A related resource from which the described resource is derived.
 +     */
 +    public static final URI source;
 +
 +    /**
 +     * Spatial characteristics of the resource.
 +     */
 +    public static final URI spatial;
 +
 +    /**
 +     * The topic of the resource.
 +     */
 +    public static final URI subject;
 +
 +    /**
 +     * A list of subunits of the resource.
 +     */
 +    public static final URI tableOfContents;
 +
 +    /**
 +     * Temporal characteristics of the resource.
 +     */
 +    public static final URI temporal;
 +
 +    /**
 +     * A name given to the resource
 +     */
 +    public static final URI title;
 +
 +    /**
 +     * The nature or genre of the resource.
 +     */
 +    public static final URI type;
 +
 +    /**
 +     * Date (often a range) of validity of a resource.
 +     */
 +    public static final URI valid;
 +
 +
 +    static{
 +        ValueFactory factory = ValueFactoryImpl.getInstance();
 +        Agent = factory.createURI(DCTERMS.NAMESPACE, "Agent");
 +        AgentClass = factory.createURI(DCTERMS.NAMESPACE, "AgentClass");
 +        BibliographicResource = factory.createURI(DCTERMS.NAMESPACE, "BibliographicResource");
 +        Box = factory.createURI(DCTERMS.NAMESPACE, "Box");
 +        DCMIType = factory.createURI(DCTERMS.NAMESPACE, "DCMIType");
 +        DDC = factory.createURI(DCTERMS.NAMESPACE, "DDC");
 +        FileFormat = factory.createURI(DCTERMS.NAMESPACE, "FileFormat");
 +        Frequency = factory.createURI(DCTERMS.NAMESPACE, "Frequency");
 +        IMT = factory.createURI(DCTERMS.NAMESPACE, "IMT");
 +        ISO3166 = factory.createURI(DCTERMS.NAMESPACE, "ISO3166");
 +        ISO639_2 = factory.createURI(DCTERMS.NAMESPACE, "ISO639_2");
 +        ISO639_3 = factory.createURI(DCTERMS.NAMESPACE, "ISO639_3");
 +        Jurisdiction = factory.createURI(DCTERMS.NAMESPACE, "Jurisdiction");
 +        LCC = factory.createURI(DCTERMS.NAMESPACE, "LCC");
 +        LCSH = factory.createURI(DCTERMS.NAMESPACE, "LCSH");
 +        LicenseDocument = factory.createURI(DCTERMS.NAMESPACE, "LicenseDocument");
 +        LinguisticSystem = factory.createURI(DCTERMS.NAMESPACE, "LinguisticSystem");
 +        Location = factory.createURI(DCTERMS.NAMESPACE, "Location");
 +        LocationPeriodOrJurisdiction = factory.createURI(DCTERMS.NAMESPACE, "LocationPeriodOrJurisdiction");
 +        MESH = factory.createURI(DCTERMS.NAMESPACE, "MESH");
 +        MediaType = factory.createURI(DCTERMS.NAMESPACE, "MediaType");
 +        MediaTypeOrExtent = factory.createURI(DCTERMS.NAMESPACE, "MediaTypeOrExtent");
 +        MethodOfAccrual = factory.createURI(DCTERMS.NAMESPACE, "MethodOfAccrual");
 +        MethodOfInstruction = factory.createURI(DCTERMS.NAMESPACE, "MethodOfInstruction");
 +        NLM = factory.createURI(DCTERMS.NAMESPACE, "NLM");
 +        Period = factory.createURI(DCTERMS.NAMESPACE, "Period");
 +        PeriodOfTime = factory.createURI(DCTERMS.NAMESPACE, "PeriodOfTime");
 +        PhysicalMedium = factory.createURI(DCTERMS.NAMESPACE, "PhysicalMedium");
 +        PhysicalResource = factory.createURI(DCTERMS.NAMESPACE, "PhysicalResource");
 +        Point = factory.createURI(DCTERMS.NAMESPACE, "Point");
 +        Policy = factory.createURI(DCTERMS.NAMESPACE, "Policy");
 +        ProvenanceStatement = factory.createURI(DCTERMS.NAMESPACE, "ProvenanceStatement");
 +        RFC1766 = factory.createURI(DCTERMS.NAMESPACE, "RFC1766");
 +        RFC3066 = factory.createURI(DCTERMS.NAMESPACE, "RFC3066");
 +        RFC4646 = factory.createURI(DCTERMS.NAMESPACE, "RFC4646");
 +        RightsStatement = factory.createURI(DCTERMS.NAMESPACE, "RightsStatement");
 +        SizeOrDuration = factory.createURI(DCTERMS.NAMESPACE, "SizeOrDuration");
 +        Standard = factory.createURI(DCTERMS.NAMESPACE, "Standard");
 +        TGN = factory.createURI(DCTERMS.NAMESPACE, "TGN");
 +        UDC = factory.createURI(DCTERMS.NAMESPACE, "UDC");
 +        URI = factory.createURI(DCTERMS.NAMESPACE, "URI");
 +        W3CDTF = factory.createURI(DCTERMS.NAMESPACE, "W3CDTF");
 +        abstract_ = factory.createURI(DCTERMS.NAMESPACE, "abstract");
 +        accessRights = factory.createURI(DCTERMS.NAMESPACE, "accessRights");
 +        accrualMethod = factory.createURI(DCTERMS.NAMESPACE, "accrualMethod");
 +        accrualPeriodicity = factory.createURI(DCTERMS.NAMESPACE, "accrualPeriodicity");
 +        accrualPolicy = factory.createURI(DCTERMS.NAMESPACE, "accrualPolicy");
 +        alternative = factory.createURI(DCTERMS.NAMESPACE, "alternative");
 +        audience = factory.createURI(DCTERMS.NAMESPACE, "audience");
 +        available = factory.createURI(DCTERMS.NAMESPACE, "available");
 +        bibliographicCitation = factory.createURI(DCTERMS.NAMESPACE, "bibliographicCitation");
 +        conformsTo = factory.createURI(DCTERMS.NAMESPACE, "conformsTo");
 +        contributor = factory.createURI(DCTERMS.NAMESPACE, "contributor");
 +        coverage = factory.createURI(DCTERMS.NAMESPACE, "coverage");
 +        created = factory.createURI(DCTERMS.NAMESPACE, "created");
 +        creator = factory.createURI(DCTERMS.NAMESPACE, "creator");
 +        date = factory.createURI(DCTERMS.NAMESPACE, "date");
 +        dateAccepted = factory.createURI(DCTERMS.NAMESPACE, "dateAccepted");
 +        dateCopyrighted = factory.createURI(DCTERMS.NAMESPACE, "dateCopyrighted");
 +        dateSubmitted = factory.createURI(DCTERMS.NAMESPACE, "dateSubmitted");
 +        description = factory.createURI(DCTERMS.NAMESPACE, "description");
 +        educationLevel = factory.createURI(DCTERMS.NAMESPACE, "educationLevel");
 +        extent = factory.createURI(DCTERMS.NAMESPACE, "extent");
 +        format = factory.createURI(DCTERMS.NAMESPACE, "format");
 +        hasFormat = factory.createURI(DCTERMS.NAMESPACE, "hasFormat");
 +        hasPart = factory.createURI(DCTERMS.NAMESPACE, "hasPart");
 +        hasVersion = factory.createURI(DCTERMS.NAMESPACE, "hasVersion");
 +        identifier = factory.createURI(DCTERMS.NAMESPACE, "identifier");
 +        instructionalMethod = factory.createURI(DCTERMS.NAMESPACE, "instructionalMethod");
 +        isFormatOf = factory.createURI(DCTERMS.NAMESPACE, "isFormatOf");
 +        isPartOf = factory.createURI(DCTERMS.NAMESPACE, "isPartOf");
 +        isReferencedBy = factory.createURI(DCTERMS.NAMESPACE, "isReferencedBy");
 +        isReplacedBy = factory.createURI(DCTERMS.NAMESPACE, "isReplacedBy");
 +        isRequiredBy = factory.createURI(DCTERMS.NAMESPACE, "isRequiredBy");
 +        isVersionOf = factory.createURI(DCTERMS.NAMESPACE, "isVersionOf");
 +        issued = factory.createURI(DCTERMS.NAMESPACE, "issued");
 +        language = factory.createURI(DCTERMS.NAMESPACE, "language");
 +        license = factory.createURI(DCTERMS.NAMESPACE, "license");
 +        mediator = factory.createURI(DCTERMS.NAMESPACE, "mediator");
 +        medium = factory.createURI(DCTERMS.NAMESPACE, "medium");
 +        modified = factory.createURI(DCTERMS.NAMESPACE, "modified");
 +        provenance = factory.createURI(DCTERMS.NAMESPACE, "provenance");
 +        publisher = factory.createURI(DCTERMS.NAMESPACE, "publisher");
 +        references = factory.createURI(DCTERMS.NAMESPACE, "references");
 +        relation = factory.createURI(DCTERMS.NAMESPACE, "relation");
 +        replaces = factory.createURI(DCTERMS.NAMESPACE, "replaces");
 +        requires = factory.createURI(DCTERMS.NAMESPACE, "requires");
 +        rights = factory.createURI(DCTERMS.NAMESPACE, "rights");
 +        rightsHolder = factory.createURI(DCTERMS.NAMESPACE, "rightsHolder");
 +        source = factory.createURI(DCTERMS.NAMESPACE, "source");
 +        spatial = factory.createURI(DCTERMS.NAMESPACE, "spatial");
 +        subject = factory.createURI(DCTERMS.NAMESPACE, "subject");
 +        tableOfContents = factory.createURI(DCTERMS.NAMESPACE, "tableOfContents");
 +        temporal = factory.createURI(DCTERMS.NAMESPACE, "temporal");
 +        title = factory.createURI(DCTERMS.NAMESPACE, "title");
 +        type = factory.createURI(DCTERMS.NAMESPACE, "type");
 +        valid = factory.createURI(DCTERMS.NAMESPACE, "valid");
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/marmotta/blob/b5537356/commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/FOAF.java
----------------------------------------------------------------------
diff --cc commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/FOAF.java
index 2f09f3b,0000000..d336b39
mode 100644,000000..100644
--- a/commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/FOAF.java
+++ b/commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/FOAF.java
@@@ -1,487 -1,0 +1,486 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *      http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
- 
 +package org.apache.marmotta.commons.vocabulary;
 +
 +import org.openrdf.model.URI;
 +import org.openrdf.model.ValueFactory;
 +import org.openrdf.model.impl.ValueFactoryImpl;
 +
 +/**
 + * Namespace FOAF
 + */
 +public class FOAF {
 +
 +    public static final String NAMESPACE = "http://xmlns.com/foaf/0.1/";
 +
 +    public static final String PREFIX = "foaf";
 +
 +    /**
 +     * An agent (eg. person, group, software or physical artifact).
 +     */
 +    public static final URI Agent;
 +
 +    /**
 +     * A document.
 +     */
 +    public static final URI Document;
 +
 +    /**
 +     * A class of Agents.
 +     */
 +    public static final URI Group;
 +
 +    /**
 +     * An image.
 +     */
 +    public static final URI Image;
 +
 +    /**
 +     * A foaf:LabelProperty is any RDF property with texual values that serve as labels.
 +     */
 +    public static final URI LabelProperty;
 +
 +    /**
 +     * An online account.
 +     */
 +    public static final URI OnlineAccount;
 +
 +    /**
 +     * An online chat account.
 +     */
 +    public static final URI OnlineChatAccount;
 +
 +    /**
 +     * An online e-commerce account.
 +     */
 +    public static final URI OnlineEcommerceAccount;
 +
 +    /**
 +     * An online gaming account.
 +     */
 +    public static final URI OnlineGamingAccount;
 +
 +    /**
 +     * An organization.
 +     */
 +    public static final URI Organization;
 +
 +    /**
 +     * A person.
 +     */
 +    public static final URI Person;
 +
 +    /**
 +     * A personal profile RDF document.
 +     */
 +    public static final URI PersonalProfileDocument;
 +
 +    /**
 +     * A project (a collective endeavour of some kind).
 +     */
 +    public static final URI Project;
 +
 +    /**
 +     * Indicates an account held by this agent.
 +     */
 +    public static final URI account;
 +
 +    /**
 +     * Indicates the name (identifier) associated with this online account.
 +     */
 +    public static final URI accountName;
 +
 +    /**
 +     * Indicates a homepage of the service provide for this online account.
 +     */
 +    public static final URI accountServiceHomepage;
 +
 +    /**
 +     * The age in years of some agent.
 +     */
 +    public static final URI age;
 +
 +    /**
 +     * An AIM chat ID
 +     */
 +    public static final URI aimChatID;
 +
 +    /**
 +     * A location that something is based near, for some broadly human notion of near.
 +     */
 +    public static final URI based_near;
 +
 +    /**
 +     * The birthday of this Agent, represented in mm-dd string form, eg. '12-31'.
 +     */
 +    public static final URI birthday;
 +
 +    /**
 +     * A current project this person works on.
 +     */
 +    public static final URI currentProject;
 +
 +    /**
 +     * A depiction of some thing.
 +     */
 +    public static final URI depiction;
 +
 +    /**
 +     * A thing depicted in this representation.
 +     */
 +    public static final URI depicts;
 +
 +    /**
 +     * A checksum for the DNA of some thing. Joke.
 +     */
 +    public static final URI dnaChecksum;
 +
 +    /**
 +     * The family name of some person.
 +     */
 +    public static final URI familyName;
 +
 +    /**
 +     * The family name of some person.
 +     */
 +    public static final URI family_name;
 +
 +    /**
 +     * The first name of a person.
 +     */
 +    public static final URI firstName;
 +
 +    /**
 +     * The underlying or 'focal' entity associated with some SKOS-described concept.
 +     */
 +    public static final URI focus;
 +
 +    /**
 +     * An organization funding a project or person.
 +     */
 +    public static final URI fundedBy;
 +
 +    /**
 +     * A textual geekcode for this person, see http://www.geekcode.com/geek.html
 +     */
 +    public static final URI geekcode;
 +
 +    /**
 +     * The gender of this Agent (typically but not necessarily 'male' or 'female').
 +     */
 +    public static final URI gender;
 +
 +    /**
 +     * The given name of some person.
 +     */
 +    public static final URI givenName;
 +
 +    /**
 +     * The given name of some person.
 +     */
 +    public static final URI givenname;
 +
 +    /**
 +     * Indicates an account held by this agent.
 +     */
 +    public static final URI holdsAccount;
 +
 +    /**
 +     * A homepage for some thing.
 +     */
 +    public static final URI homepage;
 +
 +    /**
 +     * An ICQ chat ID
 +     */
 +    public static final URI icqChatID;
 +
 +    /**
 +     * An image that can be used to represent some thing (ie. those depictions which are particularly representative of something, eg. one's photo on a homepage).
 +     */
 +    public static final URI img;
 +
 +    /**
 +     * A page about a topic of interest to this person.
 +     */
 +    public static final URI interest;
 +
 +    /**
 +     * A document that this thing is the primary topic of.
 +     */
 +    public static final URI isPrimaryTopicOf;
 +
 +    /**
 +     * A jabber ID for something.
 +     */
 +    public static final URI jabberID;
 +
 +    /**
 +     * A person known by this person (indicating some level of reciprocated interaction between the parties).
 +     */
 +    public static final URI knows;
 +
 +    /**
 +     * The last name of a person.
 +     */
 +    public static final URI lastName;
 +
 +    /**
 +     * A logo representing some thing.
 +     */
 +    public static final URI logo;
 +
 +    /**
 +     * Something that was made by this agent.
 +     */
 +    public static final URI made;
 +
 +    /**
 +     * An agent that  made this thing.
 +     */
 +    public static final URI maker;
 +
 +    /**
 +     * A  personal mailbox, ie. an Internet mailbox associated with exactly one owner, the first owner of this mailbox. This is a 'static inverse functional property', in that  there is (across time and change) at most one individual that ever has any particular value for foaf:mbox.
 +     */
 +    public static final URI mbox;
 +
 +    /**
 +     * The sha1sum of the URI of an Internet mailbox associated with exactly one owner, the  first owner of the mailbox.
 +     */
 +    public static final URI mbox_sha1sum;
 +
 +    /**
 +     * Indicates a member of a Group
 +     */
 +    public static final URI member;
 +
 +    /**
 +     * Indicates the class of individuals that are a member of a Group
 +     */
 +    public static final URI membershipClass;
 +
 +    /**
 +     * An MSN chat ID
 +     */
 +    public static final URI msnChatID;
 +
 +    /**
 +     * A Myers Briggs (MBTI) personality classification.
 +     */
 +    public static final URI myersBriggs;
 +
 +    /**
 +     * A name for some thing.
 +     */
 +    public static final URI name;
 +
 +    /**
 +     * A short informal nickname characterising an agent (includes login identifiers, IRC and other chat nicknames).
 +     */
 +    public static final URI nick;
 +
 +    /**
 +     * An OpenID for an Agent.
 +     */
 +    public static final URI openid;
 +
 +    /**
 +     * A page or document about this thing.
 +     */
 +    public static final URI page;
 +
 +    /**
 +     * A project this person has previously worked on.
 +     */
 +    public static final URI pastProject;
 +
 +    /**
 +     * A phone,  specified using fully qualified tel: URI scheme (refs: http://www.w3.org/Addressing/schemes.html#tel).
 +     */
 +    public static final URI phone;
 +
 +    /**
 +     * A .plan comment, in the tradition of finger and '.plan' files.
 +     */
 +    public static final URI plan;
 +
 +    /**
 +     * The primary topic of some page or document.
 +     */
 +    public static final URI primaryTopic;
 +
 +    /**
 +     * A link to the publications of this person.
 +     */
 +    public static final URI publications;
 +
 +    /**
 +     * A homepage of a school attended by the person.
 +     */
 +    public static final URI schoolHomepage;
 +
 +    /**
 +     * A sha1sum hash, in hex.
 +     */
 +    public static final URI sha1;
 +
 +    /**
 +     * A Skype ID
 +     */
 +    public static final URI skypeID;
 +
 +    /**
 +     * A string expressing what the user is happy for the general public (normally) to know about their current activity.
 +     */
 +    public static final URI status;
 +
 +    /**
 +     * The surname of some person.
 +     */
 +    public static final URI surname;
 +
 +    /**
 +     * A theme.
 +     */
 +    public static final URI theme;
 +
 +    /**
 +     * A derived thumbnail image.
 +     */
 +    public static final URI thumbnail;
 +
 +    /**
 +     * A tipjar document for this agent, describing means for payment and reward.
 +     */
 +    public static final URI tipjar;
 +
 +    /**
 +     * Title (Mr, Mrs, Ms, Dr. etc)
 +     */
 +    public static final URI title;
 +
 +    /**
 +     * A topic of some page or document.
 +     */
 +    public static final URI topic;
 +
 +    /**
 +     * A thing of interest to this person.
 +     */
 +    public static final URI topic_interest;
 +
 +    /**
 +     * A weblog of some thing (whether person, group, company etc.).
 +     */
 +    public static final URI weblog;
 +
 +    /**
 +     * A work info homepage of some person; a page about their work for some organization.
 +     */
 +    public static final URI workInfoHomepage;
 +
 +    /**
 +     * A workplace homepage of some person; the homepage of an organization they work for.
 +     */
 +    public static final URI workplaceHomepage;
 +
 +    /**
 +     * A Yahoo chat ID
 +     */
 +    public static final URI yahooChatID;
 +
 +
 +    static{
 +        ValueFactory factory = ValueFactoryImpl.getInstance();
 +        Agent = factory.createURI(FOAF.NAMESPACE, "Agent");
 +        Document = factory.createURI(FOAF.NAMESPACE, "Document");
 +        Group = factory.createURI(FOAF.NAMESPACE, "Group");
 +        Image = factory.createURI(FOAF.NAMESPACE, "Image");
 +        LabelProperty = factory.createURI(FOAF.NAMESPACE, "LabelProperty");
 +        OnlineAccount = factory.createURI(FOAF.NAMESPACE, "OnlineAccount");
 +        OnlineChatAccount = factory.createURI(FOAF.NAMESPACE, "OnlineChatAccount");
 +        OnlineEcommerceAccount = factory.createURI(FOAF.NAMESPACE, "OnlineEcommerceAccount");
 +        OnlineGamingAccount = factory.createURI(FOAF.NAMESPACE, "OnlineGamingAccount");
 +        Organization = factory.createURI(FOAF.NAMESPACE, "Organization");
 +        Person = factory.createURI(FOAF.NAMESPACE, "Person");
 +        PersonalProfileDocument = factory.createURI(FOAF.NAMESPACE, "PersonalProfileDocument");
 +        Project = factory.createURI(FOAF.NAMESPACE, "Project");
 +        account = factory.createURI(FOAF.NAMESPACE, "account");
 +        accountName = factory.createURI(FOAF.NAMESPACE, "accountName");
 +        accountServiceHomepage = factory.createURI(FOAF.NAMESPACE, "accountServiceHomepage");
 +        age = factory.createURI(FOAF.NAMESPACE, "age");
 +        aimChatID = factory.createURI(FOAF.NAMESPACE, "aimChatID");
 +        based_near = factory.createURI(FOAF.NAMESPACE, "based_near");
 +        birthday = factory.createURI(FOAF.NAMESPACE, "birthday");
 +        currentProject = factory.createURI(FOAF.NAMESPACE, "currentProject");
 +        depiction = factory.createURI(FOAF.NAMESPACE, "depiction");
 +        depicts = factory.createURI(FOAF.NAMESPACE, "depicts");
 +        dnaChecksum = factory.createURI(FOAF.NAMESPACE, "dnaChecksum");
 +        familyName = factory.createURI(FOAF.NAMESPACE, "familyName");
 +        family_name = factory.createURI(FOAF.NAMESPACE, "family_name");
 +        firstName = factory.createURI(FOAF.NAMESPACE, "firstName");
 +        focus = factory.createURI(FOAF.NAMESPACE, "focus");
 +        fundedBy = factory.createURI(FOAF.NAMESPACE, "fundedBy");
 +        geekcode = factory.createURI(FOAF.NAMESPACE, "geekcode");
 +        gender = factory.createURI(FOAF.NAMESPACE, "gender");
 +        givenName = factory.createURI(FOAF.NAMESPACE, "givenName");
 +        givenname = factory.createURI(FOAF.NAMESPACE, "givenname");
 +        holdsAccount = factory.createURI(FOAF.NAMESPACE, "holdsAccount");
 +        homepage = factory.createURI(FOAF.NAMESPACE, "homepage");
 +        icqChatID = factory.createURI(FOAF.NAMESPACE, "icqChatID");
 +        img = factory.createURI(FOAF.NAMESPACE, "img");
 +        interest = factory.createURI(FOAF.NAMESPACE, "interest");
 +        isPrimaryTopicOf = factory.createURI(FOAF.NAMESPACE, "isPrimaryTopicOf");
 +        jabberID = factory.createURI(FOAF.NAMESPACE, "jabberID");
 +        knows = factory.createURI(FOAF.NAMESPACE, "knows");
 +        lastName = factory.createURI(FOAF.NAMESPACE, "lastName");
 +        logo = factory.createURI(FOAF.NAMESPACE, "logo");
 +        made = factory.createURI(FOAF.NAMESPACE, "made");
 +        maker = factory.createURI(FOAF.NAMESPACE, "maker");
 +        mbox = factory.createURI(FOAF.NAMESPACE, "mbox");
 +        mbox_sha1sum = factory.createURI(FOAF.NAMESPACE, "mbox_sha1sum");
 +        member = factory.createURI(FOAF.NAMESPACE, "member");
 +        membershipClass = factory.createURI(FOAF.NAMESPACE, "membershipClass");
 +        msnChatID = factory.createURI(FOAF.NAMESPACE, "msnChatID");
 +        myersBriggs = factory.createURI(FOAF.NAMESPACE, "myersBriggs");
 +        name = factory.createURI(FOAF.NAMESPACE, "name");
 +        nick = factory.createURI(FOAF.NAMESPACE, "nick");
 +        openid = factory.createURI(FOAF.NAMESPACE, "openid");
 +        page = factory.createURI(FOAF.NAMESPACE, "page");
 +        pastProject = factory.createURI(FOAF.NAMESPACE, "pastProject");
 +        phone = factory.createURI(FOAF.NAMESPACE, "phone");
 +        plan = factory.createURI(FOAF.NAMESPACE, "plan");
 +        primaryTopic = factory.createURI(FOAF.NAMESPACE, "primaryTopic");
 +        publications = factory.createURI(FOAF.NAMESPACE, "publications");
 +        schoolHomepage = factory.createURI(FOAF.NAMESPACE, "schoolHomepage");
 +        sha1 = factory.createURI(FOAF.NAMESPACE, "sha1");
 +        skypeID = factory.createURI(FOAF.NAMESPACE, "skypeID");
 +        status = factory.createURI(FOAF.NAMESPACE, "status");
 +        surname = factory.createURI(FOAF.NAMESPACE, "surname");
 +        theme = factory.createURI(FOAF.NAMESPACE, "theme");
 +        thumbnail = factory.createURI(FOAF.NAMESPACE, "thumbnail");
 +        tipjar = factory.createURI(FOAF.NAMESPACE, "tipjar");
 +        title = factory.createURI(FOAF.NAMESPACE, "title");
 +        topic = factory.createURI(FOAF.NAMESPACE, "topic");
 +        topic_interest = factory.createURI(FOAF.NAMESPACE, "topic_interest");
 +        weblog = factory.createURI(FOAF.NAMESPACE, "weblog");
 +        workInfoHomepage = factory.createURI(FOAF.NAMESPACE, "workInfoHomepage");
 +        workplaceHomepage = factory.createURI(FOAF.NAMESPACE, "workplaceHomepage");
 +        yahooChatID = factory.createURI(FOAF.NAMESPACE, "yahooChatID");
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/marmotta/blob/b5537356/commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/GEO.java
----------------------------------------------------------------------
diff --cc commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/GEO.java
index a5d77ce,0000000..f1a5b2a
mode 100644,000000..100644
--- a/commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/GEO.java
+++ b/commons/marmotta-sesame-tools/marmotta-model-vocabs/src/main/java/org/apache/marmotta/commons/vocabulary/GEO.java
@@@ -1,87 -1,0 +1,86 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *      http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
- 
 +package org.apache.marmotta.commons.vocabulary;
 +
 +import org.openrdf.model.URI;
 +import org.openrdf.model.ValueFactory;
 +import org.openrdf.model.impl.ValueFactoryImpl;
 +
 +/**
 + * Namespace GEO
 + */
 +public class GEO {
 +
 +    public static final String NAMESPACE = "http://www.w3.org/2003/01/geo/wgs84_pos#";
 +
 +    public static final String PREFIX = "geo";
 +
 +    /**
 +     * A point, typically described using a coordinate system relative to Earth, such as WGS84.
 +     */
 +    public static final URI Point;
 +
 +    /**
 +     * Anything with spatial extent, i.e. size, shape, or position.
 +     e.g. people, places, bowling balls, as well as abstract areas like cubes.
 +     */
 +    public static final URI SpatialThing;
 +
 +    /**
 +     * The WGS84 altitude of a SpatialThing (decimal meters
 +     above the local reference ellipsoid).
 +     */
 +    public static final URI alt;
 +
 +    /**
 +     * The WGS84 latitude of a SpatialThing (decimal degrees).
 +     */
 +    public static final URI lat;
 +
 +    /**
 +     * A comma-separated representation of a latitude, longitude coordinate.
 +     */
 +    public static final URI lat_long;
 +
 +    /**
 +     * The relation between something and the point,
 +     or other geometrical thing in space, where it is.  For example, the realtionship between
 +     a radio tower and a Point with a given lat and long.
 +     Or a relationship between a park and its outline as a closed arc of points, or a road and
 +     its location as a arc (a sequence of points).
 +     Clearly in practice there will be limit to the accuracy of any such statement, but one would expect
 +     an accuracy appropriate for the size of the object and uses such as mapping .
 +     */
 +    public static final URI location;
 +
 +    /**
 +     * The WGS84 longitude of a SpatialThing (decimal degrees).
 +     */
 +    public static final URI long_;
 +
 +
 +    static{
 +        ValueFactory factory = ValueFactoryImpl.getInstance();
 +        Point = factory.createURI(GEO.NAMESPACE, "Point");
 +        SpatialThing = factory.createURI(GEO.NAMESPACE, "SpatialThing");
 +        alt = factory.createURI(GEO.NAMESPACE, "alt");
 +        lat = factory.createURI(GEO.NAMESPACE, "lat");
 +        lat_long = factory.createURI(GEO.NAMESPACE, "lat_long");
 +        location = factory.createURI(GEO.NAMESPACE, "location");
 +        long_ = factory.createURI(GEO.NAMESPACE, "long");
 +    }
 +}