Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-22 18:27:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

make web.xml more standard, comment out resin fixes, SOLR->Solr, remove solar-status

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/incubator/solr/trunk@382528 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2006-03-02 22:02:18 +00:00
parent acd34ce844
commit 63b402d2b3
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/webapp/WEB-INF/web.xml
View File

@ -1,30 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Tomcat fails if it can't find the DTD
<!--
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN
" "http://java.sun.com/dtd/web-app_2_3.dtd" [
<!ENTITY web.external.xml SYSTEM "../../../conf/solar/WEB-INF/web.external.xml">
<!ENTITY web.external.xml SYSTEM "../../../conf/web.external.xml">
]>
-->
<web-app>
<!-- resin specific way to add to the webapps classpath -->
<classpath id="../../conf/solar/WEB-INF/classes" />
<classpath id="../../conf/solar/WEB-INF/lib" library-dir="true" />
<!-- Use the default JDK5 XML implementation...
Resin3 has some missing/incompatible xpath features. -->
<!-- Uncomment if you are trying to use Resin. Their XML implementation
isn't entirely comatible with Xerces. Below are the implementations to use
with Sun's JVM.
<system-property javax.xml.xpath.XPathFactory=
"com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl"/>
<system-property javax.xml.parsers.DocumentBuilderFactory=
"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"/>
<system-property javax.xml.parsers.SAXParserFactory=
"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl"/>
-->
<servlet>
<servlet-name>SolrServer</servlet-name>
<display-name>SOLR</display-name>
<description>SOLR Server</description>
<display-name>Solr</display-name>
<description>Solr Server</description>
<servlet-class>org.apache.solr.servlet.SolrServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
@ -37,15 +34,6 @@
<url-pattern>/update/*</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>solar-status</servlet-name>
<jsp-file>/admin/solar-status.jsp</jsp-file>
</servlet>
<servlet-mapping>
<servlet-name>solar-status</servlet-name>
<url-pattern>/admin/solar-status</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ping</servlet-name>
<jsp-file>/admin/ping.jsp</jsp-file>
@ -55,7 +43,7 @@
<url-pattern>/admin/ping</url-pattern>
</servlet-mapping>
<!-- doesn't seem to work with tomcat
<!-- use this to include your own extensions to web.xml
&web.external.xml;
-->