You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2017/05/10 14:46:17 UTC
[1/3] lucene-solr:jira/solr-10290: Add back json and jsoup
dependencies
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-10290 3d036dec3 -> 7856fdf7a
Add back json and jsoup dependencies
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fb86e76d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fb86e76d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fb86e76d
Branch: refs/heads/jira/solr-10290
Commit: fb86e76d1a8caa6051a1a066496897abbe3e6830
Parents: 3d036de
Author: Cassandra Targett <ca...@lucidworks.com>
Authored: Wed May 10 08:38:57 2017 -0500
Committer: Cassandra Targett <ca...@lucidworks.com>
Committed: Wed May 10 08:38:57 2017 -0500
----------------------------------------------------------------------
lucene/ivy-versions.properties | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fb86e76d/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 80546b0..094199f 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -193,6 +193,10 @@ org.apache.uima.version = 2.3.1
# which is the same as asciidoctor-pdf 1.5.0-alpha.15
/org.asciidoctor/asciidoctor-ant = 1.6.0-alpha.3
+/org.json/json = 20160810
+
+/org.jsoup/jsoup = 1.8.2
+
org.bouncycastle.version = 1.45
/org.bouncycastle/bcmail-jdk15 = ${org.bouncycastle.version}
/org.bouncycastle/bcprov-jdk15 = ${org.bouncycastle.version}
[3/3] lucene-solr:jira/solr-10290: SOLR-10290: make page TOC appear
on page load
Posted by ct...@apache.org.
SOLR-10290: make page TOC appear on page load
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7856fdf7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7856fdf7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7856fdf7
Branch: refs/heads/jira/solr-10290
Commit: 7856fdf7a1ffb8ce038f3a40e8057f9f62dc89ec
Parents: 39fdd15
Author: Cassandra Targett <ca...@lucidworks.com>
Authored: Wed May 10 09:43:19 2017 -0500
Committer: Cassandra Targett <ca...@lucidworks.com>
Committed: Wed May 10 09:43:19 2017 -0500
----------------------------------------------------------------------
solr/solr-ref-guide/src/js/toc.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7856fdf7/solr/solr-ref-guide/src/js/toc.js
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/js/toc.js b/solr/solr-ref-guide/src/js/toc.js
index a54d172..9adff0d 100755
--- a/solr/solr-ref-guide/src/js/toc.js
+++ b/solr/solr-ref-guide/src/js/toc.js
@@ -7,8 +7,8 @@
minimumHeaders: 3,
headers: 'h1, h2, h3, h4',
listType: 'ol', // values: [ol|ul]
- showEffect: 'show', // values: [show|slideDown|fadeIn|none]
- showSpeed: 'slow' // set to 0 to deactivate effect
+ showEffect: 'none', // values: [show|slideDown|fadeIn|none]
+ showSpeed: '0' // set to 0 to deactivate effect
},
settings = $.extend(defaults, options);
@@ -79,4 +79,4 @@
render[settings.showEffect]();
};
-})(jQuery);
\ No newline at end of file
+})(jQuery);
[2/3] lucene-solr:jira/solr-10290: SOLR-10290: remove unused usermaps
and tab formats
Posted by ct...@apache.org.
SOLR-10290: remove unused usermaps and tab formats
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/39fdd157
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/39fdd157
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/39fdd157
Branch: refs/heads/jira/solr-10290
Commit: 39fdd15700de7c3a23f332b11fd64b1393b37895
Parents: fb86e76
Author: Cassandra Targett <ca...@lucidworks.com>
Authored: Wed May 10 09:42:45 2017 -0500
Committer: Cassandra Targett <ca...@lucidworks.com>
Committed: Wed May 10 09:42:45 2017 -0500
----------------------------------------------------------------------
.../custom/getting_started_series.html | 19 ----
.../custom/getting_started_series_next.html | 11 ---
.../src/_includes/custom/series_acme.html | 19 ----
.../src/_includes/custom/series_acme_next.html | 10 ---
.../src/_includes/custom/usermap.html | 14 ---
.../src/_includes/custom/usermapcomplex.html | 91 --------------------
solr/solr-ref-guide/src/_layouts/default.html | 3 -
solr/solr-ref-guide/src/_layouts/page.html | 11 +--
8 files changed, 4 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39fdd157/solr/solr-ref-guide/src/_includes/custom/getting_started_series.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/custom/getting_started_series.html b/solr/solr-ref-guide/src/_includes/custom/getting_started_series.html
deleted file mode 100755
index fef578b..0000000
--- a/solr/solr-ref-guide/src/_includes/custom/getting_started_series.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="seriesContext">
- <div class="btn-group">
- <button type="button" data-toggle="dropdown" class="btn btn-primary dropdown-toggle">Getting Started <span class="caret"></span></button>
- <ol class="dropdown-menu">
- {% assign pages = site.pages | sort:"weight" %}
- {% for p in pages %}
- {% if p.series == "Getting Started" %}
- {% if p.url == page.url %}
- <li class="active"> → {{p.title}}</li>
- {% else %}
- <li>
- <a href="{{p.url}}">{{p.title}}</a>
- </li>
- {% endif %}
- {% endif %}
- {% endfor %}
- </ol>
- </div>
-</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39fdd157/solr/solr-ref-guide/src/_includes/custom/getting_started_series_next.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/custom/getting_started_series_next.html b/solr/solr-ref-guide/src/_includes/custom/getting_started_series_next.html
deleted file mode 100755
index 247e0cb..0000000
--- a/solr/solr-ref-guide/src/_includes/custom/getting_started_series_next.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<p>{% assign series_pages = site.tags.series_acme %}
- {% for p in pages %}
- {% if p.series == "Getting Started" %}
- {% assign nextTopic = page.weight | plus: "1" %}
- {% if p.weight == nextTopic %}
- <a href="{{p.url}}"><button type="button" class="btn btn-primary">Next: {{p.title}}</button></a>
- {% endif %}
- {% endif %}
- {% endfor %}
-</p>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39fdd157/solr/solr-ref-guide/src/_includes/custom/series_acme.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/custom/series_acme.html b/solr/solr-ref-guide/src/_includes/custom/series_acme.html
deleted file mode 100755
index adeb76f..0000000
--- a/solr/solr-ref-guide/src/_includes/custom/series_acme.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="seriesContext">
- <div class="btn-group">
- <button type="button" data-toggle="dropdown" class="btn btn-primary dropdown-toggle">Series Demo <span class="caret"></span></button>
- <ol class="dropdown-menu">
- {% assign pages = site.pages | sort:"weight" %}
- {% for p in pages %}
- {% if p.series == "ACME series" %}
- {% if p.url == page.url %}
- <li class="active"> → {{p.weight}}. {{p.title}}</li>
- {% else %}
- <li>
- <a href="{{p.url}}">{{p.weight}}. {{p.title}}</a>
- </li>
- {% endif %}
- {% endif %}
- {% endfor %}
- </ol>
- </div>
-</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39fdd157/solr/solr-ref-guide/src/_includes/custom/series_acme_next.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/custom/series_acme_next.html b/solr/solr-ref-guide/src/_includes/custom/series_acme_next.html
deleted file mode 100755
index abd345b..0000000
--- a/solr/solr-ref-guide/src/_includes/custom/series_acme_next.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<p>{% assign series_pages = site.tags.series_acme %}
- {% for p in pages %}
- {% if p.series == "ACME series" %}
- {% assign nextTopic = page.weight | plus: "1" %}
- {% if p.weight == nextTopic %}
- <a href="{{p.url}}"><button type="button" class="btn btn-primary">Next: {{p.weight}} {{p.title}}</button></a>
- {% endif %}
- {% endif %}
- {% endfor %}
-</p>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39fdd157/solr/solr-ref-guide/src/_includes/custom/usermap.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/custom/usermap.html b/solr/solr-ref-guide/src/_includes/custom/usermap.html
deleted file mode 100755
index f90b5c2..0000000
--- a/solr/solr-ref-guide/src/_includes/custom/usermap.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div id="userMap">
-<div class="content"><a href="p2_sample1.html"><div class="box box1">Connect to ADB</div></a></div>
-<div class="arrow">→</div>
-<div class="content"><a href="p2_sample2.html"><div class="box box2">Download and Build the Starter Kit</div></a></div>
-<div class="arrow">→</div>
-<div class="content"><a href="p2_sample3.html"><div class="box box3">Take a Tour</div></a></div>
-<div class="arrow">→</div>
-<div class="content"><a href="p2_sample4.html"><div class="box box4">Load Your Widgets</div></a></div>
-<div class="arrow">→</div>
-<div class="content"><a href="p2_sample5.html"><div class="box box5">Query for Something</div></a></div>
-<div class="clearfix"></div>
-
-</div>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39fdd157/solr/solr-ref-guide/src/_includes/custom/usermapcomplex.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_includes/custom/usermapcomplex.html b/solr/solr-ref-guide/src/_includes/custom/usermapcomplex.html
deleted file mode 100755
index c75a652..0000000
--- a/solr/solr-ref-guide/src/_includes/custom/usermapcomplex.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<div id="userMap">
-
- <!-- Button trigger modal -->
-<button type="button" class="btn btn-default btn-lg modalButton1" data-toggle="modal" data-target="#myModal1">Get Started</button>
-
- <!-- Modal -->
- <div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
- <div class="modal-dialog" role="document">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
- <h4 class="modal-title" id="myModalLabel">Get Started</h4>
- </div>
- <div class="modal-body">
-<p>This is just dummy text ... Your first steps should be to get started. You will need to do the following:</p>
-
- <ul>
- <li><a href="p2_sample6.html">Sample 6</a></li>
- <li><a href="p2_sample7.html">Sample 7</a></li>
- <li><a href="p2_sample8.html">Sample 8</a></li>
- </ul>
- <p>If you run into any of these setup issues, you must solve them before you can continue on.</p>
-
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
- </div>
- </div>
- </div>
- </div>
- <span class="complexArrow">→</span>
-
- <!-- Button trigger modal -->
- <button type="button" class="btn btn-default btn-lg modalButton2" data-toggle="modal" data-target="#myModal2">Build your widgets</button>
- <!-- Modal -->
- <div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
- <div class="modal-dialog" role="document">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
- <h4 class="modal-title" id="myModalLabel">Build your widgets</h4>
- </div>
- <div class="modal-body">
- <p>In this step, you will build the widgets for your system. The widgets form the various components that blah blah blah this is dummy text power the nuclear capabilities of your energy transformer into deep space using wormhole technology and warp drive speeds.</p>
-
- <p>In order to configure your widgets, you will need to follow these topics:</p>
- <ul>
- <li><a href="p2_sample9.html">Sample 9</a></li>
- <li><a href="p2_sample10.html">Sample 10</a></li>
- <li><a href="p2_sample11.html">Sample 11</a></li>
- </ul>
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
- </div>
- </div>
- </div>
- </div>
-
- <span class="complexArrow">→</span>
-
- <!-- Button trigger modal -->
-<button type="button" class="btn btn-default btn-lg modalButton3" data-toggle="modal" data-target="#myModal3">Publish your app</button>
- <!-- Modal -->
- <div class="modal fade" id="myModal3" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
- <div class="modal-dialog" role="document">
- <div class="modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
- <h4 class="modal-title" id="myModalLabel">Publish your app</h4>
- </div>
- <div class="modal-body">
- <p>After you've configured all the necessary components to build your space transformer, you need to publish your app. Of course this content is also just dummy text. Pay no particular attention to the content but rather the format and placement of the map.</p>
- <p>To publish your app, see the following:
- <ul>
- <li><a href="p2_sample12.html">Sample 12</a></li>
- <li><a href="p2_sample13.html">Sample 13</a></li>
- <li><a href="p2_sample14.html">Sample 14</a></li>
- </ul>
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
- </div>
- </div>
- </div>
- </div>
-
-
-<div class="clearfix"></div>
-
-</div>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39fdd157/solr/solr-ref-guide/src/_layouts/default.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_layouts/default.html b/solr/solr-ref-guide/src/_layouts/default.html
index e84af38..aa4601f 100755
--- a/solr/solr-ref-guide/src/_layouts/default.html
+++ b/solr/solr-ref-guide/src/_layouts/default.html
@@ -52,7 +52,4 @@
</div>
</body>
-{% if site.google_analytics %}
-{% include google_analytics.html %}
-{% endif %}
</html>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/39fdd157/solr/solr-ref-guide/src/_layouts/page.html
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/_layouts/page.html b/solr/solr-ref-guide/src/_layouts/page.html
index 502eeab..20758da 100755
--- a/solr/solr-ref-guide/src/_layouts/page.html
+++ b/solr/solr-ref-guide/src/_layouts/page.html
@@ -6,27 +6,24 @@ layout: default
<h1 class="post-title-main">{{ page.title }}</h1>
</div>
+<!-- This adds a workflow map, to a page
+ See http://idratherbewriting.com/documentation-theme-jekyll/mydoc_workflow_maps.html
+ Leaving it here commented out in case we want to implement this in the future
{% if page.simple_map == true %}
-
<script>
$(document).ready ( function(){
$('.box{{page.box_number}}').addClass('active');
});
</script>
-
{% include custom/{{page.map_name}}.html %}
-
{% elsif page.complex_map == true %}
-
<script>
$(document).ready ( function(){
$('.modalButton{{page.box_number}}').addClass('active');
});
</script>
-
{% include custom/{{page.map_name}}.html %}
-
-{% endif %}
+{% endif %} -->
<div class="post-content">