lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r1054016 - in /lucene/dev/trunk/solr/src/webapp: src/org/apache/solr/servlet/ web/WEB-INF/ web/admin/
Date Thu, 30 Dec 2010 22:58:47 GMT
Author: yonik
Date: Thu Dec 30 22:58:46 2010
New Revision: 1054016

URL: http://svn.apache.org/viewvc?rev=1054016&view=rev
Log:
SOLR-1930: remove solr servlet

Removed:
    lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
    lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/SolrServletRequest.java
    lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java
Modified:
    lucene/dev/trunk/solr/src/webapp/web/WEB-INF/web.xml
    lucene/dev/trunk/solr/src/webapp/web/admin/registry.jsp
    lucene/dev/trunk/solr/src/webapp/web/admin/stats.jsp

Modified: lucene/dev/trunk/solr/src/webapp/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/webapp/web/WEB-INF/web.xml?rev=1054016&r1=1054015&r2=1054016&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/webapp/web/WEB-INF/web.xml (original)
+++ lucene/dev/trunk/solr/src/webapp/web/WEB-INF/web.xml Thu Dec 30 22:58:46 2010
@@ -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/trunk/solr/src/webapp/web/admin/registry.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/webapp/web/admin/registry.jsp?rev=1054016&r1=1054015&r2=1054016&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/webapp/web/admin/registry.jsp (original)
+++ lucene/dev/trunk/solr/src/webapp/web/admin/registry.jsp Thu Dec 30 22:58:46 2010
@@ -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/trunk/solr/src/webapp/web/admin/stats.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/webapp/web/admin/stats.jsp?rev=1054016&r1=1054015&r2=1054016&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/webapp/web/admin/stats.jsp (original)
+++ lucene/dev/trunk/solr/src/webapp/web/admin/stats.jsp Thu Dec 30 22:58:46 2010
@@ -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"%>



Mime
View raw message