merged master 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/61f72cb9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/61f72cb9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/61f72cb9 Branch: refs/heads/master Commit: 61f72cb9f2ec4c512815cf5d79298848ecd1aef1 Parents: 8f17c43 24f602a Author: Sergio Fernández <[email protected]> Authored: Tue Apr 9 08:32:52 2013 +0200 Committer: Sergio Fernández <[email protected]> Committed: Tue Apr 9 08:32:52 2013 +0200 ---------------------------------------------------------------------- LICENSE.txt | 602 +++- .../src/main/resources/logback.xml | 47 +- .../src/main/webapp/WEB-INF/jetty-web.xml | 48 +- .../src/main/webapp/search/test_luke.html | 44 - .../src/main/webapp/skosjs-extension/test.html | 35 - .../src/main/webapp/solr/admin/_info.jsp | 121 - .../src/main/webapp/solr/admin/action.jsp | 90 - .../src/main/webapp/solr/admin/analysis.jsp | 505 --- .../src/main/webapp/solr/admin/analysis.xsl | 179 - .../src/main/webapp/solr/admin/dataimport.jsp | 56 - .../src/main/webapp/solr/admin/debug.jsp | 109 - .../main/webapp/solr/admin/distributiondump.jsp | 156 - .../src/main/webapp/solr/admin/form.jsp | 140 - .../src/main/webapp/solr/admin/get-file.jsp | 73 - .../src/main/webapp/solr/admin/get-properties.jsp | 27 - .../src/main/webapp/solr/admin/header.jsp | 47 - .../src/main/webapp/solr/admin/index.jsp | 162 - .../src/main/webapp/solr/admin/meta.xsl | 34 - .../src/main/webapp/solr/admin/ping.jsp | 50 - .../src/main/webapp/solr/admin/ping.xsl | 71 - .../src/main/webapp/solr/admin/raw-schema.jsp | 39 - .../src/main/webapp/solr/admin/registry.jsp | 109 - .../src/main/webapp/solr/admin/registry.xsl | 321 -- .../main/webapp/solr/admin/replication/header.jsp | 92 - .../main/webapp/solr/admin/replication/index.jsp | 382 -- .../src/main/webapp/solr/admin/schema.jsp | 677 ---- .../src/main/webapp/solr/admin/solr-admin.css | 214 -- .../src/main/webapp/solr/admin/solr_small.png | Bin 7926 -> 0 bytes .../src/main/webapp/solr/admin/stats.jsp | 94 - .../src/main/webapp/solr/admin/stats.xsl | 220 -- .../src/main/webapp/solr/admin/tabular.xsl | 141 - .../src/main/webapp/solr/admin/threaddump.jsp | 111 - .../src/main/webapp/solr/admin/threaddump.xsl | 103 - .../src/main/webapp/solr/index.jsp | 64 - .../src/test/resources/META-INF/beans.xml | 30 +- .../test/resources/META-INF/test-persistence.xml | 30 +- .../src/test/resources/WEB-INF/test-web.xml | 30 +- .../src/test/resources/arquillian.xml | 30 +- .../src/test/resources/ehcache.xml | 32 +- .../src/test/resources/jndi.properties | 2 - .../src/test/resources/logback.xml | 30 +- .../src/test/resources/test-config.properties | 4 +- build/scripts/check_signatures_and_digests.sh | 62 + .../client/test/config/ConfigurationIT.java | 3 + .../org/apache/marmotta/client/test/demo-data.foaf | 28 +- client/marmotta-client-js-sample-webapp/pom.xml | 2 +- client/marmotta-client-php/pom.xml | 2 +- .../commons/sesame/model/LiteralCommonsTest.java | 15 - .../commons/sesame/model/ResourceUtilsTest.java | 15 - .../marmotta/commons/sesame/model/demo-data.foaf | 30 +- .../commons/sesame/rio/ical/TestICalParser.java | 21 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../commons/sesame/rio/rss/TestAtomParser.java | 21 +- .../commons/sesame/rio/rss/TestRSSParser.java | 21 +- .../commons/sesame/rio/vcard/TestVCardParser.java | 15 - .../src/main/resources/installer/LICENSE.txt | 2784 ++++++++++++--- .../src/main/resources/installer/NOTICE.txt | 581 +--- .../Start Apache Marmotta.app/Contents/Info.plist | 29 +- .../Stop Apache Marmotta.app/Contents/Info.plist | 29 +- .../src/main/resources/META-INF/LICENSE | 284 ++ .../src/main/resources/META-INF/NOTICE | 15 + launchers/marmotta-webapp/NOTICE.template | 9 - launchers/marmotta-webapp/NOTICE.txt | 62 - launchers/marmotta-webapp/pom.xml | 8 +- .../src/main/webapp/META-INF/LICENSE | 2811 ++++++++++++--- .../src/main/webapp/META-INF/NOTICE | 480 +-- .../src/main/webapp/WEB-INF/web.xml | 18 + .../src/test/resources/META-INF/beans.xml | 30 +- .../test/resources/META-INF/test-persistence.xml | 30 +- .../src/test/resources/WEB-INF/test-web.xml | 30 +- .../src/test/resources/arquillian.xml | 29 +- .../marmotta-webapp/src/test/resources/ehcache.xml | 32 +- .../src/test/resources/jndi.properties | 2 - .../marmotta-webapp/src/test/resources/logback.xml | 30 +- .../src/test/resources/test-config.properties | 4 +- .../kiwi/reasoner/engine/ReasoningEngine.java | 4 +- .../kiwi/persistence/h2/drop_reasoner_tables.sql | 10 +- .../reasoner/test/engine/ReasoningEngineTest.java | 12 + .../test/parser/KWRLProgramParserTest.java | 21 + .../reasoner/test/parser/KWRLRuleParserTest.java | 19 + .../persistence/JustificationPersistenceTest.java | 19 + .../persistence/KWRLProgramPersistenceTest.java | 20 + .../test/persistence/PatternQueryTest.java | 18 + .../kiwi/reasoner/test/sail/ReasoningSailTest.java | 14 + .../kiwi-reasoner/src/test/resources/logback.xml | 27 - .../src/test/resources/logback.xml | 6 +- .../org/apache/marmotta/kiwi/test/demo-data.foaf | 29 +- .../apache/marmotta/kiwi/test/srfg-ontology.rdf | 32 +- .../marmotta/kiwi/persistence/KiWiPersistence.java | 2 +- .../org/apache/marmotta/kiwi/test/DialectTest.java | 20 + .../apache/marmotta/kiwi/test/PersistenceTest.java | 20 + .../apache/marmotta/kiwi/test/RepositoryTest.java | 17 + .../src/test/resources/logback.xml | 6 +- .../persistence/h2/create_versioning_tables.sql | 2 + .../kiwi/persistence/h2/drop_versioning_tables.sql | 8 +- .../persistence/mysql/create_versioning_tables.sql | 2 + .../persistence/mysql/drop_versioning_tables.sql | 8 +- .../persistence/pgsql/create_versioning_tables.sql | 2 + .../persistence/pgsql/drop_versioning_tables.sql | 2 + .../kiwi-versioning/src/test/resources/logback.xml | 27 - .../marmotta/kiwi/versioning/test/version-base.rdf | 31 +- .../kiwi/versioning/test/version-update1.rdf | 31 +- .../kiwi/versioning/test/version-update2.rdf | 31 +- .../src/test/resources/logback.xml | 6 +- .../kiwi/persistence/h2/drop_ldcache_tables.sql | 4 +- .../src/test/resources/logback.xml | 6 +- libraries/ldcache/ldcache-backend-mapdb/pom.xml | 2 +- .../ldcache-core/src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 6 +- .../ldclient-core/src/test/resources/logback.xml | 6 +- .../src/test/resources/logback.xml | 27 - .../src/test/resources/logback.xml | 27 - .../src/test/resources/logback.xml | 27 - .../src/test/resources/logback.xml | 27 - .../src/test/resources/logback.xml | 27 - .../marmotta/ldpath/backend/file/ParserTest.java | 15 - .../marmotta/ldpath/backend/file/PathTest.java | 15 - .../marmotta/ldpath/backend/file/demo-data.foaf | 30 +- .../ldpath-backend-linkeddata/NOTICE.template | 9 - .../src/main/doc/LICENSE.txt | 750 +++-- .../src/main/doc/NOTICE.txt | 220 +- license-mappings.xml | 43 +- parent/pom.xml | 13 +- .../core/services/content/ContentServiceImpl.java | 35 +- .../services/content/FileSystemContentReader.java | 31 +- .../core/services/content/HTTPContentReader.java | 27 +- .../services/templating/TemplatingServiceImpl.java | 7 +- .../core/servlet/MarmottaOptionsFilter.java | 170 - .../src/main/resources/config-defaults.properties | 8 +- .../main/resources/config-descriptions.properties | 11 +- .../src/main/resources/templates/404.ftl | 12 +- .../src/main/resources/templates/admin.ftl | 21 +- .../src/main/resources/templates/admin_old.ftl | 88 - .../src/main/resources/templates/rdfhtml.ftl | 7 +- .../src/main/resources/web/admin/dataview.html | 2 + .../resources/web/admin/js/lib/sgvizler.pack.js | 4 +- .../main/resources/web/public/js/lib/strftime.js | 4 +- .../src/main/resources/web/public/style/404.css | 44 - .../main/resources/web/public/style/blue/404.css | 43 + .../main/resources/web/public/style/blue/code.css | 51 + .../resources/web/public/style/blue/javadoc.css | 112 + .../resources/web/public/style/blue/rdfhtml.css | 41 + .../web/public/style/blue/sgvizler.chart.css | 53 + .../main/resources/web/public/style/blue/style.css | 284 ++ .../src/main/resources/web/public/style/code.css | 51 - .../main/resources/web/public/style/javadoc.css | 112 - .../main/resources/web/public/style/marmotta.css | 18 - .../main/resources/web/public/style/rdfhtml.css | 40 - .../resources/web/public/style/scheme/blue.css | 126 - .../resources/web/public/style/scheme/dark.css | 165 - .../resources/web/public/style/sgvizler.chart.css | 53 - .../src/main/resources/web/public/style/style.css | 227 -- .../main/resources/web/public/style/white/404.css | 44 + .../main/resources/web/public/style/white/code.css | 51 + .../resources/web/public/style/white/javadoc.css | 112 + .../resources/web/public/style/white/rdfhtml.css | 40 + .../web/public/style/white/sgvizler.chart.css | 53 + .../resources/web/public/style/white/style.css | 233 ++ .../src/test/resources/META-INF/beans.xml | 30 +- .../src/test/resources/ehcache-db.xml | 32 +- .../src/test/resources/ehcache-lmf.xml | 32 +- .../src/test/resources/logback-testing.xml | 30 +- .../marmotta-core/src/test/resources/logback.xml | 30 +- .../platform/core/test/sesame/demo-data.foaf | 30 +- .../src/main/resources/web/cm/LICENSE.txt | 23 + platform/marmotta-sparql/pom.xml | 70 +- .../platform/sparql/api/sparql/SparqlService.java | 45 +- .../sparql/services/sparql/SparqlServiceImpl.java | 126 +- .../services/sparql/SparqlWritersHelper.java | 95 + .../sparqlio/rdf/SPARQLGraphResultWriter.java | 40 +- .../sparql/webservices/SparqlWebService.java | 3 +- .../sparql/webservices/SparqlWebServiceTest.java | 183 + .../marmotta-sparql/src/test/resources/foaf.rdf | 79 + pom.xml | 2 +- 176 files changed, 9080 insertions(+), 8749 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/61f72cb9/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiPersistence.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/61f72cb9/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PersistenceTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/61f72cb9/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/61f72cb9/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/PathTest.java ---------------------------------------------------------------------- diff --cc libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/PathTest.java index aceb25a,773c439..fdb809d --- a/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/PathTest.java +++ b/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/PathTest.java @@@ -16,23 -16,9 +16,8 @@@ * limitations under the License. */ package org.apache.marmotta.ldpath.backend.file; - /* - * Copyright (c) 2011 Salzburg Research. - * - * Licensed 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. - */ import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.hasItems; import java.util.Collection; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/61f72cb9/parent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/61f72cb9/platform/marmotta-ldpath/src/main/resources/web/cm/LICENSE.txt ---------------------------------------------------------------------- diff --cc platform/marmotta-ldpath/src/main/resources/web/cm/LICENSE.txt index 0000000,0000000..482d55e new file mode 100644 --- /dev/null +++ b/platform/marmotta-ldpath/src/main/resources/web/cm/LICENSE.txt @@@ -1,0 -1,0 +1,23 @@@ ++Copyright (C) 2013 by Marijn Haverbeke <[email protected]> ++ ++Permission is hereby granted, free of charge, to any person obtaining a copy ++of this software and associated documentation files (the "Software"), to deal ++in the Software without restriction, including without limitation the rights ++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++copies of the Software, and to permit persons to whom the Software is ++furnished to do so, subject to the following conditions: ++ ++The above copyright notice and this permission notice shall be included in ++all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++THE SOFTWARE. ++ ++Please note that some subdirectories of the CodeMirror distribution ++include their own LICENSE files, and are released under different ++licences. http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/61f72cb9/pom.xml ----------------------------------------------------------------------
