You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:11:54 UTC
[sling-org-apache-sling-scripting-sightly-repl] annotated tag
org.apache.sling.scripting.sightly.repl-1.0.2 created (now 15e414a)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git.
at 15e414a (tag)
tagging 553748131a52c354d0d582283a89e5b22eef0a5a (commit)
by Radu Cotescu
on Thu Oct 8 11:07:16 2015 +0000
- Log -----------------------------------------------------------------
org.apache.sling.scripting.sightly.repl-1.0.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 8269d6c SLING-4704 - Move the Sightly scripting engine artifacts from contrib to bundles
new 10d47b2 SLING-4713 - Update Sightly REPL to display generated Java source code
new 21f30c9 svn:ignore
new 83049ab Update to Sling Parent 23
new c9c95a0 Remove superflous sling.java.version=6 as it's the default now
new 0a124b1 Added missing copyright headers
new 34b22e6 set parent version to 24 and add empty relativePath where missing
new 06d315e Update the main reactor to parent 25
new a0a06a6 SLING-5125 - Make Sightly REPL JavaScript and CSS dependencies local to allow offline use
new 6bb0ca0 SLING-5126 - Provide information on the Sightly REPL Java tab on how to enable source code generation
new 4e69695 SLING-5127 - Implement browser history support for the Sightly REPL tabs
new 815b7be trivial: removed duplicate information from the NOTICE file
new ba9c8cb [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.repl-1.0.2
new 5537481 [maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.repl-1.0.2
The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-scripting-sightly-repl] 12/14: trivial:
removed duplicate information from the NOTICE file
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 815b7bea20830f26b2f98f3c38fde9a36e33db83
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 8 10:54:17 2015 +0000
trivial: removed duplicate information from the NOTICE file
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1707475 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/appended-resources/META-INF/NOTICE | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/main/appended-resources/META-INF/NOTICE b/src/main/appended-resources/META-INF/NOTICE
index 96a49f3..da66e0e 100644
--- a/src/main/appended-resources/META-INF/NOTICE
+++ b/src/main/appended-resources/META-INF/NOTICE
@@ -1,5 +1,2 @@
-Apache Sling Scripting Sightly Read-Eval-Print-Loop Environment
-Copyright 2014 The Apache Software Foundation
-
The Apache Sling Sightly REPL bundle is based on source code originally developed
by Adobe Systems Inc. (http://www.adobe.com/).
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 07/14: set parent
version to 24 and add empty relativePath where missing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 34b22e62624e05fe1584132703f0a90ad0a36c03
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c4439b8..729315a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
- <relativePath />
+ <version>24</version>
+ <relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 09/14: SLING-5125 -
Make Sightly REPL JavaScript and CSS dependencies local to allow offline
use
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit a0a06a65c84d10dabeccb84088aedae83b55a9bd
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 8 10:52:22 2015 +0000
SLING-5125 - Make Sightly REPL JavaScript and CSS dependencies local to allow offline use
* embedded external dependencies
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1707470 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 ++
src/main/appended-resources/META-INF/LICENSE | 137 +++++++++++++++++++++
.../main/appended-resources/META-INF/NOTICE | 0
.../SLING-INF/apps/repl/components/repl/repl.html | 14 +--
.../resources/SLING-INF/etc/clientlibs/repl/ace.js | 11 ++
.../etc/clientlibs/repl/bootstrap-theme.min.css | 7 ++
.../etc/clientlibs/repl/bootstrap.min.css | 7 ++
.../SLING-INF/etc/clientlibs/repl/bootstrap.min.js | 6 +
.../SLING-INF/etc/clientlibs/repl/html5shiv.js | 8 ++
.../SLING-INF/etc/clientlibs/repl/jquery.min.js | 4 +
.../SLING-INF/etc/clientlibs/repl/mode-html.js | 1 +
.../SLING-INF/etc/clientlibs/repl/mode-java.js | 1 +
.../etc/clientlibs/repl/mode-javascript.js | 1 +
.../SLING-INF/etc/clientlibs/repl/respond.min.js | 5 +
14 files changed, 205 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index e3d018c..c0da353 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,16 @@
<excludes combine.children="append">
<exclude>src/main/resources/SLING-INF/**/*.json</exclude>
<exclude>src/main/resources/SLING-INF/**/*.svg</exclude>
+ <exclude>src/main/resources/SLING-INF/etc/clientlibs/repl/ace.js</exclude>
+ <exclude>src/main/resources/SLING-INF/etc/clientlibs/repl/mode-html.js</exclude>
+ <exclude>src/main/resources/SLING-INF/etc/clientlibs/repl/mode-javascript.js</exclude>
+ <exclude>src/main/resources/SLING-INF/etc/clientlibs/repl/mode-java.js</exclude>
+ <exclude>src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap-theme.min.css</exclude>
+ <exclude>src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap.min.css</exclude>
+ <exclude>src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap.min.js</exclude>
+ <exclude>src/main/resources/SLING-INF/etc/clientlibs/repl/html5shiv.js</exclude>
+ <exclude>src/main/resources/SLING-INF/etc/clientlibs/repl/jquery.min.js</exclude>
+ <exclude>src/main/resources/SLING-INF/etc/clientlibs/repl/respond.min.js</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/src/main/appended-resources/META-INF/LICENSE b/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..0da837b
--- /dev/null
+++ b/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,137 @@
+Apache Sling Scripting Sightly Read-Eval-Print-Loop Environment sub-components:
+
+The following sub-components are not Apache 2 licensed:
+
+
+
+ace.js, mode-html.js, mode-java.js, mode-javascript.js - part of the Ace project (http://ace.c9.io/)
+Copyright (c) 2010, Ajax.org B.V.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of Ajax.org B.V. nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+bootstrap-theme.min.css, bootstrap.min.css, bootstrap.min.js - part of the Bootstrap project (http://getbootstrap.com/)
+The MIT License (MIT)
+
+Copyright (c) 2011-2015 Twitter, Inc
+
+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.
+
+
+
+html5shiv.js - part of the html5shiv project (https://github.com/afarkas/html5shiv)
+MIT License
+
+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.
+
+
+
+jquery.min.js - part of the jQuery project (https://jquery.com/)
+Copyright jQuery Foundation and other contributors, https://jquery.org/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/jquery
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+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.
+
+
+
+respond.min.js - part of the Respond project (https://github.com/scottjehl/Respond)
+Copyright (c) 2012 Scott Jehl
+
+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.
diff --git a/NOTICE b/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from NOTICE
rename to src/main/appended-resources/META-INF/NOTICE
diff --git a/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html b/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html
index 6d0d9e1..3173b9a 100644
--- a/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html
+++ b/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html
@@ -25,8 +25,8 @@
<title>Sightly REPL</title>
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
+ <link rel="stylesheet" href="/etc/clientlibs/repl/bootstrap.min.css">
+ <link rel="stylesheet" href="/etc/clientlibs/repl/bootstrap-theme.min.css">
<link rel="stylesheet" type="text/css" href="/etc/clientlibs/repl/style.css">
</head>
@@ -62,13 +62,13 @@
</div>
</div>
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
- <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
- <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.1.01/ace.js"></script>
+ <script src="/etc/clientlibs/repl/jquery.min.js"></script>
+ <script src="/etc/clientlibs/repl/bootstrap.min.js"></script>
+ <script src="/etc/clientlibs/repl/ace.js"></script>
<!--[if lt IE 9]>
- <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
- <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <script src="/etc/clientlibs/html5shiv.js"></script>
+ <script src="/etc/clientlibs/respond.min.js"></script>
<![endif]-->
<script src="/etc/clientlibs/repl/script.js"></script>
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/ace.js b/src/main/resources/SLING-INF/etc/clientlibs/repl/ace.js
new file mode 100644
index 0000000..52e7d3e
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/ace.js
@@ -0,0 +1,11 @@
+(function(){function o(e){var i=function(e,t){return r("",e,t)},s=t;e&&(t[e]||(t[e]={}),s=t[e]);if(!s.define||!s.define.packaged)n.original=s.define,s.define=n,s.define.packaged=!0;if(!s.require||!s.require.packaged)r.original=s.require,s.require=i,s.require.packaged=!0}var e="ace",t=function(){return this}();if(!e&&typeof requirejs!="undefined")return;var n=function(e,t,r){if(typeof e!="string"){n.original?n.original.apply(window,arguments):(console.error("dropping module because define [...]
+ (function() {
+ ace.require(["ace/ace"], function(a) {
+ a && a.config.init();
+ if (!window.ace)
+ window.ace = {};
+ for (var key in a) if (a.hasOwnProperty(key))
+ ace[key] = a[key];
+ });
+ })();
+
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap-theme.min.css b/src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap-theme.min.css
new file mode 100644
index 0000000..ba4bd28
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap-theme.min.css
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
+.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.a [...]
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap.min.css b/src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap.min.css
new file mode 100644
index 0000000..679272d
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap.min.css
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,str [...]
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap.min.js b/src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap.min.js
new file mode 100644
index 0000000..b04a0e8
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/bootstrap.min.js
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e= [...]
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/html5shiv.js b/src/main/resources/SLING-INF/etc/clientlibs/repl/html5shiv.js
new file mode 100644
index 0000000..448cebd
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/html5shiv.js
@@ -0,0 +1,8 @@
+/*
+ HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b. [...]
+a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>ar [...]
+c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined" [...]
+"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){ [...]
+if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/jquery.min.js b/src/main/resources/SLING-INF/etc/clientlibs/repl/jquery.min.js
new file mode 100644
index 0000000..73f33fb
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=fu [...]
+}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"cl [...]
+},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c [...]
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/mode-html.js b/src/main/resources/SLING-INF/etc/clientlibs/repl/mode-html.js
new file mode 100644
index 0000000..55a4e6f
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/mode-html.js
@@ -0,0 +1 @@
+ace.define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/html_highlight_rules","ace/mode/behaviour/html","ace/mode/folding/html"],function(e,t,n){var r=e("../lib/oop"),i=e("./text").Mode,s=e("./javascript").Mode,o=e("./css").Mode,u=e("../tokenizer").Tokenizer,a=e("./html_highlight_rules").HtmlHighlightRules,f=e("./behaviour/html").HtmlBehaviour,l=e("./folding/html").FoldMode,c=function(){var e=ne [...]
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/mode-java.js b/src/main/resources/SLING-INF/etc/clientlibs/repl/mode-java.js
new file mode 100644
index 0000000..1465bfb
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/mode-java.js
@@ -0,0 +1 @@
+ace.define("ace/mode/java",["require","exports","module","ace/lib/oop","ace/mode/javascript","ace/tokenizer","ace/mode/java_highlight_rules"],function(e,t,n){var r=e("../lib/oop"),i=e("./javascript").Mode,s=e("../tokenizer").Tokenizer,o=e("./java_highlight_rules").JavaHighlightRules,u=function(){i.call(this),this.$tokenizer=new s((new o).getRules())};r.inherits(u,i),function(){this.createWorker=function(e){return null}}.call(u.prototype),t.Mode=u}),ace.define("ace/mode/javascript",["requ [...]
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/mode-javascript.js b/src/main/resources/SLING-INF/etc/clientlibs/repl/mode-javascript.js
new file mode 100644
index 0000000..ed5649d
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/mode-javascript.js
@@ -0,0 +1 @@
+ace.define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(e,t,n){var r=e("../lib/oop"),i=e("./text").Mode,s=e("../tokenizer").Tokenizer,o=e("./javascript_highlight_rules").JavaScriptHighlightRules,u=e("./matching_brace_outdent").MatchingBraceOutdent,a=e("../range"). [...]
\ No newline at end of file
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/respond.min.js b/src/main/resources/SLING-INF/etc/clientlibs/repl/respond.min.js
new file mode 100644
index 0000000..80a7b69
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/respond.min.js
@@ -0,0 +1,5 @@
+/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
+ * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
+ * */
+
+!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='­<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),funct [...]
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 13/14:
[maven-release-plugin] prepare release
org.apache.sling.scripting.sightly.repl-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit ba9c8cbde5857bcba43e83eee64b07f296cddf52
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 8 11:07:01 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.scripting.sightly.repl-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1707485 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index c0da353..6017216 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,21 +22,21 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>25</version>
- <relativePath/>
+ <relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.sling.scripting.sightly.repl</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>bundle</packaging>
<name>Apache Sling Scripting Sightly Read-Eval-Print Loop Environment</name>
<description>REPL for Apache Sling Scripting Sightly engine</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/repl</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.repl-1.0.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.repl-1.0.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly.repl-1.0.2</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 03/14: svn:ignore
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 21f30c9285d2c94f6a7960c6aa3eb1f2df7bc0a7
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Jun 4 14:07:57 2015 +0000
svn:ignore
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1683552 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 05/14: Remove
superflous sling.java.version=6 as it's the default now
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit c9c95a0df9988618b0e8c7bff8e9174ade6cec17
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:14:53 2015 +0000
Remove superflous sling.java.version=6 as it's the default now
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1687505 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index bfc3bd7..c4439b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,10 +39,6 @@
<url>http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/repl</url>
</scm>
- <properties>
- <sling.java.version>6</sling.java.version>
- </properties>
-
<build>
<pluginManagement>
<plugins>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 08/14: Update the
main reactor to parent 25
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 06d315e0684953ab03a80bd5e092b051a4524cbc
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 729315a..e3d018c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 02/14: SLING-4713 -
Update Sightly REPL to display generated Java source code
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 10d47b2618306353b4ec4826b07531b24a658ce0
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue May 12 15:49:25 2015 +0000
SLING-4713 - Update Sightly REPL to display generated Java source code
* Java source code for generated class is displayed by reading the *.java files from disk
in case the org.apache.sling.commons.fsclassloader bundle is active and the classes' source
code was generated by enabling Sightly's dev mode
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1678985 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 51 ++++++++++++++++
.../sightly/repl/REPLJavaSourceCodeServlet.java | 68 ++++++++++++++++++++++
.../SLING-INF/apps/repl/components/repl/repl.html | 4 +-
.../SLING-INF/apps/repl/components/repl/repl.js | 49 ----------------
4 files changed, 121 insertions(+), 51 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9ac1113..2d421e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,17 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
@@ -74,4 +85,44 @@
</plugin>
</plugins>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java b/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
new file mode 100644
index 0000000..346df18
--- /dev/null
+++ b/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
@@ -0,0 +1,68 @@
+package org.apache.sling.scripting.sightly.repl;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.sling.SlingServlet;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SlingServlet(
+ resourceTypes = {"repl/components/repl"},
+ selectors = {"java"},
+ methods = "GET",
+ extensions = "html"
+)
+public class REPLJavaSourceCodeServlet extends SlingSafeMethodsServlet {
+
+ private static final String FS_CLASSLOADER_SN = "org.apache.sling.commons.fsclassloader";
+ private static final Logger LOGGER = LoggerFactory.getLogger(REPLJavaSourceCodeServlet.class);
+
+ private File classesFolder;
+
+ @Activate
+ @SuppressWarnings("unused")
+ protected void activate(ComponentContext componentContext) {
+ for (Bundle bundle : componentContext.getBundleContext().getBundles()) {
+ if (FS_CLASSLOADER_SN.equals(bundle.getSymbolicName())) {
+ BundleContext context = bundle.getBundleContext();
+ classesFolder = new File(context.getDataFile(""), "classes");
+ }
+ }
+ }
+
+ @Override
+ protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
+ response.setContentType("text/plain");
+ response.getWriter().write(getClassSourceCode());
+ }
+
+ private String getClassSourceCode() {
+ if (classesFolder != null && classesFolder.isDirectory()) {
+ File classFile = new File(classesFolder, "/apps/repl/components/repl/SightlyJava_template.java");
+ if (classFile.isFile()) {
+ try {
+ return IOUtils.toString(new FileInputStream(classFile), "UTF-8");
+ } catch (IOException e) {
+ LOGGER.error("Unable to read file " + classFile.getAbsolutePath(), e);
+ return "";
+ }
+ }
+ }
+ LOGGER.warn("Source code for " + (classesFolder.isDirectory() ? classesFolder.getAbsolutePath() : "") +
+ "/apps/repl/components/repl/SightlyJava_template.java was not found. Maybe you need to enable dev mode for Sightly?");
+ return "";
+ }
+
+}
diff --git a/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html b/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html
index a41811f..6d0d9e1 100644
--- a/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html
+++ b/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html
@@ -31,7 +31,7 @@
<link rel="stylesheet" type="text/css" href="/etc/clientlibs/repl/style.css">
</head>
- <body data-sly-use.repl="repl.js">
+ <body>
<div id="logo"> </div>
<h1><small>Read-Eval-Print Loop</small></h1>
@@ -58,7 +58,7 @@
</div>
<div id="source" class="output-view editor" data-src="/sightly/repl.template.html" data-mode="ace/mode/html"></div>
<iframe id="view" class="output-view hidden" src="/sightly/repl.template.html"></iframe>
- <div id="java" class="output-view editor hidden" data-src="${repl.classPath}" data-mode="ace/mode/java"></div>
+ <div id="java" class="output-view editor hidden" data-src="/sightly/repl.java.html" data-mode="ace/mode/java"></div>
</div>
</div>
diff --git a/src/main/resources/SLING-INF/apps/repl/components/repl/repl.js b/src/main/resources/SLING-INF/apps/repl/components/repl/repl.js
deleted file mode 100644
index 09ca13a..0000000
--- a/src/main/resources/SLING-INF/apps/repl/components/repl/repl.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * 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.
- ******************************************************************************/
-use(function () {
-
- var slingSettings = sling.getService(Packages.org.apache.sling.settings.SlingSettingsService);
- var CLASS_ROOT_FOLDER = '/var/classes/' + slingSettings.getSlingId() + '/sightly';
- var COMPONENT_PATH = '/apps/repl/components/repl';
- var JAVA_TEMPLATE_FILE = 'SightlyJava_template.java';
-
- // Recursively walks down the given path until it finds an apps folder, then returns the full path of the Java compiled template file.
- function getAppsPath(res) {
- return res.getChildren().then(function (children) {
- var length = children.length;
-
- // Let's see if one of the children is the apps folder.
- for (var i = 0; i < length; i++) {
- if (children[i].name === 'apps') {
- return res.path + COMPONENT_PATH + '/' + JAVA_TEMPLATE_FILE;
- }
- }
-
- // If apps wasn't found but there's only one child folder, then let's recrusively walk that one down.
- if (length === 1) {
- return getAppsPath(children[0]);
- }
- });
- }
-
- return {
- classPath: sightly.resource.resolve(CLASS_ROOT_FOLDER).then(getAppsPath)
- };
-
-});
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 14/14:
[maven-release-plugin] copy for tag
org.apache.sling.scripting.sightly.repl-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 553748131a52c354d0d582283a89e5b22eef0a5a
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 8 11:07:16 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.repl-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.repl-1.0.2@1707486 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 06/14: Added
missing copyright headers
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 0a124b127faf46268a040b50f5729909d779b881
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 18:49:20 2015 +0000
Added missing copyright headers
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1687607 13f79535-47bb-0310-9956-ffa450edef68
---
.../sightly/repl/REPLJavaSourceCodeServlet.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java b/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
index 346df18..35411c3 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.sling.scripting.sightly.repl;
import java.io.File;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 11/14: SLING-5127 -
Implement browser history support for the Sightly REPL tabs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 4e696959c401d04203d08fa64ab6c6c4ba004f45
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 8 10:54:01 2015 +0000
SLING-5127 - Implement browser history support for the Sightly REPL tabs
* added history events for the Source, View and Java tabs
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1707474 13f79535-47bb-0310-9956-ffa450edef68
---
.../resources/SLING-INF/etc/clientlibs/repl/script.js | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/script.js b/src/main/resources/SLING-INF/etc/clientlibs/repl/script.js
index 0f96a71..bb31fd5 100644
--- a/src/main/resources/SLING-INF/etc/clientlibs/repl/script.js
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/script.js
@@ -21,7 +21,8 @@ jQuery(function ($) {
'use strict';
- var currentState = 'source';
+ var hash = window.location.hash;
+ var currentState = hash ? hash.substr(1) : 'source';
// Limits the number of times the function gets called for event handlers
function debounce(fn, delay) {
@@ -134,19 +135,28 @@ jQuery(function ($) {
// Setup output tabs
var allTargets = $('.output-view');
$('a[data-toggle=tab]').each(function () {
- var link = $(this);
- var target = allTargets.filter(link.attr('href'));
- var state = target.attr('id');
+ var link = $(this),
+ href = link.attr('href'),
+ target = allTargets.filter(href),
+ state = target.attr('id');
link.click(function () {
currentState = state;
allTargets.addClass('hidden');
target.removeClass('hidden');
reloadOutput();
+ window.location = href;
});
});
+
+ $(window).on('hashchange', function () {
+ hash = window.location.hash;
+ currentState = hash ? hash.substr(1) : 'source';
+ $('a[href=#' + currentState + ']').click();
+ });
}
init();
+ $('a[href=#' + currentState + ']').click();
});
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 01/14: SLING-4704 -
Move the Sightly scripting engine artifacts from contrib to bundles
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 8269d6c94542b2e45aea402fabbee4bcfe4df367
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue May 12 15:39:47 2015 +0000
SLING-4704 - Move the Sightly scripting engine artifacts from contrib to bundles
* moved Sightly artifacts from contrib to bundles
* updated SCM info
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1678979 13f79535-47bb-0310-9956-ffa450edef68
---
NOTICE | 5 +
README.md | 11 ++
pom.xml | 77 +++++++++++
.../SLING-INF/apps/repl/components/repl/logic.js | 23 ++++
.../SLING-INF/apps/repl/components/repl/repl.html | 76 +++++++++++
.../SLING-INF/apps/repl/components/repl/repl.js | 49 +++++++
.../apps/repl/components/repl/template.html | 30 ++++
.../etc/clientlibs/repl/images/sightly.svg | 114 ++++++++++++++++
.../SLING-INF/etc/clientlibs/repl/script.js | 152 +++++++++++++++++++++
.../SLING-INF/etc/clientlibs/repl/style.css | 51 +++++++
src/main/resources/SLING-INF/sightly/repl.json | 4 +
11 files changed, 592 insertions(+)
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..96a49f3
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Apache Sling Scripting Sightly Read-Eval-Print-Loop Environment
+Copyright 2014 The Apache Software Foundation
+
+The Apache Sling Sightly REPL bundle is based on source code originally developed
+by Adobe Systems Inc. (http://www.adobe.com/).
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f1de1e0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,11 @@
+Apache Sling Scripting Sightly Read-Eval-Print Loop Environment
+====
+
+To install:
+```
+mvn clean install sling:install
+```
+
+Then just browse to [http://localhost:8080/sightly/repl.html](http://localhost:8080/sightly/repl.html).
+
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..9ac1113
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<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">
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>22</version>
+ <relativePath />
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>org.apache.sling.scripting.sightly.repl</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Scripting Sightly Read-Eval-Print Loop Environment</name>
+ <description>REPL for Apache Sling Scripting Sightly engine</description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/repl</url>
+ </scm>
+
+ <properties>
+ <sling.java.version>6</sling.java.version>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Extend RAT configuration from parent pom -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>src/main/resources/SLING-INF/**/*.json</exclude>
+ <exclude>src/main/resources/SLING-INF/**/*.svg</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Sling-Initial-Content>SLING-INF;overwrite=true</Sling-Initial-Content>
+ <Require-Capability>io.sightly; filter:="(&(version>=1.0)(!(version>=2.0)))"</Require-Capability>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/main/resources/SLING-INF/apps/repl/components/repl/logic.js b/src/main/resources/SLING-INF/apps/repl/components/repl/logic.js
new file mode 100644
index 0000000..29c5948
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/repl/components/repl/logic.js
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+use(function () {
+ return {
+ message: 'hello world'
+ };
+});
diff --git a/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html b/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html
new file mode 100644
index 0000000..a41811f
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/repl/components/repl/repl.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+
+ <title>Sightly REPL</title>
+
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
+
+ <link rel="stylesheet" type="text/css" href="/etc/clientlibs/repl/style.css">
+ </head>
+
+ <body data-sly-use.repl="repl.js">
+ <div id="logo"> </div>
+ <h1><small>Read-Eval-Print Loop</small></h1>
+
+ <div id="main" class="row">
+ <div id="input" class="col-xs-6">
+ <div class="editorContainer">
+ <p class="lead">template.html</p>
+ <div id="template" class="editor" data-src="/apps/repl/components/repl/template.html" data-mode="ace/mode/html" data-writeable></div>
+ </div>
+
+ <div class="editorContainer">
+ <p class="lead">logic.js</p>
+ <div id="logic" class="editor" data-src="/apps/repl/components/repl/logic.js" data-mode="ace/mode/javascript" data-writeable></div>
+ </div>
+ </div>
+ <div id="output" class="editorContainer col-xs-6">
+ <div class="clearfix">
+ <p class="lead pull-left">output.html</p>
+ <ul class="nav nav-pills navbar-right">
+ <li class="active"><a data-toggle="tab" href="#source">Source</a></li>
+ <li><a data-toggle="tab" href="#view">View</a></li>
+ <li><a data-toggle="tab" href="#java">Java</a></li>
+ </ul>
+ </div>
+ <div id="source" class="output-view editor" data-src="/sightly/repl.template.html" data-mode="ace/mode/html"></div>
+ <iframe id="view" class="output-view hidden" src="/sightly/repl.template.html"></iframe>
+ <div id="java" class="output-view editor hidden" data-src="${repl.classPath}" data-mode="ace/mode/java"></div>
+ </div>
+ </div>
+
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.1.01/ace.js"></script>
+
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+
+ <script src="/etc/clientlibs/repl/script.js"></script>
+ </body>
+</html>
diff --git a/src/main/resources/SLING-INF/apps/repl/components/repl/repl.js b/src/main/resources/SLING-INF/apps/repl/components/repl/repl.js
new file mode 100644
index 0000000..09ca13a
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/repl/components/repl/repl.js
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+use(function () {
+
+ var slingSettings = sling.getService(Packages.org.apache.sling.settings.SlingSettingsService);
+ var CLASS_ROOT_FOLDER = '/var/classes/' + slingSettings.getSlingId() + '/sightly';
+ var COMPONENT_PATH = '/apps/repl/components/repl';
+ var JAVA_TEMPLATE_FILE = 'SightlyJava_template.java';
+
+ // Recursively walks down the given path until it finds an apps folder, then returns the full path of the Java compiled template file.
+ function getAppsPath(res) {
+ return res.getChildren().then(function (children) {
+ var length = children.length;
+
+ // Let's see if one of the children is the apps folder.
+ for (var i = 0; i < length; i++) {
+ if (children[i].name === 'apps') {
+ return res.path + COMPONENT_PATH + '/' + JAVA_TEMPLATE_FILE;
+ }
+ }
+
+ // If apps wasn't found but there's only one child folder, then let's recrusively walk that one down.
+ if (length === 1) {
+ return getAppsPath(children[0]);
+ }
+ });
+ }
+
+ return {
+ classPath: sightly.resource.resolve(CLASS_ROOT_FOLDER).then(getAppsPath)
+ };
+
+});
diff --git a/src/main/resources/SLING-INF/apps/repl/components/repl/template.html b/src/main/resources/SLING-INF/apps/repl/components/repl/template.html
new file mode 100644
index 0000000..c5a3f5b
--- /dev/null
+++ b/src/main/resources/SLING-INF/apps/repl/components/repl/template.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<html>
+<head>
+ <title>Sightly REPL</title>
+ <meta charset="utf-8">
+</head>
+<body data-sly-use.obj="logic.js">
+
+ <p>Message is ${obj.message}</p>
+
+</body>
+</html>
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/images/sightly.svg b/src/main/resources/SLING-INF/etc/clientlibs/repl/images/sightly.svg
new file mode 100644
index 0000000..4e43a19
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/images/sightly.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 340.2 141.7" enable-background="new 0 0 340.2 141.7" xml:space="preserve">
+<g>
+ <path fill="#389DD7" d="M45.5,57.5c-0.9-0.9-2-1.6-3.3-2.3c-1.3-0.7-2.8-1.4-4.4-2.1c-1.6-0.7-2.9-1.3-4-1.8
+ c-1.1-0.5-1.9-1.1-2.6-1.6c-0.6-0.5-1.1-1.1-1.3-1.7c-0.3-0.6-0.4-1.3-0.4-2.1c0-1.4,0.6-2.5,1.7-3.3c1.1-0.8,2.8-1.2,5.2-1.2
+ c1.6,0,3.2,0.3,4.8,0.8c1.6,0.5,3.1,1.1,4.6,1.7l2.2-5.1c-1.7-0.8-3.4-1.4-5.3-1.9c-1.9-0.5-3.9-0.7-6.2-0.7c-2,0-3.8,0.2-5.4,0.7
+ c-1.6,0.4-3,1.1-4.1,1.9c-1.2,0.9-2.1,1.9-2.7,3.2c-0.6,1.3-1,2.7-1,4.3c0,1.5,0.3,2.9,0.8,4c0.5,1.1,1.2,2.1,2.1,2.9
+ c0.9,0.9,2,1.6,3.4,2.3c1.3,0.7,2.8,1.4,4.5,2.1c1.6,0.7,3,1.4,4.1,1.9c1.1,0.6,1.9,1.1,2.5,1.7c0.6,0.6,1,1.1,1.3,1.7
+ c0.2,0.6,0.3,1.2,0.3,1.9c0,0.8-0.2,1.6-0.4,2.2c-0.3,0.7-0.8,1.2-1.4,1.7c-0.7,0.5-1.5,0.8-2.5,1.1c-1,0.2-2.3,0.4-3.8,0.4
+ c-1,0-2-0.1-3-0.3c-1-0.2-2-0.4-3-0.7c-1-0.3-1.9-0.6-2.8-0.9c-0.9-0.4-1.7-0.7-2.4-1.1v5.8c1.4,0.8,2.9,1.4,4.8,1.8
+ c1.8,0.4,3.9,0.6,6.5,0.6c2.2,0,4.2-0.2,6-0.7c1.8-0.5,3.3-1.2,4.6-2.1c1.3-0.9,2.2-2.1,2.9-3.5c0.7-1.4,1-3,1-4.8
+ c0-1.5-0.2-2.9-0.7-4C47.1,59.4,46.4,58.4,45.5,57.5z"/>
+ <rect x="57.5" y="36.9" fill="#389DD7" width="6.3" height="38"/>
+ <path fill="#454545" d="M210.1,79.8l15.1-42.9h-6.5L211.7,58l-0.9,2.8c-0.3,1.1-0.7,2.2-1,3.3c-0.3,1.1-0.6,2.2-0.8,3.2
+ c-0.3,1-0.4,1.8-0.6,2.3h-0.2c-0.1-0.8-0.2-1.7-0.4-2.6c-0.2-0.9-0.5-1.9-0.7-2.9c-0.3-1-0.6-2-0.9-3.1c-0.3-1-0.7-2-1-2.9
+ l-7.5-21.2h-6.5l14.4,38.3l-2,5.5c-0.3,0.9-0.7,1.8-1.2,2.5c-0.4,0.7-0.9,1.4-1.5,1.9c-0.6,0.5-1.3,0.9-2.1,1.2
+ c-0.8,0.3-1.8,0.4-2.9,0.4c-0.8,0-1.6-0.1-2.3-0.1c-0.7-0.1-1.4-0.2-1.8-0.3v5.1c0.6,0.1,1.4,0.3,2.3,0.4c0.9,0.1,1.9,0.2,3.1,0.2
+ c1.8,0,3.4-0.3,4.8-0.9c1.3-0.6,2.5-1.4,3.5-2.4c1-1,1.9-2.3,2.6-3.8C208.8,83.4,209.5,81.7,210.1,79.8z"/>
+ <path fill="#389DD7" d="M63.3,23.6c-0.3-0.3-0.7-0.6-1.2-0.7c-0.4-0.2-0.9-0.2-1.4-0.2c-1,0-1.9,0.3-2.6,0.9
+ c-0.7,0.6-1.1,1.6-1.1,3c0,1.4,0.4,2.4,1.1,3c0.7,0.6,1.6,1,2.6,1c1,0,1.9-0.3,2.6-1c0.7-0.7,1.1-1.7,1.1-3c0-0.7-0.1-1.3-0.3-1.8
+ C63.9,24.3,63.7,23.9,63.3,23.6z"/>
+ <path fill="#389DD7" d="M168.9,70.1c-0.5,0.1-1,0.1-1.5,0.2c-0.5,0-1,0.1-1.4,0.1c-1.7,0-2.9-0.6-3.6-1.7c-0.7-1.1-1.1-2.8-1.1-5.1
+ V41.4h9.6v-4.5h-9.6v-8.7h-3.6l-2.7,8l-5.4,2.6v2.7h5.4v22.2c0,2.3,0.2,4.3,0.8,5.8c0.5,1.5,1.2,2.8,2.1,3.7
+ c0.9,0.9,1.9,1.5,3.2,1.9c1.2,0.4,2.6,0.6,4,0.6c0.6,0,1.2,0,1.8-0.1c0.6-0.1,1.2-0.1,1.7-0.2c0.6-0.1,1.1-0.2,1.5-0.4
+ c0.5-0.1,0.8-0.3,1.1-0.4v-4.8c-0.2,0.1-0.5,0.2-0.9,0.2C169.8,70,169.4,70.1,168.9,70.1z"/>
+ <rect x="178.5" y="21" fill="#454545" width="6.3" height="53.9"/>
+ <path fill="#389DD7" d="M130,36.2c-1.1,0-2.2,0.1-3.2,0.3c-1.1,0.2-2.1,0.6-3,1.1c-0.9,0.5-1.8,1.1-2.6,1.8
+ c-0.8,0.7-1.5,1.6-2.1,2.6h-0.3l0.3-5V21h-6.3v53.9h6.3V55.2c0-2.2,0.2-4.2,0.5-5.9c0.3-1.7,0.9-3.1,1.7-4.3
+ c0.8-1.2,1.8-2.1,3.1-2.7c1.3-0.6,2.8-0.9,4.7-0.9c2.6,0,4.5,0.8,5.7,2.3c1.2,1.5,1.8,3.7,1.8,6.7v24.5h6.3V50.1
+ c0-4.8-1.1-8.4-3.2-10.6C137.5,37.3,134.3,36.2,130,36.2z"/>
+ <path fill="#389DD7" d="M105.9,56.9c0-7.3-4.2-13.7-10.4-16.7V20.8h-6v17.7c-0.7-0.1-1.4-0.1-2.1-0.1c-10.3,0-18.6,8.3-18.6,18.6
+ S77,75.5,87.3,75.5c0.7,0,1.4,0,2.1-0.1v16.4c-0.7-0.1-1.4-0.1-2.1-0.1c-10.3,0-18.6,8.3-18.6,18.6s8.3,18.6,18.6,18.6
+ c10.3,0,18.6-8.3,18.6-18.6c0-7.3-4.2-13.7-10.4-16.7V73.6C101.7,70.6,105.9,64.2,105.9,56.9z M99.6,110.2c0,6.6-5.5,12-12.3,12
+ c-6.8,0-12.3-5.4-12.3-12c0-6.6,5.5-12,12.3-12C94.1,98.2,99.6,103.6,99.6,110.2z M87.3,68.9c-6.8,0-12.3-5.4-12.3-12
+ c0-6.6,5.5-12,12.3-12c6.8,0,12.3,5.4,12.3,12C99.6,63.5,94.1,68.9,87.3,68.9z"/>
+ <path fill="#303030" d="M124.9,112c1-0.5,1.6-1.2,1.6-2.3c0-0.3-0.1-0.6-0.2-0.9c-0.1-0.3-0.2-0.5-0.4-0.7
+ c-0.2-0.2-0.4-0.4-0.7-0.6c-0.3-0.2-0.6-0.3-1-0.4c-0.4-0.1-0.8-0.1-1.3-0.1h-3.3c-0.4,0-0.8,0.1-1,0.3c-0.2,0.2-0.3,0.5-0.3,1v7.8
+ c0,0.4,0.1,0.8,0.3,1c0.2,0.2,0.5,0.3,1,0.3h3.2c0.5,0,1,0,1.4-0.1c0.4-0.1,0.8-0.2,1.1-0.3c0.5-0.2,0.9-0.6,1.2-1
+ c0.3-0.5,0.4-1,0.4-1.6C126.9,113.3,126.2,112.4,124.9,112z M120.4,108.7h1.7c0.8,0,1.3,0.1,1.7,0.3c0.4,0.2,0.6,0.5,0.6,1
+ c0,0.2-0.1,0.5-0.2,0.7c-0.2,0.3-0.4,0.5-0.7,0.6c-0.3,0.1-0.7,0.2-1.2,0.2h-1.9V108.7z M122.7,115.9h-2.2v-3h2.2
+ c0.7,0,1.3,0.1,1.6,0.3c0.4,0.2,0.5,0.6,0.5,1.1C124.8,115.4,124.1,115.9,122.7,115.9z"/>
+ <path fill="#303030" d="M139.4,115.8h-4.9v-2.9h4.3c0.3,0,0.6-0.1,0.7-0.2c0.2-0.2,0.2-0.3,0.2-0.6c0-0.2-0.1-0.4-0.2-0.6
+ c-0.2-0.1-0.4-0.2-0.7-0.2h-4.3v-2.5h4.7c0.3,0,0.6-0.1,0.7-0.2c0.2-0.2,0.3-0.3,0.3-0.6c0-0.2-0.1-0.4-0.3-0.6
+ c-0.2-0.2-0.4-0.2-0.7-0.2h-5.5c-0.3,0-0.5,0-0.7,0.1c-0.2,0.1-0.3,0.2-0.4,0.4c-0.1,0.2-0.1,0.4-0.1,0.7v7.8c0,0.5,0.1,0.8,0.3,1
+ c0.2,0.2,0.5,0.3,1,0.3h5.7c0.3,0,0.6-0.1,0.7-0.2c0.2-0.2,0.3-0.3,0.3-0.6c0-0.3-0.1-0.5-0.3-0.6
+ C140,115.9,139.7,115.8,139.4,115.8z"/>
+ <path fill="#303030" d="M322.4,108.9c-0.2-0.4-0.4-0.7-0.7-1c-0.3-0.3-0.7-0.5-1.1-0.6c-0.4-0.1-1-0.2-1.8-0.2h-2.7
+ c-0.5,0-0.8,0.1-1,0.3c-0.2,0.2-0.3,0.5-0.3,1v8c0,0.4,0.1,0.7,0.3,0.9c0.2,0.2,0.4,0.3,0.8,0.3c0.3,0,0.5-0.1,0.8-0.3
+ c0.2-0.2,0.3-0.5,0.3-0.9v-2.9h1.9c1.3,0,2.3-0.3,2.9-0.8c0.7-0.5,1-1.3,1-2.4C322.6,109.7,322.6,109.3,322.4,108.9z M320.3,111.2
+ c-0.2,0.2-0.4,0.4-0.8,0.5c-0.3,0.1-0.7,0.2-1.2,0.2h-1.4v-3.2h1.4c0.9,0,1.6,0.2,1.8,0.5c0.3,0.3,0.4,0.7,0.4,1.1
+ C320.5,110.7,320.4,111,320.3,111.2z"/>
+ <path fill="#303030" d="M307.7,107c-0.3,0-0.6,0.1-0.7,0.3c-0.2,0.2-0.3,0.5-0.3,0.9v5.1c0,0.9-0.2,1.5-0.5,2
+ c-0.3,0.4-0.9,0.7-1.7,0.7c-0.6,0-1.1-0.1-1.4-0.3c-0.3-0.2-0.6-0.5-0.7-0.9c-0.1-0.4-0.2-0.9-0.2-1.4v-5.1c0-0.4-0.1-0.7-0.3-0.9
+ c-0.2-0.2-0.4-0.3-0.8-0.3c-0.3,0-0.6,0.1-0.8,0.3c-0.2,0.2-0.3,0.5-0.3,0.9v5c0,0.8,0.1,1.4,0.3,2c0.2,0.6,0.4,1,0.8,1.4
+ c0.4,0.4,0.8,0.6,1.4,0.8c0.6,0.2,1.3,0.3,2.1,0.3c0.7,0,1.3-0.1,1.7-0.2c0.5-0.2,0.9-0.4,1.3-0.8c0.4-0.4,0.7-0.9,0.9-1.4
+ c0.2-0.5,0.2-1.2,0.2-2v-5c0-0.4-0.1-0.7-0.3-0.9C308.3,107.1,308,107,307.7,107z"/>
+ <path fill="#303030" d="M279.3,114.9c-0.3-0.4-0.6-0.8-0.9-1.2c-0.3-0.4-0.7-0.7-1.1-0.9c0.9-0.2,1.5-0.5,2-1
+ c0.4-0.5,0.7-1.1,0.7-1.8c0-0.4-0.1-0.7-0.2-1.1c-0.1-0.3-0.3-0.6-0.6-0.9c-0.2-0.2-0.5-0.4-0.9-0.6c-0.3-0.1-0.6-0.2-0.9-0.2
+ c-0.3,0-0.7-0.1-1.2-0.1h-3.4c-0.4,0-0.8,0.1-1,0.3c-0.2,0.2-0.3,0.5-0.3,1v8c0,0.4,0.1,0.7,0.3,0.9c0.2,0.2,0.4,0.3,0.8,0.3
+ c0.3,0,0.6-0.1,0.8-0.3c0.2-0.2,0.3-0.5,0.3-1v-3.3h0.7c0.4,0,0.7,0.1,0.9,0.2c0.2,0.1,0.5,0.3,0.7,0.6c0.2,0.3,0.5,0.7,0.8,1.2
+ l0.8,1.4c0.2,0.3,0.3,0.6,0.5,0.7c0.1,0.2,0.3,0.3,0.4,0.4c0.2,0.1,0.4,0.2,0.6,0.2c0.2,0,0.4,0,0.5-0.1c0.2-0.1,0.3-0.2,0.4-0.3
+ c0.1-0.1,0.1-0.3,0.1-0.4c0-0.1-0.1-0.4-0.2-0.7C279.8,115.7,279.6,115.3,279.3,114.9z M276.8,111.4c-0.3,0.1-0.8,0.1-1.3,0.1h-1.9
+ v-2.8h1.9c0.7,0,1.2,0.1,1.4,0.2c0.3,0.1,0.5,0.3,0.6,0.5c0.1,0.2,0.2,0.5,0.2,0.8c0,0.4-0.1,0.7-0.3,0.9
+ C277.4,111.2,277.1,111.3,276.8,111.4z"/>
+ <path fill="#303030" d="M215.1,107c-0.3,0-0.6,0.1-0.8,0.3c-0.2,0.2-0.3,0.5-0.3,0.9v5.1c0,0.9-0.2,1.5-0.5,2
+ c-0.3,0.4-0.9,0.7-1.7,0.7c-0.6,0-1-0.1-1.4-0.3c-0.3-0.2-0.6-0.5-0.7-0.9c-0.1-0.4-0.2-0.9-0.2-1.4v-5.1c0-0.4-0.1-0.7-0.3-0.9
+ c-0.2-0.2-0.4-0.3-0.8-0.3c-0.3,0-0.6,0.1-0.7,0.3c-0.2,0.2-0.3,0.5-0.3,0.9v5c0,0.8,0.1,1.4,0.2,2c0.2,0.6,0.4,1,0.8,1.4
+ c0.4,0.4,0.8,0.6,1.4,0.8c0.6,0.2,1.3,0.3,2.1,0.3c0.7,0,1.3-0.1,1.8-0.2c0.5-0.2,0.9-0.4,1.3-0.8c0.4-0.4,0.7-0.9,0.9-1.4
+ c0.2-0.5,0.2-1.2,0.2-2v-5c0-0.4-0.1-0.7-0.3-0.9C215.6,107.1,215.4,107,215.1,107z"/>
+ <path fill="#303030" d="M228.4,115.8h-4.2v-7.5c0-0.4-0.1-0.7-0.3-0.9c-0.2-0.2-0.4-0.3-0.8-0.3c-0.3,0-0.6,0.1-0.8,0.3
+ c-0.2,0.2-0.3,0.5-0.3,0.9v8c0,0.5,0.1,0.8,0.3,1c0.2,0.2,0.5,0.3,1,0.3h5.1c0.3,0,0.6-0.1,0.8-0.2c0.2-0.2,0.3-0.4,0.3-0.6
+ c0-0.2-0.1-0.5-0.3-0.6C229,115.8,228.7,115.8,228.4,115.8z"/>
+ <path fill="#303030" d="M201.2,107.1h-4.9c-0.3,0-0.5,0-0.7,0.1c-0.2,0.1-0.3,0.2-0.4,0.4c-0.1,0.2-0.1,0.4-0.1,0.7v8
+ c0,0.4,0.1,0.7,0.3,1c0.2,0.2,0.4,0.3,0.8,0.3c0.3,0,0.6-0.1,0.7-0.3c0.2-0.2,0.3-0.5,0.3-1V113h3.4c0.3,0,0.6-0.1,0.7-0.2
+ c0.2-0.1,0.2-0.3,0.2-0.6c0-0.2-0.1-0.4-0.2-0.6c-0.2-0.1-0.4-0.2-0.7-0.2H197v-2.6h4.1c0.3,0,0.6-0.1,0.7-0.2
+ c0.2-0.2,0.2-0.3,0.2-0.6c0-0.2-0.1-0.4-0.2-0.6C201.7,107.2,201.5,107.1,201.2,107.1z"/>
+ <path fill="#303030" d="M251.3,107.4c-0.2-0.2-0.6-0.2-1-0.2h-0.6c-0.4,0-0.7,0-0.8,0.1c-0.2,0.1-0.3,0.2-0.4,0.4
+ c-0.1,0.2-0.2,0.5-0.3,0.9l-1.5,5.7l-1.5-5.7c-0.1-0.4-0.2-0.7-0.3-0.9c-0.1-0.2-0.2-0.3-0.4-0.4c-0.2-0.1-0.5-0.1-0.8-0.1H243
+ c-0.4,0-0.7,0.1-1,0.2c-0.2,0.2-0.3,0.5-0.3,0.9v8.2c0,0.4,0.1,0.7,0.3,0.9c0.2,0.2,0.4,0.3,0.7,0.3c0.3,0,0.5-0.1,0.7-0.3
+ c0.2-0.2,0.3-0.5,0.3-0.9v-7.1l1.7,6.6l0.2,0.6c0.1,0.2,0.1,0.4,0.2,0.5c0.1,0.2,0.2,0.3,0.4,0.4c0.2,0.1,0.4,0.2,0.6,0.2
+ c0.3,0,0.6-0.1,0.8-0.2c0.2-0.2,0.3-0.3,0.4-0.5c0.1-0.2,0.2-0.5,0.3-0.9l1.7-6.6v7.1c0,0.4,0.1,0.7,0.3,0.9
+ c0.2,0.2,0.4,0.3,0.7,0.3c0.3,0,0.5-0.1,0.7-0.3c0.2-0.2,0.3-0.5,0.3-0.9v-8.2C251.6,107.8,251.5,107.5,251.3,107.4z"/>
+ <path fill="#303030" d="M263.3,108.9l-0.3-0.8c-0.1-0.2-0.2-0.4-0.3-0.6c-0.1-0.2-0.3-0.3-0.5-0.4c-0.2-0.1-0.4-0.2-0.7-0.2
+ c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.3,0.3-0.5,0.4c-0.1,0.2-0.2,0.4-0.3,0.7l-0.3,0.7l-2.6,6.7c-0.1,0.3-0.2,0.5-0.2,0.6
+ c0,0.1-0.1,0.3-0.1,0.4c0,0.2,0.1,0.5,0.3,0.7c0.2,0.2,0.4,0.3,0.7,0.3c0.3,0,0.5-0.1,0.7-0.3c0.1-0.2,0.3-0.5,0.5-1l0.5-1.3h4.2
+ l0.5,1.3l0.2,0.6c0.1,0.2,0.2,0.4,0.2,0.5c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.4,0.1c0.3,0,0.5-0.1,0.7-0.3
+ c0.2-0.2,0.3-0.4,0.3-0.7c0-0.2-0.1-0.6-0.3-1.1L263.3,108.9z M260,113.4l1.5-4.3l1.6,4.3H260z"/>
+ <path fill="#303030" d="M151.6,108.9l-0.3-0.8c-0.1-0.2-0.2-0.4-0.3-0.6c-0.1-0.2-0.3-0.3-0.5-0.4c-0.2-0.1-0.4-0.2-0.7-0.2
+ c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.1-0.4,0.3-0.5,0.4c-0.1,0.2-0.2,0.4-0.3,0.7l-0.3,0.7l-2.6,6.7c-0.1,0.3-0.2,0.5-0.2,0.6
+ c0,0.1-0.1,0.3-0.1,0.4c0,0.2,0.1,0.5,0.3,0.7c0.2,0.2,0.4,0.3,0.7,0.3c0.3,0,0.5-0.1,0.7-0.3c0.1-0.2,0.3-0.5,0.5-1l0.5-1.3h4.2
+ l0.5,1.3l0.2,0.6c0.1,0.2,0.2,0.4,0.3,0.5c0.1,0.1,0.2,0.2,0.3,0.2c0.1,0.1,0.3,0.1,0.4,0.1c0.3,0,0.5-0.1,0.7-0.3
+ c0.2-0.2,0.3-0.4,0.3-0.7c0-0.2-0.1-0.6-0.3-1.1L151.6,108.9z M148.2,113.4l1.5-4.3l1.6,4.3H148.2z"/>
+ <path fill="#303030" d="M293.9,115.4l-2.9-4.2l2.5-2.4c0.3-0.3,0.5-0.6,0.5-0.9c0-0.3-0.1-0.5-0.3-0.6c-0.2-0.2-0.4-0.3-0.7-0.3
+ c-0.2,0-0.4,0-0.6,0.1c-0.1,0.1-0.3,0.2-0.5,0.5l-4.1,4.3v-3.6c0-0.4-0.1-0.7-0.3-1c-0.2-0.2-0.4-0.3-0.8-0.3
+ c-0.3,0-0.6,0.1-0.8,0.3c-0.2,0.2-0.3,0.5-0.3,0.9v7.7c0,0.3,0,0.6,0,0.8c0,0.2,0.1,0.3,0.1,0.5c0.1,0.2,0.2,0.3,0.4,0.4
+ c0.2,0.1,0.3,0.1,0.5,0.1c0.3,0,0.6-0.1,0.8-0.3c0.2-0.2,0.3-0.5,0.3-1v-2.1l1.7-1.6l2.5,3.8l0.3,0.6c0.1,0.2,0.3,0.4,0.5,0.5
+ c0.2,0.1,0.4,0.2,0.7,0.2c0.3,0,0.6-0.1,0.7-0.3c0.2-0.2,0.3-0.4,0.3-0.6c0-0.2-0.1-0.4-0.2-0.6
+ C294.2,115.9,294.1,115.7,293.9,115.4z"/>
+ <path fill="#303030" d="M187.9,107c-0.3,0-0.6,0.1-0.7,0.3c-0.2,0.2-0.3,0.5-0.3,0.9v8.1c0,0.4,0.1,0.7,0.3,1
+ c0.2,0.2,0.4,0.3,0.7,0.3c0.3,0,0.6-0.1,0.8-0.3c0.2-0.2,0.3-0.5,0.3-1v-8.1c0-0.4-0.1-0.7-0.3-0.9
+ C188.4,107.1,188.2,107,187.9,107z"/>
+ <path fill="#303030" d="M167,107c-0.3,0-0.6,0.1-0.8,0.3c-0.2,0.2-0.3,0.5-0.3,0.9v5.1c0,0.9-0.2,1.5-0.5,2
+ c-0.3,0.4-0.9,0.7-1.7,0.7c-0.6,0-1.1-0.1-1.4-0.3c-0.3-0.2-0.6-0.5-0.7-0.9c-0.1-0.4-0.2-0.9-0.2-1.4v-5.1c0-0.4-0.1-0.7-0.3-0.9
+ c-0.2-0.2-0.4-0.3-0.8-0.3c-0.3,0-0.6,0.1-0.8,0.3c-0.2,0.2-0.3,0.5-0.3,0.9v5c0,0.8,0.1,1.4,0.3,2c0.2,0.6,0.4,1,0.8,1.4
+ c0.4,0.4,0.8,0.6,1.4,0.8c0.6,0.2,1.3,0.3,2.1,0.3c0.7,0,1.2-0.1,1.7-0.2c0.5-0.2,0.9-0.4,1.3-0.8c0.4-0.4,0.7-0.9,0.9-1.4
+ c0.2-0.5,0.2-1.2,0.2-2v-5c0-0.4-0.1-0.7-0.3-0.9C167.5,107.1,167.3,107,167,107z"/>
+ <path fill="#303030" d="M180.7,107.1h-6.7c-0.3,0-0.6,0.1-0.8,0.2c-0.2,0.2-0.3,0.4-0.3,0.6c0,0.3,0.1,0.5,0.3,0.6
+ c0.2,0.2,0.4,0.2,0.8,0.2h2.3v7.5c0,0.4,0.1,0.7,0.3,1c0.2,0.2,0.4,0.3,0.8,0.3c0.3,0,0.6-0.1,0.7-0.3c0.2-0.2,0.3-0.5,0.3-1v-7.5
+ h2.3c0.4,0,0.6-0.1,0.8-0.2c0.2-0.2,0.3-0.4,0.3-0.6c0-0.3-0.1-0.5-0.3-0.6C181.3,107.2,181.1,107.1,180.7,107.1z"/>
+</g>
+</svg>
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/script.js b/src/main/resources/SLING-INF/etc/clientlibs/repl/script.js
new file mode 100644
index 0000000..0f96a71
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/script.js
@@ -0,0 +1,152 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+/* global jQuery, ace, document, setTimeout, clearTimeout, console */
+jQuery(function ($) {
+
+ 'use strict';
+
+ var currentState = 'source';
+
+ // Limits the number of times the function gets called for event handlers
+ function debounce(fn, delay) {
+ var timer = null;
+
+ return function () {
+ var context = this;
+ var args = arguments;
+
+ clearTimeout(timer);
+ timer = setTimeout(function () {
+ fn.apply(context, args);
+ }, delay);
+ };
+ }
+
+ /**
+ * The editor object, it will take it's configuration from following attributes:
+ * id: The unique identifier of the editor (will be used as key in the Editor.all map object).
+ * data-src: The URL from which the editor's content has to be loaded.
+ * data-mode: The ACE editor's language mode.
+ * data-writeable: Boolean attribute to make the editor persisted to the data-src location.
+ */
+ function Editor(DOMElement, reloadOutputCallback) {
+ var that = this;
+ var element = $(DOMElement);
+ var editor = ace.edit(DOMElement);
+ var mode = element.data('mode');
+ var url = element.data('src');
+ var isWriteable = element.is('[data-writeable]');
+
+ function attachSaveHandler() {
+ if (isWriteable) {
+ editor.session.on('change', debounce(function () {
+ that.saveChanges();
+ }), 500);
+ }
+ }
+
+ function init() {
+ Editor.all[element.attr('id')] = that;
+
+ editor.renderer.setShowGutter(false);
+ editor.setHighlightActiveLine(false);
+ editor.setShowPrintMargin(false);
+ editor.setReadOnly(!isWriteable);
+ editor.session.setUseWorker(false);
+ editor.session.setMode(mode);
+
+ if (element.is(':visible')) {
+ that.loadContent(attachSaveHandler);
+ } else {
+ attachSaveHandler();
+ }
+ }
+
+ that.saveChanges = function (cb) {
+ if (isWriteable) {
+ $.ajax({
+ url: url,
+ type: 'PUT',
+ data: editor.getValue(),
+ contentType: 'plain/text',
+ success: reloadOutputCallback,
+ complete: cb
+ });
+ }
+ };
+
+ that.loadContent = function (cb) {
+ $.ajax(url, {
+ type: 'GET',
+ dataType: 'text',
+ cache: false,
+ processData: false,
+ success: function (data) {
+ editor.setValue(data);
+ editor.clearSelection();
+ },
+ error: function (req, textStatus, message) {
+ editor.setValue(req.responseText);
+ editor.clearSelection();
+ console.error(message);
+ },
+ complete: cb
+ });
+ };
+
+ init();
+ }
+
+ // A map of all the editors, the id attribute of their parent DOM element is used as key.
+ Editor.all = {};
+
+ // Refreshes the output after changes were made
+ function reloadOutput() {
+ if (Editor.all[currentState] !== undefined) {
+ Editor.all[currentState].loadContent();
+ } else {
+ document.getElementsByTagName('iframe')[0].contentDocument.location.reload(true);
+ }
+ }
+
+ function init() {
+ // Setup editors
+ $('.editor').each(function () {
+ new Editor(this, reloadOutput);
+ });
+
+ // Setup output tabs
+ var allTargets = $('.output-view');
+ $('a[data-toggle=tab]').each(function () {
+ var link = $(this);
+ var target = allTargets.filter(link.attr('href'));
+ var state = target.attr('id');
+
+ link.click(function () {
+ currentState = state;
+ allTargets.addClass('hidden');
+ target.removeClass('hidden');
+ reloadOutput();
+ });
+ });
+ }
+
+ init();
+
+});
diff --git a/src/main/resources/SLING-INF/etc/clientlibs/repl/style.css b/src/main/resources/SLING-INF/etc/clientlibs/repl/style.css
new file mode 100644
index 0000000..839b4cc
--- /dev/null
+++ b/src/main/resources/SLING-INF/etc/clientlibs/repl/style.css
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+body {
+ margin: 0 10px;
+}
+h1 {
+ margin-top: 10px;
+}
+iframe {
+ border: none;
+ width: 100%;
+}
+#logo {
+ min-height: 100px;
+ background: url('./images/sightly.svg') no-repeat 50% 100%;
+}
+#input .editor {
+ height: 300px;
+}
+#output .editor {
+ height: 650px;
+}
+@media (max-width: 768px) {
+ #output .lead {
+ display: none;
+ }
+}
+#output .nav {
+ margin-top: -3px;
+}
+@media (max-width: 768px) {
+ #output .nav {
+ margin: -8px 0 10px;
+ }
+}
diff --git a/src/main/resources/SLING-INF/sightly/repl.json b/src/main/resources/SLING-INF/sightly/repl.json
new file mode 100644
index 0000000..aa5081f
--- /dev/null
+++ b/src/main/resources/SLING-INF/sightly/repl.json
@@ -0,0 +1,4 @@
+{
+ "jcr:primaryType" : "nt:unstructured",
+ "sling:resourceType":"repl/components/repl"
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 10/14: SLING-5126 -
Provide information on the Sightly REPL Java tab on how to enable source
code generation
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 6bb0ca0f7ea73093c33896b726d5fc1ac0c84ce0
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Oct 8 10:53:43 2015 +0000
SLING-5126 - Provide information on the Sightly REPL Java tab on how to enable source code generation
* added link to engine configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1707473 13f79535-47bb-0310-9956-ffa450edef68
---
.../scripting/sightly/repl/REPLJavaSourceCodeServlet.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java b/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
index 35411c3..e8a1939 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/repl/REPLJavaSourceCodeServlet.java
@@ -63,7 +63,18 @@ public class REPLJavaSourceCodeServlet extends SlingSafeMethodsServlet {
@Override
protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/plain");
- response.getWriter().write(getClassSourceCode());
+ String sourceCode = getClassSourceCode();
+ if (sourceCode.length() == 0) {
+ StringBuilder configurationLink = new StringBuilder();
+ configurationLink.append(request.getScheme()).append("://").append(request.getServerName());
+ if (request.getServerPort() != 80) {
+ configurationLink.append(":").append(request.getServerPort());
+ }
+ configurationLink.append(request.getContextPath()).append("/system/console/configMgr/org.apache.sling.scripting.sightly.impl.engine.SightlyEngineConfiguration");
+ response.getWriter().write("/**\n * Please enable development mode at\n * " + configurationLink.toString() + "\n */");
+ } else {
+ response.getWriter().write(getClassSourceCode());
+ }
}
private String getClassSourceCode() {
@@ -74,7 +85,6 @@ public class REPLJavaSourceCodeServlet extends SlingSafeMethodsServlet {
return IOUtils.toString(new FileInputStream(classFile), "UTF-8");
} catch (IOException e) {
LOGGER.error("Unable to read file " + classFile.getAbsolutePath(), e);
- return "";
}
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-scripting-sightly-repl] 04/14: Update to
Sling Parent 23
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.scripting.sightly.repl-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-repl.git
commit 83049ab1aee35d68514ca15912b4a71700822b85
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000
Update to Sling Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/repl@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2d421e2..bfc3bd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.