svn commit: r580763 - /lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java

[ry...@apache.org]

Author: ryan
Date: Sun Sep 30 11:34:38 2007
New Revision: 580763

URL: http://svn.apache.org/viewvc?rev=580763&view=rev
Log:
1. remove @deprecated servlets: /select and /update from JettySolrRunner (added in 1.3)
2. added a main() function to JettySolrRunner so you can easily debug the example setup from within eclipse

Modified:
    lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java

Modified: lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java?rev=580763&r1=580762&r2=580763&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (original)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java Sun Sep 30 11:34:38 2007
@@ -24,8 +24,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.solr.servlet.SolrDispatchFilter;
-import org.apache.solr.servlet.SolrServlet;
-import org.apache.solr.servlet.SolrUpdateServlet;
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.servlet.Context;
@@ -70,9 +68,7 @@
     
     // Initialize the servlets
     Context root = new Context( server, context, Context.SESSIONS );
-    root.addServlet( SolrServlet.class, "/select" );
-    root.addServlet( SolrUpdateServlet.class, "/update" );
-
+    
     // for some reason, there must be a servlet for this to get applied
     root.addServlet( Servlet404.class, "/*" );
     dispatchFilter = root.addFilter( SolrDispatchFilter.class, "*", Handler.REQUEST );
@@ -107,6 +103,21 @@
     public void service(HttpServletRequest req, HttpServletResponse res ) throws IOException
     {
       res.sendError( 404, "Can not find: "+req.getRequestURI() );
+    }
+  }
+  
+  /**
+   * A main class that starts jetty+solr 
+   * This is useful for debugging
+   */
+  public static void main( String[] args )
+  {
+    try {
+      JettySolrRunner jetty = new JettySolrRunner( "/solr", 3456 );
+      jetty.start();
+    }
+    catch( Exception ex ) {
+      ex.printStackTrace();
     }
   }
 }