removed codemirror sources and added dependency to the codemirror webjar TODO: Update L&N
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9c3b63b1 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9c3b63b1 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9c3b63b1 Branch: refs/heads/develop Commit: 9c3b63b1686d999d6287fadd957f33022346d409 Parents: 47855a4 Author: Jakob Frank <[email protected]> Authored: Wed Oct 23 14:40:54 2013 +0200 Committer: Jakob Frank <[email protected]> Committed: Wed Oct 23 14:40:54 2013 +0200 ---------------------------------------------------------------------- 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 | 7 +- 18 files changed, 1518 insertions(+), 7954 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c3b63b1/extras/webjars/codemirror/pom.xml ---------------------------------------------------------------------- diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml index 004f5bd..7b2b3f8 100644 --- a/extras/webjars/codemirror/pom.xml +++ b/extras/webjars/codemirror/pom.xml @@ -32,7 +32,7 @@ </properties> <groupId>org.apache.marmotta.webjars</groupId> - <artifactId>codemirror</artifactId> + <artifactId>codemirror-modes</artifactId> <packaging>jar</packaging> <build> @@ -42,6 +42,7 @@ <artifactId>yuicompressor-maven-plugin</artifactId> <version>1.0.0</version> <executions> + <!-- [email protected]: deactivated during webjar-cleanup <execution> <id>assemble-javascript</id> <goals> @@ -68,16 +69,19 @@ <output>${webjar.path}/codemirror.css</output> </configuration> </execution> + --> </executions> </plugin> <plugin> - <!-- these are "extras", so they come from 3rd parties, no RAT check! --> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> + </plugin> + <plugin> <!-- generate JRebel Configuration --> + <groupId>org.zeroturnaround</groupId> + <artifactId>jrebel-maven-plugin</artifactId> <configuration> - <excludes> - <exclude>src/**</exclude> - </excludes> + <relativePath>../../../</relativePath> + <rootPath>$${rebel.root}</rootPath> </configuration> </plugin> </plugins> @@ -85,8 +89,10 @@ <resource> <directory>src/main/resources</directory> <excludes> + <!-- do not exclude as the yuicompressor is turned off. <exclude>**/*.js</exclude> <exclude>**/*.css</exclude> + --> </excludes> <filtering>false</filtering> <targetPath>${webjar.path}</targetPath> @@ -94,4 +100,12 @@ </resources> </build> + <dependencies> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>codemirror</artifactId> + <version>${webjar.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/marmotta/blob/9c3b63b1/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 deleted file mode 100644 index c95db64..0000000 --- a/extras/webjars/codemirror/src/main/resources/codemirror.css +++ /dev/null @@ -1,259 +0,0 @@ -/* BASICS */ - -.CodeMirror { - /* Set height, width, borders, and global font properties here */ - font-family: monospace; - height: 300px; -} -.CodeMirror-scroll { - /* Set scrolling behaviour here */ - overflow: auto; -} - -/* PADDING */ - -.CodeMirror-lines { - padding: 4px 0; /* Vertical padding around content */ -} -.CodeMirror pre { - padding: 0 4px; /* Horizontal padding of content */ -} - -.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler { - background-color: white; /* The little square between H and V scrollbars */ -} - -/* GUTTER */ - -.CodeMirror-gutters { - border-right: 1px solid #ddd; - background-color: #f7f7f7; - white-space: nowrap; -} -.CodeMirror-linenumbers {} -.CodeMirror-linenumber { - padding: 0 3px 0 5px; - min-width: 20px; - text-align: right; - color: #999; -} - -/* CURSOR */ - -.CodeMirror div.CodeMirror-cursor { - border-left: 1px solid black; - z-index: 3; -} -/* Shown when moving in bi-directional text */ -.CodeMirror div.CodeMirror-secondarycursor { - border-left: 1px solid silver; -} -.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor { - width: auto; - border: 0; - background: #7e7; - z-index: 1; -} -/* Can style cursor different in overwrite (non-insert) mode */ -.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {} - -.cm-tab { display: inline-block; } - -/* DEFAULT THEME */ - -.cm-s-default .cm-keyword {color: #708;} -.cm-s-default .cm-atom {color: #219;} -.cm-s-default .cm-number {color: #164;} -.cm-s-default .cm-def {color: #00f;} -.cm-s-default .cm-variable {color: black;} -.cm-s-default .cm-variable-2 {color: #05a;} -.cm-s-default .cm-variable-3 {color: #085;} -.cm-s-default .cm-property {color: black;} -.cm-s-default .cm-operator {color: black;} -.cm-s-default .cm-comment {color: #a50;} -.cm-s-default .cm-string {color: #a11;} -.cm-s-default .cm-string-2 {color: #f50;} -.cm-s-default .cm-meta {color: #555;} -.cm-s-default .cm-error {color: #f00;} -.cm-s-default .cm-qualifier {color: #555;} -.cm-s-default .cm-builtin {color: #30a;} -.cm-s-default .cm-bracket {color: #997;} -.cm-s-default .cm-tag {color: #170;} -.cm-s-default .cm-attribute {color: #00c;} -.cm-s-default .cm-header {color: blue;} -.cm-s-default .cm-quote {color: #090;} -.cm-s-default .cm-hr {color: #999;} -.cm-s-default .cm-link {color: #00c;} - -.cm-negative {color: #d44;} -.cm-positive {color: #292;} -.cm-header, .cm-strong {font-weight: bold;} -.cm-em {font-style: italic;} -.cm-link {text-decoration: underline;} - -.cm-invalidchar {color: #f00;} - -div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;} -div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} -.CodeMirror-activeline-background {background: #e8f2ff;} - -/* STOP */ - -/* The rest of this file contains styles related to the mechanics of - the editor. You probably shouldn't touch them. */ - -.CodeMirror { - line-height: 1; - position: relative; - overflow: hidden; - background: white; - color: black; -} - -.CodeMirror-scroll { - /* 30px is the magic margin used to hide the element's real scrollbars */ - /* See overflow: hidden in .CodeMirror */ - margin-bottom: -30px; margin-right: -30px; - padding-bottom: 30px; padding-right: 30px; - height: 100%; - outline: none; /* Prevent dragging from highlighting the element */ - position: relative; -} -.CodeMirror-sizer { - position: relative; -} - -/* The fake, visible scrollbars. Used to force redraw during scrolling - before actuall scrolling happens, thus preventing shaking and - flickering artifacts. */ -.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler { - position: absolute; - z-index: 6; - display: none; -} -.CodeMirror-vscrollbar { - right: 0; top: 0; - overflow-x: hidden; - overflow-y: scroll; -} -.CodeMirror-hscrollbar { - bottom: 0; left: 0; - overflow-y: hidden; - overflow-x: scroll; -} -.CodeMirror-scrollbar-filler { - right: 0; bottom: 0; -} -.CodeMirror-gutter-filler { - left: 0; bottom: 0; -} - -.CodeMirror-gutters { - position: absolute; left: 0; top: 0; - padding-bottom: 30px; - z-index: 3; -} -.CodeMirror-gutter { - white-space: normal; - height: 100%; - padding-bottom: 30px; - margin-bottom: -32px; - display: inline-block; - /* Hack to make IE7 behave */ - *zoom:1; - *display:inline; -} -.CodeMirror-gutter-elt { - position: absolute; - cursor: default; - z-index: 4; -} - -.CodeMirror-lines { - cursor: text; -} -.CodeMirror pre { - /* Reset some styles that the rest of the page might have set */ - -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; - border-width: 0; - background: transparent; - font-family: inherit; - font-size: inherit; - margin: 0; - white-space: pre; - word-wrap: normal; - line-height: inherit; - color: inherit; - z-index: 2; - position: relative; - overflow: visible; -} -.CodeMirror-wrap pre { - word-wrap: break-word; - white-space: pre-wrap; - word-break: normal; -} -.CodeMirror-code pre { - border-right: 30px solid transparent; - width: -webkit-fit-content; - width: -moz-fit-content; - width: fit-content; -} -.CodeMirror-wrap .CodeMirror-code pre { - border-right: none; - width: auto; -} -.CodeMirror-linebackground { - position: absolute; - left: 0; right: 0; top: 0; bottom: 0; - z-index: 0; -} - -.CodeMirror-linewidget { - position: relative; - z-index: 2; - overflow: auto; -} - -.CodeMirror-widget { -} - -.CodeMirror-wrap .CodeMirror-scroll { - overflow-x: hidden; -} - -.CodeMirror-measure { - position: absolute; - width: 100%; height: 0px; - overflow: hidden; - visibility: hidden; -} -.CodeMirror-measure pre { position: static; } - -.CodeMirror div.CodeMirror-cursor { - position: absolute; - visibility: hidden; - border-right: none; - width: 0; -} -.CodeMirror-focused div.CodeMirror-cursor { - visibility: visible; -} - -.CodeMirror-selected { background: #d9d9d9; } -.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; } - -.cm-searching { - background: #ffa; - background: rgba(255, 255, 0, .4); -} - -/* IE7 hack to prevent it from returning funny offsetTops on the spans */ -.CodeMirror span { *vertical-align: text-bottom; } - -@media print { - /* Hide the cursor when printing */ - .CodeMirror div.CodeMirror-cursor { - visibility: hidden; - } -}
