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 2012/09/06 18:07:28 UTC
svn commit: r1381656 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/core/ lucene/demo/ lucene/facet/ lucene/grouping/
luce...
Author: steffkes
Date: Thu Sep 6 16:07:25 2012
New Revision: 1381656
URL: http://svn.apache.org/viewvc?rev=1381656&view=rev
Log:
SOLR-3679: admin ui shows error message if creating a new core fails
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/branch_4x/solr/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/lib/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cores.css
lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js
lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cores.html
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1381656&r1=1381655&r2=1381656&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu Sep 6 16:07:25 2012
@@ -125,6 +125,7 @@ Bug Fixes
later when a filter of the same term was specified.
(Günter Hipler, hossman, yonik)
+* SOLR-3679: Core Admin UI gives no feedback if "Add Core" fails (steffkes, hossman)
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1381656&r1=1381655&r2=1381656&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Thu Sep 6 16:07:25 2012
@@ -442,9 +442,13 @@ public class CoreAdminHandler extends Re
* @throws SolrException in case of a configuration error.
*/
protected boolean handleCreateAction(SolrQueryRequest req, SolrQueryResponse rsp) throws SolrException {
+ SolrParams params = req.getParams();
+ String name = params.get(CoreAdminParams.NAME);
+ if (null == name || "".equals(name)) {
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
+ "Core name is mandatory to CREATE a SolrCore");
+ }
try {
- SolrParams params = req.getParams();
- String name = params.get(CoreAdminParams.NAME);
//for now, do not allow creating new core with same name when in cloud mode
//XXX perhaps it should just be unregistered from cloud before readding it?,
@@ -518,7 +522,8 @@ public class CoreAdminHandler extends Re
return coreContainer.isPersistent();
} catch (Exception ex) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
- "Error executing default implementation of CREATE", ex);
+ "Error CREATEing SolrCore '" + name + "': " +
+ ex.getMessage(), ex);
}
}
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cores.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cores.css?rev=1381656&r1=1381655&r2=1381656&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cores.css (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/css/styles/cores.css Thu Sep 6 16:07:25 2012
@@ -46,6 +46,12 @@
display: none;
}
+#content #cores .actions form .error
+{
+ color: #800;
+ display: none;
+}
+
#content #cores .actions form p
{
padding-bottom: 8px;
@@ -62,7 +68,8 @@
#content #cores .actions form input,
#content #cores .actions form select,
-#content #cores .actions form .buttons
+#content #cores .actions form .buttons,
+#content #cores .actions form .error span
{
float: right;
width: 73%;
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js?rev=1381656&r1=1381655&r2=1381656&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/cores.js Thu Sep 6 16:07:25 2012
@@ -365,6 +365,12 @@ sammy.get
},
error : function( xhr, text_status, error_thrown )
{
+ var response = null;
+ eval( 'response = ' + xhr.responseText + ';' );
+
+ var error_elem = $( '.error', div_action.filter( ':visible' ) );
+ error_elem.show();
+ $( 'span', error_elem ).text( response.error.msg );
},
complete : function()
{
Modified: lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cores.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cores.html?rev=1381656&r1=1381655&r2=1381656&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cores.html (original)
+++ lucene/dev/branches/branch_4x/solr/webapp/web/tpl/cores.html Thu Sep 6 16:07:25 2012
@@ -36,19 +36,19 @@ limitations under the License.
<input type="hidden" name="action" value="CREATE">
<p class="clearfix"><label for="add_name">name:</label>
- <input type="text" name="name" id="add_name" placeholder="new_core"></p>
+ <input type="text" name="name" id="add_name" value="new_core"></p>
<p class="clearfix"><label for="add_instanceDir">instanceDir:</label>
- <input type="text" name="instanceDir" id="add_instanceDir" placeholder="new_core"></p>
+ <input type="text" name="instanceDir" id="add_instanceDir" value="new_core"></p>
<p class="clearfix"><label for="add_dataDir">dataDir:</label>
- <input type="text" name="dataDir" id="dataDir" placeholder="data"></p>
+ <input type="text" name="dataDir" id="dataDir" value="data"></p>
<p class="clearfix"><label for="add_config">config:</label>
- <input type="text" name="config" id="add_config" placeholder="solrconfig.xml"></p>
+ <input type="text" name="config" id="add_config" value="solrconfig.xml"></p>
<p class="clearfix"><label for="add_schema">schema:</label>
- <input type="text" name="schema" id="add_schema" placeholder="schema.xml"></p>
+ <input type="text" name="schema" id="add_schema" value="schema.xml"></p>
<div class="cloud">
@@ -60,6 +60,12 @@ limitations under the License.
</div>
+ <p class="clearfix error">
+
+ <span></span>
+
+ </p>
+
<p class="clearfix buttons">
<button type="submit" class="submit"><span>Add Core</span></button>
<button type="reset" class="reset"><span>Cancel</span></button>