You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2008/09/20 17:14:54 UTC
svn commit: r697377 - in /lucene/solr/trunk: CHANGES.txt
src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Author: shalin
Date: Sat Sep 20 08:14:54 2008
New Revision: 697377
URL: http://svn.apache.org/viewvc?rev=697377&view=rev
Log:
SOLR-771 -- CoreAdminHandler STATUS should display 'normalized' paths
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=697377&r1=697376&r2=697377&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Sat Sep 20 08:14:54 2008
@@ -48,6 +48,8 @@
1. SOLR-774: Fixed logging level display (Sean Timm via Otis Gospodnetic)
+ 2. SOLR-771: CoreAdminHandler STATUS should display 'normalized' paths (koji, hossman, shalin)
+
Build
----------------------
1. SOLR-776: Added in ability to sign artifacts via Ant for releases (gsingers)
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=697377&r1=697376&r2=697377&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Sat Sep 20 08:14:54 2008
@@ -35,7 +35,6 @@
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.RefCounted;
-import org.apache.solr.common.util.StrUtils;
/**
* @version $Id$
@@ -210,8 +209,8 @@
if (core != null) {
try {
info.add("name", core.getName());
- info.add("instanceDir", core.getResourceLoader().getInstanceDir());
- info.add("dataDir", core.getDataDir());
+ info.add("instanceDir", normalizePath(core.getResourceLoader().getInstanceDir()));
+ info.add("dataDir", normalizePath(core.getDataDir()));
info.add("startTime", new Date(core.getStartTime()));
info.add("uptime", System.currentTimeMillis() - core.getStartTime());
RefCounted<SolrIndexSearcher> searcher = core.getSearcher();
@@ -223,6 +222,14 @@
}
return info;
}
+
+ private static String normalizePath(String path) {
+ if (path == null)
+ return null;
+ path = path.replace('/', File.separatorChar);
+ path = path.replace('\\', File.separatorChar);
+ return path;
+ }
//////////////////////// SolrInfoMBeans methods //////////////////////