You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2013/01/05 11:57:22 UTC
svn commit: r1429259 - in /lucene/dev/trunk/solr: ./ webapp/web/js/scripts/
Author: steffkes
Date: Sat Jan 5 10:57:21 2013
New Revision: 1429259
URL: http://svn.apache.org/viewvc?rev=1429259&view=rev
Log:
SOLR-4045: SOLR admin page returns HTTP 404 on core names containing a '.' (dot)
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js
lucene/dev/trunk/solr/webapp/web/js/scripts/app.js
lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js
lucene/dev/trunk/solr/webapp/web/js/scripts/dataimport.js
lucene/dev/trunk/solr/webapp/web/js/scripts/file.js
lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js
lucene/dev/trunk/solr/webapp/web/js/scripts/query.js
lucene/dev/trunk/solr/webapp/web/js/scripts/replication.js
lucene/dev/trunk/solr/webapp/web/js/scripts/schema-browser.js
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1429259&r1=1429258&r2=1429259&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Jan 5 10:57:21 2013
@@ -445,6 +445,8 @@ Bug Fixes
* SOLR-4257: PeerSync updates and Log Replay updates should not wait for
a ZooKeeper connection in order to proceed. (yonik)
+* SOLR-4045: SOLR admin page returns HTTP 404 on core names containing
+ a '.' (dot) (steffkes)
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js?rev=1429259&r1=1429258&r2=1429259&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/analysis.js Sat Jan 5 10:57:21 2013
@@ -18,7 +18,7 @@
// #/:core/analysis
sammy.get
(
- /^#\/([\w\d-]+)\/(analysis)$/,
+ new RegExp( app.core_regex_base + '\\/(analysis)$' ),
function( context )
{
var active_core = this.active_core;
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/app.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/app.js?rev=1429259&r1=1429258&r2=1429259&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/app.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/app.js Sat Jan 5 10:57:21 2013
@@ -100,7 +100,7 @@ var sammy = $.sammy
{
var selector = '~' === this.params.splat[0][0]
? '#' + this.params.splat[0].replace( /^~/, '' ) + '.global'
- : '#menu-selector #' + this.params.splat[0];
+ : '#menu-selector #' + this.params.splat[0].replace( /\./g, '__' );
var active_element = $( selector, menu_wrapper );
@@ -152,6 +152,8 @@ var solr_admin = function( app_config )
this.timeout = null;
+ this.core_regex_base = '^#\\/([\\w\\d-\\.]+)';
+
show_global_error = function( error )
{
var main = $( '#main' );
@@ -205,7 +207,7 @@ var solr_admin = function( app_config )
classes.push( 'default' );
}
- var core_tpl = '<li id="' + core_name + '" '
+ var core_tpl = '<li id="' + core_name.replace( /\./g, '__' ) + '" '
+ ' class="' + classes.join( ' ' ) + '"'
+ ' data-basepath="' + core_path + '"'
+ ' schema="' + schema + '"'
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js?rev=1429259&r1=1429258&r2=1429259&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/dashboard.js Sat Jan 5 10:57:21 2013
@@ -39,7 +39,7 @@ var set_healthcheck_status = function( s
// #/:core
sammy.get
(
- /^#\/([\w\d-]+)$/,
+ new RegExp( app.core_regex_base + '$' ),
function( context )
{
var core_basepath = this.active_core.attr( 'data-basepath' );
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/dataimport.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/dataimport.js?rev=1429259&r1=1429258&r2=1429259&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/dataimport.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/dataimport.js Sat Jan 5 10:57:21 2013
@@ -101,7 +101,7 @@ sammy.bind
// #/:core/dataimport
sammy.get
(
- /^#\/([\w\d-]+)\/(dataimport)$/,
+ new RegExp( app.core_regex_base + '\\/(dataimport)$' ),
function( context )
{
sammy.trigger
@@ -129,7 +129,7 @@ sammy.get
// #/:core/dataimport
sammy.get
(
- /^#\/([\w\d-]+)\/(dataimport)\//,
+ new RegExp( app.core_regex_base + '\\/(dataimport)\\/' ),
function( context )
{
var core_basepath = this.active_core.attr( 'data-basepath' );
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/file.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/file.js?rev=1429259&r1=1429258&r2=1429259&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/file.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/file.js Sat Jan 5 10:57:21 2013
@@ -18,7 +18,7 @@
// #/:core/schema, #/:core/config
sammy.get
(
- /^#\/([\w\d-]+)\/(schema|config)$/,
+ new RegExp( app.core_regex_base + '\\/(schema|config)$' ),
function( context )
{
var core_basepath = this.active_core.attr( 'data-basepath' );
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js?rev=1429259&r1=1429258&r2=1429259&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/plugins.js Sat Jan 5 10:57:21 2013
@@ -382,7 +382,7 @@ sammy.bind
// #/:core/plugins/$type
sammy.get
(
- /^#\/([\w\d-]+)\/(plugins)\/(\w+)$/,
+ new RegExp( app.core_regex_base + '\\/(plugins)\\/(\\w+)$' ),
function( context )
{
core_basepath = this.active_core.attr( 'data-basepath' );
@@ -405,7 +405,7 @@ sammy.get
// #/:core/plugins
sammy.get
(
- /^#\/([\w\d-]+)\/(plugins)$/,
+ new RegExp( app.core_regex_base + '\\/(plugins)$' ),
function( context )
{
core_basepath = this.active_core.attr( 'data-basepath' );
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/query.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/query.js?rev=1429259&r1=1429258&r2=1429259&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/query.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/query.js Sat Jan 5 10:57:21 2013
@@ -18,7 +18,7 @@
// #/:core/query
sammy.get
(
- /^#\/([\w\d-]+)\/(query)$/,
+ new RegExp( app.core_regex_base + '\\/(query)$' ),
function( context )
{
var core_basepath = this.active_core.attr( 'data-basepath' );
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/replication.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/replication.js?rev=1429259&r1=1429258&r2=1429259&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/replication.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/replication.js Sat Jan 5 10:57:21 2013
@@ -490,7 +490,7 @@ var replication_fetch_status = function(
// #/:core/replication
sammy.get
(
- /^#\/([\w\d-]+)\/(replication)$/,
+ new RegExp( app.core_regex_base + '\\/(replication)$' ),
function( context )
{
core_basepath = this.active_core.attr( 'data-basepath' );
Modified: lucene/dev/trunk/solr/webapp/web/js/scripts/schema-browser.js
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/scripts/schema-browser.js?rev=1429259&r1=1429258&r2=1429259&view=diff
==============================================================================
--- lucene/dev/trunk/solr/webapp/web/js/scripts/schema-browser.js (original)
+++ lucene/dev/trunk/solr/webapp/web/js/scripts/schema-browser.js Sat Jan 5 10:57:21 2013
@@ -678,7 +678,7 @@ sammy.bind
// #/:core/schema-browser
sammy.get
(
- /^#\/([\w\d-]+)\/(schema-browser)$/,
+ new RegExp( app.core_regex_base + '\\/(schema-browser)$' ),
function( context )
{
var core_basepath = this.active_core.attr( 'data-basepath' );