lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ehatc...@apache.org
Subject svn commit: r641115 - in /lucene/solr/trunk/src/webapp/web/admin: _info.jsp logging.jsp ping.jsp raw-schema.jsp
Date Wed, 26 Mar 2008 02:22:54 GMT
Author: ehatcher
Date: Tue Mar 25 19:22:51 2008
New Revision: 641115

URL: http://svn.apache.org/viewvc?rev=641115&view=rev
Log:
Fix JSPs that refered to removed SolrMultiCore

Modified:
    lucene/solr/trunk/src/webapp/web/admin/_info.jsp
    lucene/solr/trunk/src/webapp/web/admin/logging.jsp
    lucene/solr/trunk/src/webapp/web/admin/ping.jsp
    lucene/solr/trunk/src/webapp/web/admin/raw-schema.jsp

Modified: lucene/solr/trunk/src/webapp/web/admin/_info.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/_info.jsp?rev=641115&r1=641114&r2=641115&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/_info.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/_info.jsp Tue Mar 25 19:22:51 2008
@@ -24,8 +24,6 @@
 <%@ page import="org.apache.solr.util.XML"%>
 <%@ page import="org.apache.lucene.LucenePackage"%>
 <%@ page import="java.net.UnknownHostException" %>
-
-
 <%
   // 
   SolrCore  core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore");
@@ -106,4 +104,4 @@
   
   String cwd=System.getProperty("user.dir");
   String solrHome= solrConfig.getInstanceDir();
-%>
+%>
\ No newline at end of file

Modified: lucene/solr/trunk/src/webapp/web/admin/logging.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/logging.jsp?rev=641115&r1=641114&r2=641115&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/logging.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/logging.jsp Tue Mar 25 19:22:51 2008
@@ -26,16 +26,9 @@
 <%@ page import="java.util.logging.Logger"%>
 
 <?xml-stylesheet type="text/xsl" href="logging.xsl"?>
+<%@include file="_info.jsp" %>
 
 <%
-  SolrCore  core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore");
-  if (core == null) {
-    String coreParam = request.getParameter("core");
-    core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam)
: null;
-  }
-  if (core == null)
-    core = SolrCore.getSolrCore();
-    
   Logger log = SolrCore.log;
   Logger parent = log.getParent();
   while(parent != null) {

Modified: lucene/solr/trunk/src/webapp/web/admin/ping.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/ping.jsp?rev=641115&r1=641114&r2=641115&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/ping.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/ping.jsp Tue Mar 25 19:22:51 2008
@@ -24,15 +24,7 @@
 <%@ page import="org.apache.solr.request.ServletSolrParams"%>
 <%@ page import="org.apache.solr.request.SolrQueryRequest"%>
 
-<%
-  SolrCore  core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore");
-  if (core == null) {
-    String coreParam = request.getParameter("core");
-    core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam)
: null;
-  }
-  if (core == null)
-    core = SolrCore.getSolrCore();
-%>
+<%@include file="_info.jsp" %>
 <?xml-stylesheet type="text/xsl" href="ping.xsl"?>
 
 <solr>

Modified: lucene/solr/trunk/src/webapp/web/admin/raw-schema.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/raw-schema.jsp?rev=641115&r1=641114&r2=641115&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/raw-schema.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/raw-schema.jsp Tue Mar 25 19:22:51 2008
@@ -20,6 +20,7 @@
 <%@ page import="java.io.Reader"%>
 <%@ page import="java.util.logging.Logger"%>
 <%@ page contentType="text/plain;charset=UTF-8" language="java" %>
+<%@include file="_info.jsp" %>
 <%!
   static Logger log = Logger.getLogger(SolrCore.class.getName());
 %>
@@ -27,15 +28,6 @@
   // NOTE -- this file will be removed in a future release
   log.warning("Using deprecated JSP: " + request.getRequestURL().append("?").append(request.getQueryString())
+ " -- check the ShowFileRequestHandler"  );
 
-  SolrCore  core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore");
-  if (core == null) {
-    String coreParam = request.getParameter("core");
-    core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam)
: null;
-  }
-  if (core == null)
-    core = SolrCore.getSolrCore();
-    
-  IndexSchema schema = core.getSchema();
   Reader input = new InputStreamReader(schema.getInputStream());
   char[] buf = new char[4096];
   while (true) {



Mime
View raw message