You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/07/09 11:51:16 UTC
[35/41] git commit: - moved SNORQL to WebJar - moved CodeMirror to
WebJar - moved Sgvizler to WebJar - cleaned up uses of non-webjar jquery and
jquery-ui - configured YUI compressor for the above packages in build
- moved SNORQL to WebJar
- moved CodeMirror to WebJar
- moved Sgvizler to WebJar
- cleaned up uses of non-webjar jquery and jquery-ui
- configured YUI compressor for the above packages in build
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/5fd590b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/5fd590b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/5fd590b4
Branch: refs/heads/develop
Commit: 5fd590b43ebd874240f931375c8bcb35e1d0673e
Parents: f3cd959
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Jul 8 18:11:53 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Jul 8 18:11:53 2013 +0200
----------------------------------------------------------------------
extras/pom.xml | 3 +
extras/webjars/codemirror/pom.xml | 62 +
.../src/main/resources/codemirror.css | 132 +
.../codemirror/src/main/resources/codemirror.js | 3064 +++++
.../codemirror/src/main/resources/index.html | 242 +
.../codemirror/src/main/resources/ldpath.js | 445 +
.../src/main/resources/simple-hint.css | 33 +
.../src/main/resources/simple-hint.js | 89 +
.../codemirror/src/main/resources/sparql.js | 219 +
extras/webjars/pom.xml | 23 +
extras/webjars/sgvizler/pom.xml | 51 +
.../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 | 76 +
.../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 | 591 +
.../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 +
parent/pom.xml | 20 +
platform/marmotta-core/pom.xml | 4 +
.../main/resources/web/admin/configuration.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/system.html | 2 +-
.../src/main/resources/web/admin/tasks.html | 2 +-
.../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 -
.../main/resources/web/admin/configuration.html | 2 +-
platform/marmotta-ldpath/pom.xml | 6 +
.../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 -
.../src/main/resources/web/admin/configure.html | 2 +-
.../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 | 16 +
.../src/main/resources/kiwi-module.properties | 2 +-
.../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 -
.../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 | 142 +
.../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 | 13 +-
.../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 -
.../user/webservices/UserWebService.java | 34 +-
160 files changed, 16319 insertions(+), 47967 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5fd590b4/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 4d9cf28..534adf9 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -50,4 +50,7 @@
</plugins>
</build>
+ <modules>
+ <module>webjars</module>
+ </modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5fd590b4/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
new file mode 100644
index 0000000..d459b71
--- /dev/null
+++ b/extras/webjars/codemirror/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-parent</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.marmotta.webjars</groupId>
+ <artifactId>codemirror</artifactId>
+ <version>2.24</version>
+ <packaging>jar</packaging>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ <executions>
+ <execution>
+ <id>assemble-javascript</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <configuration>
+ <sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory>
+ <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/codemirror.js</output>
+ </configuration>
+ </execution>
+ <execution>
+ <id>assemble-css</id>
+ <goals>
+ <goal>aggregate-css</goal>
+ </goals>
+ <configuration>
+ <sourceDirectory>${project.basedir}/src/main/resources</sourceDirectory>
+ <output>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/codemirror.css</output>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>**/*.js</exclude>
+ <exclude>**/*.css</exclude>
+ </excludes>
+ <filtering>false</filtering>
+ <targetPath>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</targetPath>
+ </resource>
+ </resources>
+ </build>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5fd590b4/extras/webjars/codemirror/src/main/resources/codemirror.css
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/src/main/resources/codemirror.css b/extras/webjars/codemirror/src/main/resources/codemirror.css
new file mode 100644
index 0000000..b5385d7
--- /dev/null
+++ b/extras/webjars/codemirror/src/main/resources/codemirror.css
@@ -0,0 +1,132 @@
+/**
+ * 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.
+ */
+#center .CodeMirror, .CodeMirror {
+ line-height: 1em;
+ font-family: monospace;
+}
+
+#center .CodeMirror-scroll, .CodeMirror-scroll {
+ overflow: auto;
+ height: 300px;
+ /* This is needed to prevent an IE[67] bug where the scrolled content
+ is visible outside of the scrolling box. */
+ position: relative;
+ outline: none;
+}
+
+#center .CodeMirror-gutter, .CodeMirror-gutter {
+ position: absolute; left: 0; top: 0;
+ z-index: 10;
+ background-color: #f7f7f7;
+ border-right: 1px solid #eee;
+ min-width: 2em;
+ height: 100%;
+}
+#center .CodeMirror-gutter-text, .CodeMirror-gutter-text {
+ color: #aaa;
+ text-align: right;
+ padding: .4em .2em .4em .4em;
+ white-space: pre !important;
+}
+#center .CodeMirror-lines, .CodeMirror-lines {
+ padding: .4em;
+ white-space: pre;
+}
+
+#center .CodeMirror pre, .CodeMirror pre {
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ -o-border-radius: 0;
+ border-radius: 0;
+ border-width: 0; margin: 0; padding: 0; background: transparent;
+ font-family: inherit;
+ font-size: inherit;
+ padding: 0; margin: 0;
+ white-space: pre;
+ word-wrap: normal;
+ line-height: inherit;
+ width: auto;
+}
+
+#center .CodeMirror-wrap pre, .CodeMirror-wrap pre {
+ word-wrap: break-word;
+ white-space: pre-wrap;
+ word-break: normal;
+}
+#center .CodeMirror-wrap .CodeMirror-scroll, .CodeMirror-wrap .CodeMirror-scroll {
+ overflow-x: hidden;
+}
+
+#center .CodeMirror textarea, .CodeMirror textarea {
+ outline: none !important;
+}
+
+#center .CodeMirror pre.CodeMirror-cursor, .CodeMirror pre.CodeMirror-cursor {
+ z-index: 10;
+ position: absolute;
+ visibility: hidden;
+ border-left: 1px solid black;
+ border-right:none;
+ width:0;
+}
+#center .CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite, .CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}
+#center .CodeMirror-focused pre.CodeMirror-cursor, .CodeMirror-focused pre.CodeMirror-cursor {
+ visibility: visible;
+}
+
+#center div.CodeMirror-selected, div.CodeMirror-selected { background: #d9d9d9; }
+#center .CodeMirror-focused div.CodeMirror-selected, .CodeMirror-focused div.CodeMirror-selected { background: #d7d4f0; }
+
+#center .CodeMirror-searching, .CodeMirror-searching {
+ background: #ffa;
+ background: rgba(255, 255, 0, .4);
+}
+
+/* Default theme */
+
+.cm-s-default span.cm-keyword {color: #708;}
+.cm-s-default span.cm-atom {color: #219;}
+.cm-s-default span.cm-number {color: #164;}
+.cm-s-default span.cm-def {color: #00f;}
+.cm-s-default span.cm-variable {color: black;}
+.cm-s-default span.cm-variable-2 {color: #05a;}
+.cm-s-default span.cm-variable-3 {color: #085;}
+.cm-s-default span.cm-property {color: black;}
+.cm-s-default span.cm-operator {color: black;}
+.cm-s-default span.cm-comment {color: #a50;}
+.cm-s-default span.cm-string {color: #a11;}
+.cm-s-default span.cm-string-2 {color: #f50;}
+.cm-s-default span.cm-meta {color: #555;}
+.cm-s-default span.cm-error {color: #f00;}
+.cm-s-default span.cm-qualifier {color: #555;}
+.cm-s-default span.cm-builtin {color: #30a;}
+.cm-s-default span.cm-bracket {color: #cc7;}
+.cm-s-default span.cm-tag {color: #170;}
+.cm-s-default span.cm-attribute {color: #00c;}
+.cm-s-default span.cm-header {color: #a0a;}
+.cm-s-default span.cm-quote {color: #090;}
+.cm-s-default span.cm-hr {color: #999;}
+.cm-s-default span.cm-link {color: #00c;}
+
+span.cm-header, span.cm-strong {font-weight: bold;}
+span.cm-em {font-style: italic;}
+span.cm-emstrong {font-style: italic; font-weight: bold;}
+span.cm-link {text-decoration: underline;}
+
+#center div.CodeMirror span.CodeMirror-matchingbracket, div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
+#center div.CodeMirror span.CodeMirror-nonmatchingbracket, div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}