You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by rp...@apache.org on 2013/11/02 11:47:59 UTC
[08/11] git commit: Merge remote-tracking branch 'origin/develop'
into develop
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/3a0dadfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/3a0dadfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/3a0dadfe
Branch: refs/heads/develop
Commit: 3a0dadfe109a899a4f78c0061ec6a7cfc5516e3f
Parents: 5183357 cadd9b9
Author: Raffaele Palmieri <rp...@apache.org>
Authored: Fri Aug 9 01:03:19 2013 +0200
Committer: Raffaele Palmieri <rp...@apache.org>
Committed: Fri Aug 9 01:03:19 2013 +0200
----------------------------------------------------------------------
LICENSE.txt | 30 +
NOTICE.txt | 140 +-
.../marmotta-archetype-module/pom.xml | 2 +-
.../marmotta-archetype-webapp/pom.xml | 2 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/templates/404.ftl | 132 +-
.../src/main/webapp/WEB-INF/templates/admin.ftl | 141 +-
.../main/webapp/WEB-INF/templates/rdfhtml.ftl | 527 +-
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 +-
.../maven/plugins/refpack/RefPackMojo.java | 3 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 58 +-
.../ext/java/javax/realtime/RealtimeThread.java | 13 +
.../src/ext/java/javolution/lang/Immutable.java | 45 +
.../src/ext/java/javolution/lang/MathLib.java | 1471 +++
.../java/javolution/lang/Parallelizable.java | 73 +
.../src/ext/java/javolution/lang/Realtime.java | 113 +
.../src/ext/java/javolution/lang/ValueType.java | 71 +
.../ext/java/javolution/lang/package-info.java | 5 +
.../java/javolution/util/FastCollection.java | 634 +
.../src/ext/java/javolution/util/FastMap.java | 402 +
.../src/ext/java/javolution/util/FastSet.java | 146 +
.../ext/java/javolution/util/FastSortedMap.java | 205 +
.../ext/java/javolution/util/FastSortedSet.java | 153 +
.../java/javolution/util/FastSortedTable.java | 138 +
.../src/ext/java/javolution/util/FastTable.java | 438 +
.../java/javolution/util/function/Consumer.java | 29 +
.../javolution/util/function/Equalities.java | 74 +
.../java/javolution/util/function/Equality.java | 77 +
.../java/javolution/util/function/Function.java | 33 +
.../javolution/util/function/Iteration.java | 32 +
.../javolution/util/function/MultiVariable.java | 54 +
.../javolution/util/function/Predicate.java | 32 +
.../java/javolution/util/function/Reducer.java | 26 +
.../java/javolution/util/function/Reducers.java | 229 +
.../javolution/util/function/Splittable.java | 53 +
.../java/javolution/util/function/Supplier.java | 30 +
.../javolution/util/function/package-info.java | 25 +
.../util/internal/ReadWriteLockImpl.java | 138 +
.../collection/AtomicCollectionImpl.java | 194 +
.../internal/collection/CollectionView.java | 268 +
.../collection/DistinctCollectionImpl.java | 102 +
.../collection/FilteredCollectionImpl.java | 111 +
.../collection/MappedCollectionImpl.java | 101 +
.../collection/ReversedCollectionImpl.java | 98 +
.../collection/SequentialCollectionImpl.java | 83 +
.../collection/SharedCollectionImpl.java | 270 +
.../collection/SortedCollectionImpl.java | 109 +
.../collection/UnmodifiableCollectionImpl.java | 98 +
.../comparator/ArrayComparatorImpl.java | 72 +
.../comparator/IdentityComparatorImpl.java | 42 +
.../LexicalCaseInsensitiveComparatorImpl.java | 73 +
.../comparator/LexicalComparatorImpl.java | 76 +
.../comparator/LexicalFastComparatorImpl.java | 30 +
.../comparator/StandardComparatorImpl.java | 48 +
.../comparator/WrapperComparatorImpl.java | 52 +
.../util/internal/map/AtomicMapImpl.java | 192 +
.../util/internal/map/FastMapImpl.java | 250 +
.../util/internal/map/FractalMapImpl.java | 121 +
.../util/internal/map/MapEntryImpl.java | 46 +
.../javolution/util/internal/map/MapView.java | 363 +
.../util/internal/map/SequentialMapImpl.java | 93 +
.../util/internal/map/SharedMapImpl.java | 240 +
.../util/internal/map/UnmodifiableMapImpl.java | 109 +
.../map/sorted/AtomicSortedMapImpl.java | 82 +
.../internal/map/sorted/FastSortedMapImpl.java | 115 +
.../util/internal/map/sorted/MapEntryImpl.java | 50 +
.../map/sorted/SharedSortedMapImpl.java | 107 +
.../util/internal/map/sorted/SortedMapView.java | 163 +
.../internal/map/sorted/SubSortedMapImpl.java | 143 +
.../map/sorted/UnmodifiableSortedMapImpl.java | 85 +
.../util/internal/set/AtomicSetImpl.java | 31 +
.../util/internal/set/FilteredSetImpl.java | 43 +
.../util/internal/set/MappedSetImpl.java | 43 +
.../javolution/util/internal/set/SetView.java | 49 +
.../util/internal/set/SharedSetImpl.java | 52 +
.../util/internal/set/UnmodifiableSetImpl.java | 42 +
.../set/sorted/AtomicSortedSetImpl.java | 62 +
.../set/sorted/SharedSortedSetImpl.java | 88 +
.../util/internal/set/sorted/SortedSetView.java | 60 +
.../internal/set/sorted/SubSortedSetImpl.java | 144 +
.../set/sorted/UnmodifiableSortedSetImpl.java | 67 +
.../util/internal/table/AtomicTableImpl.java | 236 +
.../util/internal/table/FastTableImpl.java | 210 +
.../util/internal/table/FractalTableImpl.java | 172 +
.../util/internal/table/QuickSort.java | 75 +
.../util/internal/table/ReversedTableImpl.java | 76 +
.../util/internal/table/SharedTableImpl.java | 315 +
.../util/internal/table/SubTableImpl.java | 101 +
.../util/internal/table/TableIteratorImpl.java | 93 +
.../util/internal/table/TableView.java | 259 +
.../internal/table/UnmodifiableTableImpl.java | 84 +
.../table/sorted/AtomicSortedTableImpl.java | 55 +
.../table/sorted/FastSortedTableImpl.java | 67 +
.../table/sorted/SharedSortedTableImpl.java | 57 +
.../internal/table/sorted/SortedTableView.java | 68 +
.../table/sorted/SubSortedTableImpl.java | 87 +
.../sorted/UnmodifiableSortedTableImpl.java | 46 +
.../ext/java/javolution/util/package-info.java | 32 +
.../util/service/CollectionService.java | 39 +
.../javolution/util/service/MapService.java | 73 +
.../javolution/util/service/SetService.java | 24 +
.../util/service/SortedMapService.java | 41 +
.../util/service/SortedSetService.java | 33 +
.../util/service/SortedTableService.java | 36 +
.../javolution/util/service/TableService.java | 29 +
.../javolution/util/service/package-info.java | 6 +
.../commons/collections/CollectionUtils.java | 2 +
.../commons/collections/EquivalenceHashMap.java | 563 +
.../commons/collections/EquivalenceHashSet.java | 472 +
.../marmotta/commons/http/ETagGenerator.java | 24 +-
.../marmotta/commons/http/LMFHttpUtils.java | 148 -
.../commons/http/MarmottaHttpUtils.java | 145 +
.../marmotta/commons/locking/ObjectLocks.java | 75 +
.../commons/sesame/model/LiteralCommons.java | 3 +-
.../commons/sesame/model/LiteralKey.java | 60 +
.../commons/sesame/model/StatementCommons.java | 190 +
.../sesame/repository/ResourceUtils.java | 329 +-
.../apache/marmotta/commons/util/DateUtils.java | 39 +-
.../apache/marmotta/commons/vocabulary/XSD.java | 17 +
.../src/main/resources/META-INF/LICENSE | 234 +
.../src/main/resources/META-INF/NOTICE | 18 +
.../collections/EquivalenceHashSet2Test.java | 62 +
.../collections/EquivalenceHashSetTest.java | 138 +
.../commons/http/ContentTypeMatchingTest.java | 8 +-
.../commons/http/MarmottaHttpUtilsTest.java | 40 +
.../sesame/model/LiteralCommonsTest.java | 1 +
.../sesame/model/StatementCommonsTest.java | 225 +
.../marmotta/commons/util/DateUtilsTest.java | 44 +
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
.../sesame/facading/impl/FacadingImpl.java | 15 +-
.../sesame/facading/AbstractFacadingTest.java | 1 +
.../builder/FacadingPredicateBuilderTest.java | 1 +
.../facading/builder/model/ExampleFacade.java | 1 +
.../builder/model/ExamplePropBuilder.java | 1 +
.../collections/CollectionFacadingTest.java | 1 +
.../collections/model/CollectionFacade.java | 1 +
.../concurrent/ConcurrentFacadingTest.java | 26 +-
.../facading/concurrent/model/FooFacade.java | 17 +
.../facading/concurrent/model/TypeFacade.java | 17 +
.../sesame/facading/foaf/FacadingFoafTest.java | 1 +
.../facading/foaf/model/OnlineAccount.java | 1 +
.../sesame/facading/foaf/model/Person.java | 1 +
.../facading/locale/LocaleFacadingTest.java | 1 +
.../facading/locale/model/LocaleFacade.java | 1 +
.../facading/primitive/BoxedFacadingTest.java | 1 +
.../primitive/PrimitiveFacadingTest.java | 17 +
.../sesame/facading/primitive/model/Boxed.java | 17 +
.../facading/primitive/model/Primitive.java | 17 +
.../facading/primitive/model/PropBuilder.java | 17 +
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 6 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 15 +-
extras/webjars/codemirror/pom.xml | 97 +
.../src/main/resources/codemirror.css | 259 +
.../codemirror/src/main/resources/codemirror.js | 5831 +++++++++
.../codemirror/src/main/resources/ldpath.html | 246 +
.../codemirror/src/main/resources/ldpath.js | 471 +
.../src/main/resources/matchbrackets.js | 86 +
.../src/main/resources/simple-hint.css | 20 +
.../src/main/resources/simple-hint.js | 80 +
.../codemirror/src/main/resources/skwrl.html | 254 +
.../codemirror/src/main/resources/skwrl.js | 491 +
.../codemirror/src/main/resources/sparql.js | 210 +
extras/webjars/pom.xml | 55 +
extras/webjars/sgvizler/pom.xml | 80 +
.../webjars/sgvizler/0.5.1/lib/d3.v2.min.js | 1 +
.../0.5.1/lib/raphael-dracula.pack.min.js | 1 +
.../webjars/sgvizler/0.5.1/sgvizler.chart.css | 1 +
.../webjars/sgvizler/0.5.1/sgvizler.js | 1 +
.../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 | 106 +
.../webjars/snorql/src/main/resources/LICENSE | 202 +
extras/webjars/snorql/src/main/resources/README | 11 +
.../webjars/snorql/src/main/resources/link.png | Bin 0 -> 165 bytes
.../snorql/src/main/resources/namespaces.js | 26 +
.../snorql/src/main/resources/prototype.js | 4238 ++++++
.../snorql/src/main/resources/rdf_flyer.24.gif | Bin 0 -> 330 bytes
.../src/main/resources/scriptaculous/builder.js | 153 +
.../main/resources/scriptaculous/controls.js | 971 ++
.../main/resources/scriptaculous/dragdrop.js | 985 ++
.../src/main/resources/scriptaculous/effects.js | 1130 ++
.../resources/scriptaculous/scriptaculous.js | 40 +
.../src/main/resources/scriptaculous/slider.js | 287 +
.../src/main/resources/scriptaculous/sound.js | 65 +
.../main/resources/scriptaculous/unittest.js | 578 +
.../webjars/snorql/src/main/resources/snorql.js | 596 +
.../webjars/snorql/src/main/resources/sparql.js | 507 +
.../webjars/snorql/src/main/resources/style.css | 85 +
.../snorql/src/main/resources/xml-to-html.xsl | 183 +
extras/webjars/strftime/pom.xml | 81 +
.../strftime/src/main/resources/strftime.js | 750 ++
launchers/marmotta-installer/pom.xml | 2 +-
.../src/main/resources/images/splashscreen.png | Bin 70948 -> 78597 bytes
.../src/main/resources/images/splashscreen.psd | Bin 2928232 -> 545248 bytes
.../src/main/resources/installer/LICENSE.txt | 33 +-
.../src/main/resources/installer/NOTICE.txt | 306 +-
.../src/main/resources/installer/standalone.xml | 2 +
launchers/marmotta-splash/pom.xml | 2 +-
.../src/ext/resources/META-INF/NOTICE | 7 +-
.../splash/SplashScreenUpdaterBase.java | 13 +-
.../src/main/resources/META-INF/NOTICE | 10 +-
launchers/marmotta-webapp/pom.xml | 8 +-
.../src/main/resources/ehcache-lmf.xml | 422 -
.../src/main/resources/ehcache-marmotta.xml | 407 +
.../src/main/webapp/META-INF/LICENSE | 33 +-
.../src/main/webapp/META-INF/NOTICE | 263 +-
.../src/test/resources/ehcache.xml | 4 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 10 +-
.../kiwi/reasoner/engine/ReasoningEngine.java | 546 +-
.../model/exception/ReasoningException.java | 100 +
.../exception/UnjustifiedTripleException.java | 44 +
.../reasoner/model/program/Justification.java | 12 +-
.../kiwi/reasoner/model/program/Pattern.java | 21 +-
.../kiwi/reasoner/model/query/QueryResult.java | 12 +-
.../kiwi/reasoner/util/JustificationUtils.java | 26 +
.../engine/JustificationResolutionTest.java | 316 +
.../test/engine/ReasoningEngineTest.java | 122 +-
.../reasoner/test/model/JustificationTest.java | 196 +
.../JustificationPersistenceTest.java | 131 +-
.../persistence/KWRLProgramPersistenceTest.java | 117 +-
.../test/persistence/PatternQueryTest.java | 113 +-
.../reasoner/test/sail/ReasoningSailTest.java | 97 +-
.../KiWiRDFSchemaRepositoryConnectionTest.java | 179 +
.../kiwi/reasoner/test/parser/test-002.kwrl | 6 +-
.../reasoner/test/persistence/test-002.kwrl | 6 +-
.../kiwi/reasoner/test/sesame/rdfs.skwrl | 36 +
libraries/kiwi/kiwi-sparql/pom.xml | 30 +-
.../evaluation/KiWiEvaluationStrategyImpl.java | 13 +-
.../persistence/KiWiSparqlConnection.java | 82 +-
.../sparql/sail/KiWiSparqlSailConnection.java | 5 +-
.../sparql/test/ComplexKiWiSparqlQueryTest.java | 53 +
.../kiwi/sparql/test/KiWiSparqlJoinTest.java | 130 +-
.../kiwi/sparql/test/KiWiSparqlUpdateTest.java | 51 +
.../marmotta/kiwi/sparql/test/query1.sparql | 17 +
.../marmotta/kiwi/sparql/test/query10.sparql | 17 +
.../marmotta/kiwi/sparql/test/query11.sparql | 17 +
.../marmotta/kiwi/sparql/test/query12.sparql | 17 +
.../marmotta/kiwi/sparql/test/query13.sparql | 28 +
.../marmotta/kiwi/sparql/test/query14.sparql | 25 +
.../marmotta/kiwi/sparql/test/query2.sparql | 17 +
.../marmotta/kiwi/sparql/test/query3.sparql | 17 +
.../marmotta/kiwi/sparql/test/query4.sparql | 17 +
.../marmotta/kiwi/sparql/test/query5.sparql | 17 +
.../marmotta/kiwi/sparql/test/query6.sparql | 17 +
.../marmotta/kiwi/sparql/test/query7.sparql | 17 +
.../marmotta/kiwi/sparql/test/query8.sparql | 17 +
.../marmotta/kiwi/sparql/test/query9.sparql | 17 +
libraries/kiwi/kiwi-transactions/pom.xml | 4 +-
.../marmotta/kiwi/test/TransactionTest.java | 130 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 11 +-
.../marmotta/kiwi/config/KiWiConfiguration.java | 47 +
.../kiwi/model/rdf/KiWiAnonResource.java | 11 +-
.../marmotta/kiwi/model/rdf/KiWiLiteral.java | 38 +-
.../marmotta/kiwi/model/rdf/KiWiTriple.java | 17 +-
.../kiwi/model/rdf/KiWiUriResource.java | 13 +-
.../kiwi/persistence/KiWiConnection.java | 632 +-
.../marmotta/kiwi/persistence/KiWiDialect.java | 36 +-
.../kiwi/persistence/KiWiGarbageCollector.java | 129 +-
.../kiwi/persistence/KiWiPersistence.java | 246 +-
.../marmotta/kiwi/persistence/h2/H2Dialect.java | 11 +
.../kiwi/persistence/mysql/MySQLDialect.java | 13 +
.../persistence/pgsql/PostgreSQLDialect.java | 20 +
.../marmotta/kiwi/sail/KiWiSailConnection.java | 151 +-
.../apache/marmotta/kiwi/sail/KiWiStore.java | 37 +-
.../marmotta/kiwi/sail/KiWiValueFactory.java | 608 +-
.../kiwi/persistence/h2/create_base_tables.sql | 4 +-
.../kiwi/persistence/h2/statements.properties | 21 +-
.../persistence/h2/upgrade_base_001_002.sql | 21 +-
.../persistence/mysql/create_base_tables.sql | 18 +-
.../persistence/mysql/statements.properties | 17 +-
.../persistence/mysql/upgrade_base_001_002.sql | 25 +-
.../persistence/pgsql/create_base_tables.sql | 4 +-
.../persistence/pgsql/statements.properties | 17 +-
.../persistence/pgsql/upgrade_base_001_002.sql | 20 +-
.../marmotta/kiwi/test/ConcurrencyTestBase.java | 189 +
.../apache/marmotta/kiwi/test/DialectTest.java | 85 +-
.../marmotta/kiwi/test/H2ConcurrencyTest.java | 181 +-
.../kiwi/test/MySQLConcurrencyTest.java | 183 +-
.../marmotta/kiwi/test/PersistenceTest.java | 261 +-
.../kiwi/test/PostgreSQLConcurrencyTest.java | 182 +-
.../marmotta/kiwi/test/RepositoryTest.java | 463 +-
.../kiwi/test/helper/DBConnectionChecker.java | 110 +-
.../kiwi/test/junit/DatabaseRunnerTest1.java | 82 +
.../kiwi/test/junit/DatabaseRunnerTest2.java | 79 +
.../kiwi/test/junit/KiWiDatabaseRunner.java | 340 +
.../kiwi/test/sesame/KiWiLocaleTest.java | 113 +
.../test/sesame/KiWiSailConcurrencyTest.java | 83 +
.../kiwi/test/sesame/KiWiSailInterruptTest.java | 71 +
.../kiwi/test/sesame/KiWiStoreTest.java | 66 +
.../KiWiRepositoryConnectionTest.java | 70 +
.../sesame/repository/KiWiRepositoryTest.java | 66 +
libraries/kiwi/kiwi-tripletable/pom.xml | 6 +-
.../marmotta/kiwi/model/caching/IntArray.java | 13 +-
.../kiwi/model/caching/TripleTable.java | 65 +-
.../kiwi/model/caching/TripleTableTest.java | 48 +-
libraries/kiwi/kiwi-versioning/pom.xml | 4 +-
.../persistence/KiWiVersioningConnection.java | 60 +
.../persistence/KiWiVersioningPersistence.java | 8 +-
.../versioning/sail/KiWiVersioningSail.java | 144 +-
.../kiwi/persistence/h2/statements.properties | 2 +-
.../persistence/mysql/statements.properties | 2 +-
.../persistence/pgsql/statements.properties | 2 +-
.../versioning/test/SnapshotRepositoryTest.java | 141 +-
.../test/VersioningPersistenceTest.java | 208 +-
.../test/VersioningRepositoryTest.java | 227 +-
libraries/kiwi/pom.xml | 6 +-
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 | 4 +-
.../persistence/h2/upgrade_ldcache_001_002.sql | 15 +
.../mysql/upgrade_ldcache_001_002.sql | 15 +
.../pgsql/upgrade_ldcache_001_002.sql | 15 +
.../kiwi/test/LDCachePersistenceTest.java | 1 +
libraries/ldcache/ldcache-core/pom.xml | 4 +-
.../marmotta/ldcache/services/LDCache.java | 46 +-
.../ldcache/services/test/LDCacheKiWiTest.java | 5 +
.../services/test/dummy/DummyProvider.java | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
.../ldcache/sail/test/dummy/DummyProvider.java | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 4 +-
.../test/KiWiLinkedDataSailOfflineTest.java | 7 +-
.../ldcache/sail/test/dummy/DummyProvider.java | 2 +-
.../ldcache/sail/test/dummy/resource1.ttl | 4 +-
.../ldcache/sail/test/dummy/resource2.ttl | 2 +-
.../ldcache/sail/test/dummy/resource3.ttl | 4 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
.../ldclient/api/endpoint/Endpoint.java | 2 +-
.../marmotta/ldclient/model/ClientResponse.java | 21 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
.../services/provider/AbstractHttpProvider.java | 28 +-
.../services/provider/BlockingProvider.java | 2 +-
.../ldclient/test/TestLDClientTest.java | 4 +-
.../ldclient/ldclient-provider-facebook/pom.xml | 2 +-
.../facebook/FacebookGraphProvider.java | 27 +-
.../ldclient/ldclient-provider-html/pom.xml | 2 +-
.../html/mapping/CssDateLiteralMapper.java | 2 +-
.../ldclient/ldclient-provider-ldap/pom.xml | 2 +-
.../provider/ldap/LdapFoafProvider.java | 2 +-
.../ldclient-provider-mediawiki/pom.xml | 2 +-
.../ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
.../ldclient/ldclient-provider-rdf/pom.xml | 2 +-
.../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 +-
.../youtube/YoutubeVideoPagesProvider.java | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
.../ldpath/api/functions/NodeFunction.java | 2 +-
.../marmotta/ldpath/api/tests/NodeTest.java | 1 +
.../api/transformers/NodeTransformer.java | 5 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
.../ldpath/backend/file/ParserTest.java | 6 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
.../ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
.../src/main/doc/LICENSE.txt | 31 +
.../src/main/doc/NOTICE.txt | 104 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
.../backend/sesame/AbstractSesameBackend.java | 29 +-
.../backend/sesame/SesameValueBackend.java | 17 +
libraries/ldpath/ldpath-core/pom.xml | 2 +-
.../java/org/apache/marmotta/ldpath/LDPath.java | 12 +-
.../ldpath/model/fields/FieldMapping.java | 23 +-
.../model/functions/ConcatenateFunction.java | 3 +-
.../ldpath/model/functions/CountFunction.java | 3 +-
.../ldpath/model/functions/FirstFunction.java | 5 +-
.../ldpath/model/functions/LastFunction.java | 5 +-
.../ldpath/model/functions/SortFunction.java | 3 +-
.../marmotta/ldpath/model/programs/Program.java | 53 +-
.../ldpath/model/tests/LiteralTypeTest.java | 15 +-
.../tests/functions/BinaryNumericTest.java | 1 +
.../marmotta/ldpath/util/Collections.java | 3 +
.../at/newmedialab/ldpath/parser/rdfpath.jj | 95 +-
.../BinaryNumericTestFunctionsTest.java | 4 +-
.../ldpath/model/functions/FunctionsTest.java | 16 +-
.../ldpath/parser/EmptyTestingBackend.java | 17 +-
.../marmotta/ldpath/parser/ParserTest.java | 31 +-
.../marmotta/ldpath/parser/ProgramTest.java | 78 +
.../marmotta/ldpath/parser/SelectorsTest.java | 19 +-
.../ldpath/parser/StringTestingBackend.java | 17 +
.../marmotta/ldpath/parser/TestsTest.java | 19 +-
.../marmotta/ldpath/test/AbstractTestBase.java | 14 +-
.../ldpath-core/src/test/resources/logback.xml | 2 +
.../src/test/resources/parse/namespaces.ldpath | 3 +-
.../src/test/resources/parse/program.ldpath | 20 +-
.../ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
.../model/functions/date/DateFunctionsTest.java | 6 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
.../model/functions/html/HtmlFunctionsTest.java | 8 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
.../model/functions/math/MathFunctionTest.java | 30 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
.../text/AbstractBinaryStringTest.java | 59 +
.../functions/text/AbstractStringTest.java | 101 +
.../functions/text/StringContainsTest.java | 42 +
.../functions/text/StringEndsWithTest.java | 44 +
.../tests/functions/text/StringEqualsIC.java | 42 +
.../tests/functions/text/StringEqualsTest.java | 42 +
.../tests/functions/text/StringIsEmptyTest.java | 61 +
.../functions/text/StringStartsWithTest.java | 44 +
...e.marmotta.ldpath.api.functions.TestFunction | 6 +
.../tests/functions/text/StringTestTest.java | 181 +
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
.../xml/RemoveXmlTagsFunctionTest.java | 4 +-
.../model/functions/xml/XPathFunctionTest.java | 4 +-
.../ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
.../ldpath/template/engine/LDPathDirective.java | 5 +-
.../template/engine/NamespaceDirective.java | 1 +
.../ldpath/template/engine/TemplateEngine.java | 18 +-
.../model/freemarker/TemplateNodeModel.java | 2 +-
.../model/freemarker/TemplateWrapperModel.java | 2 +-
.../transformers/TemplateLongTransformer.java | 4 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 153 +-
platform/marmotta-core/pom.xml | 14 +-
.../js/widgets/configurator/configurator.coffee | 19 +-
.../core/api/config/ConfigurationService.java | 6 +
.../core/api/importer/ImportWatchService.java | 48 +
.../core/api/jaxrs/ExceptionMapperService.java | 31 +
.../core/api/modules/ModuleService.java | 29 +
.../platform/core/api/prefix/PrefixService.java | 8 +
.../core/api/templating/TemplatingService.java | 8 +
.../core/api/triplestore/SesameService.java | 7 +
.../platform/core/filters/TemplatingFilter.java | 2 +-
.../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 +
.../platform/core/model/template/MenuItem.java | 75 +-
.../core/model/template/MenuItemType.java | 29 +
.../platform/core/rio/RDFHtmlWriterImpl.java | 67 +-
.../core/services/cache/CachingServiceImpl.java | 7 +-
.../config/ConfigurationServiceImpl.java | 187 +-
.../services/importer/ImportServiceImpl.java | 10 +-
.../importer/ImportWatchServiceImpl.java | 265 +
.../services/importer/rdf/RDFImporterImpl.java | 4 -
.../core/services/io/MarmottaIOServiceImpl.java | 47 +-
.../jaxrs/ExceptionMapperServiceImpl.java | 73 +
.../services/modules/ModuleServiceImpl.java | 160 +-
.../core/services/prefix/PrefixServiceImpl.java | 11 +
.../platform/core/services/task/TaskImpl.java | 2 +-
.../services/task/TaskManagerServiceImpl.java | 34 +-
.../templating/AdminTemplatingServiceImpl.java | 210 +-
.../services/triplestore/SesameServiceImpl.java | 12 +
.../core/servlet/MarmottaOptionsFilter.java | 2 +-
.../core/servlet/MarmottaPostStartupFilter.java | 5 -
.../core/startup/MarmottaStartupService.java | 2 +
.../config/ConfigurationWebService.java | 2 +-
.../core/webservices/io/ExportWebService.java | 10 +-
.../core/webservices/io/ImportWebService.java | 2 +
.../webservices/prefix/PrefixWebService.java | 18 +
.../resource/InspectionWebService.java | 2 +-
.../webservices/resource/MetaWebService.java | 59 +-
.../resource/ResourceWebService.java | 73 +-
.../resource/ResourceWebServiceHelper.java | 34 +-
.../webservices/system/SystemWebService.java | 35 +-
.../triplestore/ContextWebService.java | 10 +-
.../src/main/resources/META-INF/NOTICE | 23 +-
.../src/main/resources/kiwi-module.properties | 42 +-
.../src/main/resources/templates/404.ftl | 2 +-
.../src/main/resources/templates/admin.ftl | 110 +-
.../src/main/resources/templates/rdfhtml.ftl | 53 +-
.../src/main/resources/web/admin/about.html | 18 +-
.../main/resources/web/admin/configuration.html | 2 +-
.../src/main/resources/web/admin/contexts.html | 2 +-
.../src/main/resources/web/admin/dataview.html | 8 +-
.../src/main/resources/web/admin/export.html | 2 +-
.../resources/web/admin/js/lib/d3.v2.min.js | 4 -
.../admin/js/lib/raphael-dracula.pack.min.js | 7 -
.../resources/web/admin/js/lib/sgvizler.pack.js | 1294 --
.../src/main/resources/web/admin/prefixes.html | 23 +-
.../src/main/resources/web/admin/system.html | 8 +-
.../src/main/resources/web/admin/tasks.html | 4 +-
.../resources/web/public/html/reasoning.html | 2 +-
.../resources/web/public/js/lib/jquery-1.6.4.js | 9046 -------------
.../resources/web/public/js/lib/jquery-1.7.2.js | 4 -
.../web/public/js/lib/jquery-ui-1.8.21.js | 125 -
.../resources/web/public/js/lib/strftime.js | 750 --
.../test/base/jetty/TestInjectorFactory.java | 38 +-
.../platform/core/test/ld/LinkedDataTest.java | 280 +
.../src/test/resources/ehcache-db.xml | 451 -
.../src/test/resources/ehcache-lmf.xml | 417 -
.../src/test/resources/ehcache-marmotta.xml | 405 +
platform/marmotta-ldcache/pom.xml | 2 +-
.../model/filter/LDCacheIgnoreFilter.java | 17 +
.../endpoint/LinkedDataEndpointServiceImpl.java | 4 +-
.../src/main/resources/kiwi-module.properties | 6 +-
.../main/resources/web/admin/configuration.html | 2 +-
platform/marmotta-ldpath/pom.xml | 8 +-
.../platform/ldpath/api/LDPathService.java | 13 +
.../ldpath/services/LDPathServiceImpl.java | 52 +-
.../webservices/LDPathUtilWebService.java | 7 +
.../src/main/resources/META-INF/NOTICE | 6 +-
.../src/main/resources/kiwi-module.properties | 12 +-
.../src/main/resources/web/admin/functions.html | 2 +-
.../src/main/resources/web/admin/ldpath.html | 7 +-
.../src/main/resources/web/cm/LICENSE.txt | 23 -
.../src/main/resources/web/cm/codemirror.css | 191 -
.../src/main/resources/web/cm/codemirror.js | 3241 -----
.../src/main/resources/web/cm/index.html | 255 -
.../src/main/resources/web/cm/ldpath.js | 444 -
.../src/main/resources/web/cm/simple-hint.css | 33 -
.../src/main/resources/web/cm/simple-hint.js | 93 -
platform/marmotta-reasoner/pom.xml | 2 +-
.../src/main/resources/kiwi-module.properties | 6 +-
.../src/main/resources/web/admin/configure.html | 2 +-
platform/marmotta-security/pom.xml | 2 +-
.../src/main/resources/kiwi-module.properties | 13 +-
.../src/main/resources/web/admin/about.html | 41 +-
.../main/resources/web/admin/configuration.html | 2 +-
.../src/main/resources/web/admin/profiles.html | 2 +-
.../src/main/resources/web/admin/rules.html | 2 +-
platform/marmotta-sparql/jooq-config.xml | 89 -
platform/marmotta-sparql/pom.xml | 31 +-
.../platform/sparql/api/sparql/QueryType.java | 34 +
.../sparql/api/sparql/SparqlService.java | 72 +-
.../services/sparql/SparqlServiceImpl.java | 408 +-
.../sparqlio/rdf/SPARQLGraphResultWriter.java | 141 +-
.../sparqlhtml/SPARQLBooleanHTMLFormat.java | 32 +
.../sparqlhtml/SPARQLBooleanHTMLWriter.java | 293 +-
.../SPARQLBooleanHTMLWriterFactory.java | 49 +
.../sparqlio/sparqlhtml/SPARQLHTMLSettings.java | 38 +
.../sparqlhtml/SPARQLResultsHTMLFormat.java | 32 +
.../sparqlhtml/SPARQLResultsHTMLWriter.java | 50 +-
.../SPARQLResultsHTMLWriterFactory.java | 49 +
.../sparql/webservices/SparqlWebService.java | 503 +-
.../src/main/resources/META-INF/NOTICE | 27 +-
...ery.resultio.BooleanQueryResultWriterFactory | 1 +
...query.resultio.TupleQueryResultWriterFactory | 2 +
.../src/main/resources/kiwi-module.properties | 14 +-
.../main/resources/web/admin/configuration.html | 2 +-
.../main/resources/web/admin/editor/.gitignore | 2 -
.../web/admin/editor/CodeMirror_license.txt | 19 -
.../web/admin/editor/Flint_license.txt | 15 -
.../main/resources/web/admin/editor/README.txt | 134 -
.../web/admin/editor/flint_sparql_editor.html | 75 -
.../admin/editor/sparql/css/Remove_16x16.png | Bin 829 -> 0 bytes
.../web/admin/editor/sparql/css/docs.css | 704 -
.../web/admin/editor/sparql/css/font.js | 32 -
.../admin/editor/sparql/css/sparqlcolors.css | 76 -
.../web/admin/editor/sparql/flint-editor.js | 1923 ---
.../admin/editor/sparql/images/Cancel_16x16.png | Bin 807 -> 0 bytes
.../editor/sparql/images/Copy v2_16x16.png | Bin 433 -> 0 bytes
.../admin/editor/sparql/images/Copy_16x16.png | Bin 309 -> 0 bytes
.../admin/editor/sparql/images/Cut_16x16.png | Bin 511 -> 0 bytes
.../admin/editor/sparql/images/Cut_24x24.png | Bin 937 -> 0 bytes
.../admin/editor/sparql/images/Delete_16x16.png | Bin 733 -> 0 bytes
.../admin/editor/sparql/images/Edit_16x16.png | Bin 330 -> 0 bytes
.../editor/sparql/images/Favorites_16x16.png | Bin 635 -> 0 bytes
.../editor/sparql/images/Favorites_24x24.png | Bin 1091 -> 0 bytes
.../admin/editor/sparql/images/Find_16x16.png | Bin 417 -> 0 bytes
.../admin/editor/sparql/images/Globe_16x16.png | Bin 808 -> 0 bytes
.../admin/editor/sparql/images/Globe_24x24.png | Bin 1534 -> 0 bytes
.../editor/sparql/images/Information_16x16.png | Bin 736 -> 0 bytes
.../admin/editor/sparql/images/Key_16x16.png | Bin 431 -> 0 bytes
.../admin/editor/sparql/images/Key_24x24.png | Bin 702 -> 0 bytes
.../admin/editor/sparql/images/New_16x16.png | Bin 240 -> 0 bytes
.../admin/editor/sparql/images/New_24x24.png | Bin 315 -> 0 bytes
.../admin/editor/sparql/images/Next_16x16.png | Bin 844 -> 0 bytes
.../admin/editor/sparql/images/Next_24x24.png | Bin 1528 -> 0 bytes
.../admin/editor/sparql/images/Open_16x16.png | Bin 710 -> 0 bytes
.../admin/editor/sparql/images/Paste_16x16.png | Bin 469 -> 0 bytes
.../admin/editor/sparql/images/Prev_16x16.png | Bin 852 -> 0 bytes
.../admin/editor/sparql/images/Prev_24x24.png | Bin 2410 -> 0 bytes
.../editor/sparql/images/Preview_16x16.png | Bin 564 -> 0 bytes
.../editor/sparql/images/Previous_16x16.png | Bin 832 -> 0 bytes
.../editor/sparql/images/Properties_16x16.png | Bin 592 -> 0 bytes
.../editor/sparql/images/Properties_24x24.png | Bin 896 -> 0 bytes
.../admin/editor/sparql/images/Redo_16x16.png | Bin 579 -> 0 bytes
.../admin/editor/sparql/images/Redo_24x24.png | Bin 943 -> 0 bytes
.../editor/sparql/images/Refresh_16x16.png | Bin 502 -> 0 bytes
.../admin/editor/sparql/images/Remove_16x16.png | Bin 829 -> 0 bytes
.../sparql/images/Text Document_16x16.png | Bin 291 -> 0 bytes
.../admin/editor/sparql/images/Undo_16x16.png | Bin 589 -> 0 bytes
.../admin/editor/sparql/images/Undo_24x24.png | Bin 991 -> 0 bytes
.../editor/sparql/images/ajax-loader-red.gif | Bin 3208 -> 0 bytes
.../web/admin/editor/sparql/init-local.js | 69 -
.../web/admin/editor/sparql/init-openuplabs.js | 84 -
.../admin/editor/sparql/init-sparqlservice.js | 101 -
.../web/admin/editor/sparql/jquery-1.5.2.min.js | 16 -
.../web/admin/editor/sparql/lib/codemirror.css | 70 -
.../web/admin/editor/sparql/lib/codemirror.js | 2038 ---
.../web/admin/editor/sparql/lib/overlay.js | 68 -
.../web/admin/editor/sparql/lib/runmode.js | 44 -
.../web/admin/editor/sparql/sparqlParser.js | 11461 -----------------
.../web/admin/editor/sparql/sparqlmode.js | 185 -
.../web/admin/editor/sparql/sparqlmode_ll1.js | 1765 ---
.../src/main/resources/web/admin/link.png | Bin 0 -> 165 bytes
.../src/main/resources/web/admin/sgvizler.html | 141 +
.../resources/web/admin/sgvizler/0.5/LICENSE | 16 -
.../admin/sgvizler/0.5/example/exDBpedia1.html | 41 -
.../web/admin/sgvizler/0.5/example/exFROM1.html | 43 -
.../web/admin/sgvizler/0.5/example/exNPD1.html | 50 -
.../web/admin/sgvizler/0.5/example/exNPD10.html | 40 -
.../web/admin/sgvizler/0.5/example/exNPD2.html | 50 -
.../web/admin/sgvizler/0.5/example/exNPD3.html | 46 -
.../web/admin/sgvizler/0.5/example/exNPD4.html | 45 -
.../web/admin/sgvizler/0.5/example/exNPD5.html | 40 -
.../web/admin/sgvizler/0.5/example/exNPD6.html | 41 -
.../web/admin/sgvizler/0.5/example/exNPD7.html | 40 -
.../web/admin/sgvizler/0.5/example/exNPD8.html | 40 -
.../web/admin/sgvizler/0.5/example/exNPD9.html | 40 -
.../admin/sgvizler/0.5/example/exWorld1.html | 50 -
.../admin/sgvizler/0.5/example/exWorld2.html | 41 -
.../admin/sgvizler/0.5/example/exWorld3.html | 41 -
.../admin/sgvizler/0.5/example/exWorld4.html | 41 -
.../admin/sgvizler/0.5/example/exWorld5.html | 40 -
.../admin/sgvizler/0.5/example/exWorld6.html | 47 -
.../admin/sgvizler/0.5/example/exWorld7.html | 43 -
.../web/admin/sgvizler/0.5/example/examples.css | 50 -
.../web/admin/sgvizler/0.5/example/index.html | 12 -
.../admin/sgvizler/0.5/example/mainframe.html | 110 -
.../admin/sgvizler/0.5/example/menuframe.html | 46 -
.../web/admin/sgvizler/0.5/lib/d3.geom.min.js | 1 -
.../web/admin/sgvizler/0.5/lib/d3.layout.min.js | 1 -
.../web/admin/sgvizler/0.5/lib/d3.min.js | 2 -
.../web/admin/sgvizler/0.5/sgvizler.chart.css | 37 -
.../web/admin/sgvizler/0.5/sgvizler.html | 141 -
.../web/admin/sgvizler/0.5/sgvizler.js | 6 -
.../src/main/resources/web/admin/snorql.html | 151 +
.../src/main/resources/web/admin/snorql/LICENSE | 202 -
.../src/main/resources/web/admin/snorql/README | 11 -
.../main/resources/web/admin/snorql/link.png | Bin 165 -> 0 bytes
.../resources/web/admin/snorql/namespaces.js | 26 -
.../resources/web/admin/snorql/prototype.js | 4238 ------
.../resources/web/admin/snorql/rdf_flyer.24.gif | Bin 330 -> 0 bytes
.../web/admin/snorql/scriptaculous/builder.js | 153 -
.../web/admin/snorql/scriptaculous/controls.js | 971 --
.../web/admin/snorql/scriptaculous/dragdrop.js | 985 --
.../web/admin/snorql/scriptaculous/effects.js | 1130 --
.../admin/snorql/scriptaculous/scriptaculous.js | 52 -
.../web/admin/snorql/scriptaculous/slider.js | 287 -
.../web/admin/snorql/scriptaculous/sound.js | 65 -
.../web/admin/snorql/scriptaculous/unittest.js | 578 -
.../main/resources/web/admin/snorql/snorql.html | 149 -
.../main/resources/web/admin/snorql/snorql.js | 591 -
.../main/resources/web/admin/snorql/sparql.js | 507 -
.../main/resources/web/admin/snorql/style.css | 85 -
.../resources/web/admin/snorql/xml-to-html.xsl | 183 -
.../src/main/resources/web/admin/update.html | 24 +-
.../src/main/resources/web/cm/codemirror.css | 132 -
.../src/main/resources/web/cm/codemirror.js | 3064 -----
.../src/main/resources/web/cm/index.html | 242 -
.../src/main/resources/web/cm/simple-hint.css | 33 -
.../src/main/resources/web/cm/simple-hint.js | 89 -
.../src/main/resources/web/cm/sparql.js | 219 -
.../webservices/SparqlWebServiceTest.java | 23 +-
platform/marmotta-user/pom.xml | 2 +-
.../user/webservices/UserWebService.java | 34 +-
.../src/main/resources/kiwi-module.properties | 8 +-
platform/marmotta-versioning/pom.xml | 2 +-
.../services/VersionSerializerServiceImpl.java | 4 +-
.../services/VersioningSailProvider.java | 45 +
.../webservices/MementoWebService.java | 10 +-
.../webservices/VersioningWebService.java | 61 +-
.../src/main/resources/kiwi-module.properties | 6 +-
.../src/main/resources/template/timemap.ftl | 10 +-
platform/pom.xml | 2 +-
pom.xml | 5 +-
692 files changed, 47455 insertions(+), 57061 deletions(-)
----------------------------------------------------------------------