svn commit: r389456 - /lucene/nutch/trunk/build.xml

[jerome]

Author: jerome
Date: Tue Mar 28 01:40:29 2006
New Revision: 389456

URL: http://svn.apache.org/viewcvs?rev=389456view=rev
Log:
NUTCH-210, forgot to commit the nutch.xml xsl generation

Modified:
lucene/nutch/trunk/build.xml

Modified: lucene/nutch/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/build.xml?rev=389456r1=389455r2=389456view=diff
==
--- lucene/nutch/trunk/build.xml (original)
+++ lucene/nutch/trunk/build.xml Tue Mar 28 01:40:29 2006
@@ -144,6 +144,14 @@
   !----
   !-- == --
   target name=war depends=jar,compile,generate-docs
+
+!-- generate the nutch.xml (servlet context) file --
+xslt in=${basedir}/conf/nutch-default.xml
+  out=${build.dir}/nutch.xml
+  style=${basedir}/conf/context.xsl
+xmlcatalog refid=docDTDs/
+   outputproperty name=indent value=yes/
+/xslt
 war destfile=${build.dir}/${final.name}.war
 webxml=${web.src.dir}/web.xml
   fileset dir=${web.src.dir}/jsp/

svn commit: r389514 - /lucene/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java

[jerome]

Author: jerome
Date: Tue Mar 28 06:56:21 2006
New Revision: 389514

URL: http://svn.apache.org/viewcvs?rev=389514view=rev
Log:
NUTCH-210, make use of nutch.xml servlet context in opensearch servlet too

Modified:
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java

Modified: 
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java?rev=389514r1=389513r2=389514view=diff
==
--- 
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java 
(original)
+++ 
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/OpenSearchServlet.java 
Tue Mar 28 06:56:21 2006
@@ -62,7 +62,7 @@
 
   public void init(ServletConfig config) throws ServletException {
 try {
-  this.conf = NutchConfiguration.create();
+  this.conf = NutchConfiguration.get(config.getServletContext());
   bean = NutchBean.get(config.getServletContext(), this.conf);
 } catch (IOException e) {
   throw new ServletException(e);