svn commit: r552198 - in /lucene/solr/trunk: example/solr/conf/ src/java/org/apache/solr/handler/ src/test/org/apache/solr/handler/

[ry...@apache.org]

Author: ryan
Date: Sat Jun 30 11:52:16 2007
New Revision: 552198

URL: http://svn.apache.org/viewvc?view=rev&rev=552198
Log:
SOLR-133 -- moving stax implementation to XmlUpdateRequestHandler.  Remove the stax derived tests.

Added:
    lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
      - copied, changed from r552197, lucene/solr/trunk/src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java
Removed:
    lucene/solr/trunk/src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java
    lucene/solr/trunk/src/test/org/apache/solr/handler/TestStaxUpdateHandler1.java
    lucene/solr/trunk/src/test/org/apache/solr/handler/TestStaxUpdateHandler2.java
    lucene/solr/trunk/src/test/org/apache/solr/handler/TestStaxUpdateHandler3.java
Modified:
    lucene/solr/trunk/example/solr/conf/solrconfig.xml
    lucene/solr/trunk/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java

Modified: lucene/solr/trunk/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/solr/conf/solrconfig.xml?view=diff&rev=552198&r1=552197&r2=552198
==============================================================================
--- lucene/solr/trunk/example/solr/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/example/solr/conf/solrconfig.xml Sat Jun 30 11:52:16 2007
@@ -404,12 +404,13 @@
        "update.processor.class" is the class name for the UpdateRequestProcessor.  It is initalized
        only once.  This can not be changed for each request.
     -->
-  <requestHandler name="/update/stax" class="solr.StaxUpdateRequestHandler" >
+  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" >
     <!--
     <str name="update.processor.class">org.apache.solr.handler.UpdateRequestProcessor</str>
     -->
   </requestHandler>
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
+  <!-- this will be removed before solr 1.3 -->
+  <requestHandler name="/update/xpp" class="solr.XppUpdateRequestHandler" />
 
   <!-- CSV update handler, loaded on demand -->
   <requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy" />

Copied: lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (from r552197, lucene/solr/trunk/src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java?view=diff&rev=552198&p1=lucene/solr/trunk/src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java&r1=552197&p2=lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java&r2=552198
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/StaxUpdateRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java Sat Jun 30 11:52:16 2007
@@ -62,9 +62,9 @@
  *    </lst> 
  *  </requestHandler>
  */
-public class StaxUpdateRequestHandler extends XmlUpdateRequestHandler
+public class XmlUpdateRequestHandler extends RequestHandlerBase
 {
-  public static Logger log = Logger.getLogger(StaxUpdateRequestHandler.class.getName());
+  public static Logger log = Logger.getLogger(XmlUpdateRequestHandler.class.getName());
 
   public static final String UPDATE_PROCESSOR_FACTORY = "update.processor.factory";
   public static final String UPDATE_PROCESSOR_ARGS    = "update.processor.args";

Modified: lucene/solr/trunk/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java?view=diff&rev=552198&r1=552197&r2=552198
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java Sat Jun 30 11:52:16 2007
@@ -15,7 +15,7 @@
 public class XmlUpdateRequestHandlerTest extends TestCase 
 {
   private XMLInputFactory inputFactory = BaseXMLInputFactory.newInstance();
-  protected StaxUpdateRequestHandler handler = new StaxUpdateRequestHandler();
+  protected XmlUpdateRequestHandler handler = new XmlUpdateRequestHandler();
 
   @Override 
   public void setUp() throws Exception {