Return-Path: 
 <commits-return-3977-apmail-lucene-commits-archive=www.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-commits-archive@www.apache.org
Received: (qmail 67690 invoked from network); 3 Jan 2011 00:31:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 3 Jan 2011 00:31:47 -0000
Received: (qmail 88814 invoked by uid 500); 3 Jan 2011 00:31:47 -0000
Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:commits@lucene.apache.org>
List-Id: <commits.lucene.apache.org>
Reply-To: dev@lucene.apache.org
Delivered-To: mailing list commits@lucene.apache.org
Received: (qmail 88807 invoked by uid 99); 3 Jan 2011 00:31:47 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jan 2011 00:31:47 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jan 2011 00:31:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id AF6F02388C0F; Mon,  3 Jan 2011 00:30:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1054507 [9/9] - in /lucene/dev/branches/realtime_search:
 ./
 dev-tools/ dev-tools/eclipse/ dev-tools/idea/ dev-tools/idea/.idea/
 dev-tools/idea/.idea/libraries/ dev-tools/idea/lucene/
 dev-tools/idea/lucene/contrib/ dev-tools/idea/lucene/con...
Date: Mon, 03 Jan 2011 00:30:45 -0000
To: commits@lucene.apache.org
From: buschmi@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110103003052.AF6F02388C0F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: lucene/dev/branches/realtime_search/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java?rev=1054507&r1=1054506&r2=1054507&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java Mon Jan  3 00:30:27 2011
@@ -35,7 +35,6 @@ import org.apache.solr.common.SolrExcept
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.search.SolrIndexSearcher;
 import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.request.SolrRequestHandler;
 import org.apache.solr.response.SolrQueryResponse;
 
 import org.apache.commons.codec.binary.Base64;

Modified: lucene/dev/branches/realtime_search/solr/src/webapp/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/webapp/web/WEB-INF/web.xml?rev=1054507&r1=1054506&r2=1054507&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/webapp/web/WEB-INF/web.xml (original)
+++ lucene/dev/branches/realtime_search/solr/src/webapp/web/WEB-INF/web.xml Mon Jan  3 00:30:27 2011
@@ -83,62 +83,16 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-  <!-- Otherwise it will continue to the old servlets -->
-  
-  <servlet>
-    <servlet-name>SolrServer</servlet-name>
-    <display-name>Solr</display-name>
-    <description>Solr Server</description>
-    <servlet-class>org.apache.solr.servlet.SolrServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>SolrUpdate</servlet-name>
-    <display-name>SolrUpdate</display-name>
-    <description>Solr Update Handler</description>
-    <servlet-class>org.apache.solr.servlet.SolrUpdateServlet</servlet-class>
-    <load-on-startup>2</load-on-startup>
-  </servlet>
-
   <servlet>
     <servlet-name>Logging</servlet-name>
     <servlet-class>org.apache.solr.servlet.LogLevelSelection</servlet-class>
   </servlet>
 
-  <!-- @Deprecated -->
-  <servlet>
-    <servlet-name>ping</servlet-name>
-    <jsp-file>/admin/ping.jsp</jsp-file>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>SolrServer</servlet-name>
-    <url-pattern>/select/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>SolrUpdate</servlet-name>
-    <url-pattern>/update/*</url-pattern>
-  </servlet-mapping>
-
   <servlet-mapping>
     <servlet-name>Logging</servlet-name>
     <url-pattern>/admin/logging</url-pattern>
   </servlet-mapping>
 
-  <!-- @Deprecated -->
-  <servlet-mapping>
-    <servlet-name>ping</servlet-name>
-    <url-pattern>/admin/ping</url-pattern>
-  </servlet-mapping>
-
-  <!-- @Deprecated -->
-  <servlet-mapping>
-    <servlet-name>Logging</servlet-name>
-    <url-pattern>/admin/logging.jsp</url-pattern>
-  </servlet-mapping>
-  
   <mime-mapping>
     <extension>.xsl</extension>
     <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ -->

Modified: lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/_info.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/_info.jsp?rev=1054507&r1=1054506&r2=1054507&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/_info.jsp (original)
+++ lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/_info.jsp Mon Jan  3 00:30:27 2011
@@ -63,7 +63,7 @@
     isEnabled = new File(enabledFile).exists();
   }
 
-  String collectionName = schema!=null ? schema.getName():"unknown";
+  String collectionName = schema!=null ? schema.getSchemaName():"unknown";
 
   String defaultSearch = "";
   { 
@@ -114,7 +114,7 @@
   }
   
   String cwd=System.getProperty("user.dir");
-  String solrHome= solrConfig.getInstanceDir();
+  String solrHome= solrConfig.getResourceLoader().getInstanceDir();
   
   boolean cachingEnabled = !solrConfig.getHttpCachingConfig().isNever304(); 
 %>

Modified: lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/index.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/index.jsp?rev=1054507&r1=1054506&r2=1054507&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/index.jsp (original)
+++ lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/index.jsp Mon Jan  3 00:30:27 2011
@@ -97,7 +97,7 @@
 
 <%
  // a quick hack to get rid of get-file.jsp -- note this still spits out invalid HTML
- out.write( org.apache.solr.handler.admin.ShowFileRequestHandler.getFileContents( "admin-extra.html" ) );
+ out.write( org.apache.solr.handler.admin.ShowFileRequestHandler.getFileContents(core, "admin-extra.html" ) );
 %>
 
 </table><P>

Modified: lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/registry.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/registry.jsp?rev=1054507&r1=1054506&r2=1054507&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/registry.jsp (original)
+++ lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/registry.jsp Mon Jan  3 00:30:27 2011
@@ -16,7 +16,6 @@
  limitations under the License.
 --%>
 <%@ page import="org.apache.solr.core.SolrInfoMBean,
-                 org.apache.solr.core.SolrInfoRegistry,
                  java.net.URL,
                  java.util.Date,
                  java.util.Map"%>

Modified: lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/stats.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/stats.jsp?rev=1054507&r1=1054506&r2=1054507&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/stats.jsp (original)
+++ lucene/dev/branches/realtime_search/solr/src/webapp/web/admin/stats.jsp Mon Jan  3 00:30:27 2011
@@ -16,7 +16,6 @@
  limitations under the License.
 --%>
 <%@ page import="org.apache.solr.core.SolrInfoMBean,
-                 org.apache.solr.core.SolrInfoRegistry,
                  org.apache.solr.common.util.NamedList,
                  java.util.Date,
                  java.util.Map"%>