Merge branch 'release/1.9.1'

Gruntfile.js

@@ -31,15 +31,14 @@ module.exports = function (grunt) {
             "htdocs/js/notebook/notebook_view.js",
             "htdocs/js/notebook/notebook_model.js",
             "htdocs/js/notebook/notebook_controller.js",
-            "htdocs/js/tree/event.js",
-
             "htdocs/js/notebook/util.js",
             "htdocs/js/discovery_model.js",
             "htdocs/js/notebook.js",
             "htdocs/js/session.js",
             "htdocs/js/language.js",
             "htdocs/js/upload_utils.js",
             "htdocs/js/ui/_begin.js",
+            "htdocs/js/tree/event.js",            
             "htdocs/js/ui/advanced_menu.js",
             "htdocs/js/ui/cell_commands.js",
             "htdocs/js/ui/column.js",
@@ -71,7 +70,9 @@ module.exports = function (grunt) {
             "htdocs/js/ui/panel_loader.js",
             "htdocs/js/ui/progress.js",
             "htdocs/js/ui/right_panel.js",
+            "htdocs/js/ui/processing_queue.js",
             "htdocs/js/ui/run_button.js",
+            "htdocs/js/ui/stop_button.js",
             "htdocs/js/ui/scratchpad.js",
             "htdocs/js/ui/search.js",
             "htdocs/js/ui/session_pane.js",

NEWS.md

@@ -1,3 +1,59 @@
+## RCloud 1.9.1
+
+### Features
+ * Color coding of the items in the recent notebooks menu, to see at a glance which
+   notebooks were opened in the same session. (A session is defined as a period of
+   activity with 8 hours separating it from other sessions.) (#2462)
+
+ * Autoscrolling of output in the notebook pane - when output from the current cell
+   would leave the screen, the notebook scrolls instead. This feature is still
+   experimental, and is disabled by default - please try it out in the Settings pane
+   and provide feedback! (#2222)
+
+ * Import and export of Jupyter notebooks, via the new
+   [rcloud.jupyter.notebooks](https://github.com/att/rcloud.jupyter.notebooks)
+   package. (#2458)
+
+### Improvements
+ * Play button is split into Play and Stop buttons, to avoid accidentally restarting
+   the session and provide a cleaner, simpler interface. (#2442)
+
+ * Recent notebooks menu fits the height of the browser window (#2532)
+
+ * Hover over recent notebooks to see the date opened
+
+ * Incremental search for multiple terms searches for all the terms using AND (#2518)
+
+ * Support for Shiny showcase display mode, for simple debugging of reactive
+   events. Built-in R debugging also shows the source cell name. (rcloud.shiny#23)
+
+ * Easier to maintain a solr search index when solr is restarted (rcloud.solr#86)
+
+### Bugfixes
+ * New notebooks were shown as hidden (#2538)
+
+ * Incremental search did not regard username (#2517)
+
+ * Long cells were not indexed by `rcloud.solr` (#2547)
+
+ * Hidden and private notebooks were not removed from Search, and displayed an error
+   (#2533)
+
+ * `rcloud.delete.asset` now works (#2420)
+
+ * Joining cells of arbitrary languages should always produce the expected language
+   (#2361)
+
+ * Help wouldn't be found if there was leading or trailing whitespace in the input
+   (#1760)
+
+ * Editing a running cell would cause its output to disappear once autosave kicked in
+   (#2529)
+
+ * Components moved out of JS global namespace that were causing incompatibilities with
+   other packages (#2524)
+
+
 ## RCloud 1.9
 
 ### Features

VERSION

@@ -1 +1 @@
-1.9
+1.9.1

conf/solr/schema.xml

@@ -34,7 +34,7 @@
 <field name="raw_url" type="text_general" indexed="true" stored="true"/>
 <field name="size" type="int" indexed="false" stored="true"/>
 <field name="content" type="text_general" indexed="true" stored="true" multiValued="true"/>
-<field name="code" type="string" indexed="true" stored="true" multiValued="false" />    
+<field name="code" type="text_general" indexed="true" stored="true" multiValued="false" />    
 </fields>
 
 <uniqueKey>id</uniqueKey>

conf/solr/solr.xml

@@ -0,0 +1,53 @@
+<?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.
+-->
+
+<!--
+   This is an example of a simple "solr.xml" file for configuring one or 
+   more Solr Cores, as well as allowing Cores to be added, removed, and 
+   reloaded via HTTP requests.
+
+   More information about options available in this configuration file, 
+   and Solr Core administration can be found online:
+   http://wiki.apache.org/solr/CoreAdmin
+-->
+
+<solr>
+
+  <solrcloud>
+
+    <str name="host">${host:}</str>
+    <int name="hostPort">${jetty.port:8983}</int>
+    <str name="hostContext">${hostContext:solr}</str>
+
+    <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+
+    <int name="zkClientTimeout">${zkClientTimeout:30000}</int>
+    <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:600000}</int>
+    <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
+    <str name="zkCredentialsProvider">${zkCredentialsProvider:org.apache.solr.common.cloud.DefaultZkCredentialsProvider}</str>
+    <str name="zkACLProvider">${zkACLProvider:org.apache.solr.common.cloud.DefaultZkACLProvider}</str>
+
+  </solrcloud>
+
+  <shardHandlerFactory name="shardHandlerFactory"
+    class="HttpShardHandlerFactory">
+    <int name="socketTimeout">${socketTimeout:600000}</int>
+    <int name="connTimeout">${connTimeout:60000}</int>
+  </shardHandlerFactory>
+
+</solr>

conf/solr/solrsetup.sh

@@ -42,20 +42,22 @@ if [ ! -e "solr-$VER" ]; then
 fi
 ln -s -f solr-$VER solr
 
+# If SOLR_HOME exists then use it
+if [ -z ${SOLR_HOME+x} ]; then
+    SOLR_DATA="${DEST}/solrdata"
+else
+    SOLR_DATA=$SOLR_HOME
+fi
 
-# Start apache Solr on default port
-echo "starting Apache Solr or default port - 8983 ... "
-"$DEST"/solr/bin/solr start
-
-SOLR_DEST="$DEST/solrdata"
-INSTANCEDIR="$SOLR_DEST/solr/rcloudnotebooks"
+INSTANCEDIR="${SOLR_DATA}/rcloudnotebooks"
 DATADIR="${INSTANCEDIR}/data"
 CONFDIR="${INSTANCEDIR}/conf"
 
 #cp -R solr/example/solr/collection1/ solr/example/solr/rcloudnotebooks
 mkdir -p $DATADIR
 mkdir -p $CONFDIR
-#rm solr/example/solr/rcloudnotebooks/core.properties
+
+cp "$WD/solr.xml" ${SOLR_DATA}/
 cp "$WD/schema.xml" ${CONFDIR}/
 cp "$WD/solrconfig.xml" ${CONFDIR}/
 cp "$WD/word-delim-types.txt" ${CONFDIR}/
@@ -66,7 +68,11 @@ cp  "$WD/stopwords.txt" ${CONFDIR}/
 cp -r "$WD/lang" ${CONFDIR}/
 # Create a collection for the RCloud Notebooks
 
-
+# Start apache Solr on default port
+echo "starting Apache Solr or default port - 8983 ... "
+"$DEST"/solr/bin/solr start -s $SOLR_DATA
+
+
 QUERY="http://localhost:8983/solr/admin/cores?action=CREATE&name=rcloudnotebooks&instanceDir=$INSTANCEDIR&config=solrconfig.xml&schema=schema.xml&dataDir=$DATADIR"
 curl "$QUERY"