Merge branch 'MARMOTTA-321' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9c967993 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9c967993 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9c967993 Branch: refs/heads/develop Commit: 9c96799322d9b82da6fb532ef839eff94e0a6e55 Parents: 5a6e37a 9e5195f Author: Jakob Frank <[email protected]> Authored: Fri Nov 29 15:59:58 2013 +0100 Committer: Jakob Frank <[email protected]> Committed: Fri Nov 29 15:59:58 2013 +0100 ---------------------------------------------------------------------- LICENSE.txt | 96 +- extras/webjars/codemirror/pom.xml | 24 +- .../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/mode/ldpath/ldpath.css | 181 + .../src/main/resources/mode/ldpath/ldpath.html | 87 + .../src/main/resources/mode/ldpath/ldpath.js | 471 ++ .../src/main/resources/mode/skwrl/skwrl.css | 172 + .../src/main/resources/mode/skwrl/skwrl.html | 96 + .../src/main/resources/mode/skwrl/skwrl.js | 486 ++ .../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 - parent/pom.xml | 12 +- platform/marmotta-ldpath/pom.xml | 2 +- .../src/main/resources/web/admin/ldpath.html | 13 +- .../src/main/resources/web/admin/ldpath.js | 5 +- platform/marmotta-reasoner-kiwi/pom.xml | 7 +- .../src/main/resources/web/admin/configure.html | 10 +- platform/marmotta-sparql/pom.xml | 2 +- .../src/main/resources/web/admin/sgvizler.html | 10 +- .../src/main/resources/web/admin/snorql.html | 6 +- .../src/main/resources/web/admin/update.html | 6 +- 28 files changed, 1570 insertions(+), 8064 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c967993/extras/webjars/codemirror/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c967993/extras/webjars/codemirror/src/main/resources/mode/skwrl/skwrl.html ---------------------------------------------------------------------- diff --cc extras/webjars/codemirror/src/main/resources/mode/skwrl/skwrl.html index 0000000,8666d8c..442ba27 mode 000000,100644..100644 --- a/extras/webjars/codemirror/src/main/resources/mode/skwrl/skwrl.html +++ b/extras/webjars/codemirror/src/main/resources/mode/skwrl/skwrl.html @@@ -1,0 -1,96 +1,96 @@@ + <!-- + + 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. + + --> + <!doctype html> + <html> + <head> + <title>CodeMirror: SKWRL Demo</title> + + + <script type="text/javascript" src="../../../../../webjars/jquery/1.8.2/jquery.min.js"></script> + + <script type="text/javascript" src="../../../../../webjars/codemirror/3.16/lib/codemirror.js"></script> + <link rel="stylesheet" href="../../../../../webjars/codemirror/3.16/lib/codemirror.css"> + + <script src="../../../../../webjars/codemirror/3.16/addon/hint/show-hint.js"></script> + <link rel="stylesheet" href="../../../../../webjars/codemirror/3.16/addon/hint/show-hint.css"> + + <script type="text/javascript" src="skwrl.js"></script> + <link rel="stylesheet" href="skwrl.css"> + + </head> + <body> + <h1>CodeMirror: SKWRL demo</h1> + <div> - Read about the <a href="http://marmotta.incubator.apache.org/kiwi/reasoner.html"; title="Simple KiWi Reasoning Language">SKWRL Langugae</a> - in <a href="http://marmotta.incubator.apache.org/";>Apache Marmotta</a>. ++ Read about the <a href="http://marmotta.apache.org/kiwi/reasoner.html"; title="Simple KiWi Reasoning Language">SKWRL Langugae</a> ++ in <a href="http://marmotta.apache.org/";>Apache Marmotta</a>. + </div> + <div> + <button onclick="javascript:createEditor()">Editor</button> + <button onclick="javascript:removeEditor()">Plain</button> + </div> + <form> + <textarea id="code" name="code"> + /* rules taken from http://www.w3.org/TR/2004/REC-rdf-mt-20040210/#RDFRules */ + @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> + @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> + @prefix xsd: <http://www.w3.org/2001/XMLSchema#> + @prefix foaf: <http://xmlns.com/foaf/0.1/> + + rdf1: ($u $a $y) -> ($a rdf:type rdf:Property) + rdfs2: ($a rdfs:domain $x), ($u $a $y) -> ($u rdf:type $x) + rdfs3: ($a rdfs:range $x), ($u $a $v) -> ($v rdf:type $x) + rdfs4a: ($u $a $x) -> ($u rdf:type rdfs:Resource) + rdfs5: ($u rdfs:subPropertyOf $v), ($v rdfs:subPropertyOf $x) -> ($u rdfs:subPropertyOf $x) + rdfs6: ($u rdf:type rdf:Property) -> ($u rdfs:subPropertyOf $u) + rdfs7: ($a rdfs:subPropertyOf $b), ($u $a $y) -> ($u $b $y) + rdfs8: ($u rdf:type rdfs:Class) -> ($u rdfs:subClassOf rdfs:Resource) + rdfs9: ($u rdfs:subClassOf $x), ($v rdf:type $u) -> ($v rdf:type $x) + rdfs10: ($u rdf:type rdfs:Class) -> ($u rdfs:subClassOf $u) + rdfs11: ($u rdfs:subClassOf $v), ($v rdfs:subClassOf $x) -> ($u rdfs:subClassOf $x) + rdfs12: ($u rdf:type rdfs:ContainerMembershipProperty) -> ($u rdfs:subPropertyOf rdfs:member) + rdfs13: ($u rdf:type rdfs:Datatype) -> ($u rdfs:subClassOf rdfs:Literal) + + </textarea> + </form> + <script> + var editor = null; + function createEditor() { + if (editor === null) { + CodeMirror.commands.autocomplete = function(cm) { + CodeMirror.showHint(cm, CodeMirror.hint.skwrl); + }; + editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers : true, + matchBrackets : true, + extraKeys: {"Ctrl-Space": "autocomplete"}, + mode : "skwrl" + }); + } + } + function removeEditor() { + if (editor) { + editor.toTextArea(); + editor = null; + } + } + createEditor(); + </script> + </body> + </html> http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c967993/parent/pom.xml ---------------------------------------------------------------------- diff --cc parent/pom.xml index 033015f,a8ad7d8..ab4298a --- a/parent/pom.xml +++ b/parent/pom.xml @@@ -918,11 -913,12 +918,17 @@@ </dependency> <dependency> <groupId>org.webjars</groupId> + <artifactId>codemirror</artifactId> + <version>3.16</version> + </dependency> + <dependency> ++ <groupId>org.webjars</groupId> + <artifactId>angularjs</artifactId> + <version>1.2.2</version> - </dependency> <dependency> ++ </dependency> ++ <dependency> <groupId>org.apache.marmotta.webjars</groupId> - <artifactId>codemirror</artifactId> + <artifactId>codemirror-modes</artifactId> <version>${project.version}</version> </dependency> <dependency> @@@ -1225,14 -1207,12 +1231,14 @@@ </dependency> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-versioning</artifactId> + <artifactId>kiwi-reasoner</artifactId> <version>${project.version}</version> </dependency> + - <!-- LMF Sesame Tools --> ++ <!-- Marmotta Sesame Tools --> <dependency> <groupId>org.apache.marmotta</groupId> - <artifactId>kiwi-reasoner</artifactId> + <artifactId>sesame-transactions</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c967993/platform/marmotta-ldpath/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c967993/platform/marmotta-reasoner-kiwi/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c967993/platform/marmotta-sparql/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c967993/platform/marmotta-sparql/src/main/resources/web/admin/snorql.html ---------------------------------------------------------------------- diff --cc platform/marmotta-sparql/src/main/resources/web/admin/snorql.html index 1cd0349,78b6e03..78b6e03 mode 100644,100755..100644 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql.html +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql.html
