From dc484ada1e7878a613582f59e55fb1a9ea76facd Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryan@apache.org>
Date: Thu, 3 Jan 2008 20:15:06 +0000
Subject: [PATCH] SOLR-142 -- adding deprecation warnings to get-file.jsp and
 raw-schema.jsp

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@608613 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                               |  1 +
 src/webapp/resources/admin/get-file.jsp   | 14 +++----
 src/webapp/resources/admin/raw-schema.jsp | 46 +++++++++++++++++++++++
 3 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 src/webapp/resources/admin/raw-schema.jsp

diff --git a/CHANGES.txt b/CHANGES.txt
index e9e918c814d..10258d2b54e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -178,6 +178,7 @@ New Features
     
 35. SOLR-142: Added RawResponseWriter and ShowFileRequestHandler.  This returns config
     files directly.  If the AdminHandlers is configured, this will be added automatically.
+    The jsp files /admin/get-file.jsp and /admin/raw-schema.jsp have been deprecated.
     (ryan)
 
 Changes in runtime behavior
diff --git a/src/webapp/resources/admin/get-file.jsp b/src/webapp/resources/admin/get-file.jsp
index 48721493c3a..74ad4bc9ab6 100644
--- a/src/webapp/resources/admin/get-file.jsp
+++ b/src/webapp/resources/admin/get-file.jsp
@@ -21,14 +21,14 @@
                  java.io.InputStream,
                  java.io.InputStreamReader,
                  java.io.Reader,
-                 java.util.StringTokenizer"%>
+                 java.util.StringTokenizer,
+                 java.util.logging.Logger"%>
+<%!
+  static Logger log = Logger.getLogger(SolrCore.class.getName());
+%>
 <%
-//
-// NOTE -- this file is Deprecated - should use the ShowFileRequestHandler instead
-//
-
-System.out.println( "WARNING -- using deprecated jsp file: " + request.getServletPath() );
-
+  // NOTE -- this file will be removed in a future release
+  log.warning("Using deprecated JSP: " + request.getRequestURL().append("?").append(request.getQueryString()) + " -- check the ShowFileRequestHandler"  );
 
   Object ocore = request.getAttribute("org.apache.solr.SolrCore");
   SolrCore core = ocore instanceof SolrCore? (SolrCore) ocore : SolrCore.getSolrCore();
diff --git a/src/webapp/resources/admin/raw-schema.jsp b/src/webapp/resources/admin/raw-schema.jsp
new file mode 100644
index 00000000000..450e81b4f6b
--- /dev/null
+++ b/src/webapp/resources/admin/raw-schema.jsp
@@ -0,0 +1,46 @@
+<%--
+ 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.
+--%>
+<%@ page import="org.apache.solr.core.SolrCore,
+                 org.apache.solr.schema.IndexSchema"%>
+<%@ page import="java.io.InputStreamReader"%>
+<%@ page import="java.io.Reader"%>
+<%@ page import="java.util.logging.Logger"%>
+<%@ page contentType="text/plain;charset=UTF-8" language="java" %>
+<%!
+  static Logger log = Logger.getLogger(SolrCore.class.getName());
+%>
+<%
+  // 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.MultiCore.getRegistry().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) {
+    int len = input.read(buf);
+    if (len<=0) break;
+    out.write(buf,0,len);
+  }
+%>