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 ry...@apache.org on 2008/10/03 23:26:57 UTC
svn commit: r701539 [6/6] - in /lucene/solr/branches/sandbox/ryan:
client/java/solrj/src/org/apache/solr/client/solrj/embedded/
client/java/solrj/src/org/apache/solr/client/solrj/impl/
client/java/solrj/src/org/apache/solr/client/solrj/response/ client...
Modified: lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java Fri Oct 3 14:26:50 2008
@@ -36,6 +36,7 @@
* @since solr 1.3
*/
public final class LogLevelSelection extends HttpServlet {
+ @Override
public void init() throws ServletException {
}
@@ -43,6 +44,7 @@
* Processes an HTTP GET request and changes the logging level as
* specified.
*/
+ @Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
@@ -149,6 +151,7 @@
}
+ @Override
public void doPost(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
@@ -261,6 +264,7 @@
return name.compareTo(((LogWrapper) other).name);
}
+ @Override
public boolean equals(Object other) {
return name.equals(((LogWrapper) other).name);
}
Modified: lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java Fri Oct 3 14:26:50 2008
@@ -36,8 +36,6 @@
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
-import org.apache.solr.request.SolrRequestHandler;
-
import org.apache.commons.codec.binary.Base64;
public final class HttpCacheHeaderUtil {
Modified: lucene/solr/branches/sandbox/ryan/src/webapp/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/webapp/web/WEB-INF/web.xml?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/webapp/web/WEB-INF/web.xml (original)
+++ lucene/solr/branches/sandbox/ryan/src/webapp/web/WEB-INF/web.xml Fri Oct 3 14:26:50 2008
@@ -86,53 +86,15 @@
<!-- 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>
-
<mime-mapping>
<extension>.xsl</extension>
<!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ -->
Modified: lucene/solr/branches/sandbox/ryan/src/webapp/web/admin/_info.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/webapp/web/admin/_info.jsp?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/webapp/web/admin/_info.jsp (original)
+++ lucene/solr/branches/sandbox/ryan/src/webapp/web/admin/_info.jsp Fri Oct 3 14:26:50 2008
@@ -47,7 +47,7 @@
isEnabled = new File(enabledFile).exists();
}
- String collectionName = schema!=null ? schema.getName():"unknown";
+ String collectionName = core.getName();
InetAddress addr = null;
String hostname = "unknown";
try {
@@ -106,5 +106,5 @@
}
String cwd=System.getProperty("user.dir");
- String solrHome= solrConfig.getInstanceDir();
+ String solrHome= "???"; //solrConfig.getInstanceDir();
%>
\ No newline at end of file
Modified: lucene/solr/branches/sandbox/ryan/src/webapp/web/admin/index.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/webapp/web/admin/index.jsp?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/webapp/web/admin/index.jsp (original)
+++ lucene/solr/branches/sandbox/ryan/src/webapp/web/admin/index.jsp Fri Oct 3 14:26:50 2008
@@ -88,7 +88,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( "admin-extra.html" ) );
%>
</table><P>