You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by bu...@apache.org on 2011/01/03 01:30:45 UTC
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...
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"%>