Re: svn commit: r685577 - in /lucene/solr/trunk: client/java/solrj/src/org/apache/solr/client/solrj/embedded/ client/java/solrj/test/org/apache/solr/client/solrj/ client/java/solrj/test/org/apache/sol

2008-08-14 Thread Ryan McKinley 

thanks grant -- just committed a slightly different one :)


On Aug 14, 2008, at 9:06 PM, Grant Ingersoll wrote:


Here's a _possible_ patch:

Index: src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
===
--- src/webapp/src/org/apache/solr/servlet/ 
SolrDispatchFilter.java  (revision 686097)
+++ src/webapp/src/org/apache/solr/servlet/ 
SolrDispatchFilter.java  (working copy)

@@ -64,7 +64,9 @@
try {
  // web.xml configuration
  init.setPathPrefix(config.getInitParameter( "path-prefix" ));
+  this.pathPrefix = init.getPathPrefix();
  init.setSolrConfigFilename(config.getInitParameter("solrconfig- 
filename"));

+  this.solrConfigFilename = init.getSolrConfigFilename();

  this.cores = init.initialize();
  abortOnConfigurationError = init.isAbortOnConfigurationError();


-Grant


On Aug 14, 2008, at 8:56 PM, Grant Ingersoll wrote:


Hey Ryan,

Something's messed up with this commit in regards to the  
SolrDispatchFilter.  It appears the pathPrefix is no longer being  
set.  It gets set on the CoreContainer.Initializer(), but then the  
code later checks to see if the SolrDispatchFilter.pathPrefix is  
set and the path prefix on the init is ignored (not that it could  
use it, since it is out of scope anyway).


Not sure how you want to handle setting the pathPrefix in the SDF.   
It's easy enough to do, just not sure on the relation between the  
Initializer and the member variables in SDF.


-Grant

On Aug 13, 2008, at 10:57 AM, [EMAIL PROTECTED] wrote:


Author: ryan
Date: Wed Aug 13 07:57:20 2008
New Revision: 685577

URL: http://svn.apache.org/viewvc?rev=685577&view=rev
Log:
SOLR-695 -- refactoring MultiCore to CoreContainer

Added:
 lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
   - copied, changed from r685549, lucene/solr/trunk/src/java/org/ 
apache/solr/core/MultiCore.java
 lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ 
CoreAdminHandler.java
   - copied, changed from r685549, lucene/solr/trunk/src/java/org/ 
apache/solr/handler/admin/MultiCoreHandler.java

Removed:
 lucene/solr/trunk/src/java/org/apache/solr/core/MultiCore.java
 lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ 
MultiCoreHandler.java

Modified:
 lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/ 
solrj/embedded/EmbeddedSolrServer.java
 lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/ 
solrj/MultiCoreExampleTestBase.java
 lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/ 
solrj/embedded/JettyWebappTest.java

 lucene/solr/trunk/example/solr/conf/schema.xml
 lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java
 lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
 lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/ 
SolrDispatchFilter.java

 lucene/solr/trunk/src/webapp/web/admin/index.jsp
 lucene/solr/trunk/src/webapp/web/index.jsp

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

URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java?rev=685577&r1=685576&r2=685577&view=diff
= 
= 
= 
= 
= 
= 
= 
= 
= 
= 

--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/ 
solrj/embedded/EmbeddedSolrServer.java (original)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/ 
solrj/embedded/EmbeddedSolrServer.java Wed Aug 13 07:57:20 2008

@@ -34,7 +34,7 @@
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.MultiCore;
+import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.BinaryResponseWriter;
import org.apache.solr.request.QueryResponseWriter;
@@ -55,9 +55,9 @@
public class EmbeddedSolrServer extends SolrServer
{

-  protected final MultiCore multicore; // either multicore
+  protected final CoreContainer multicore; // either multicore
protected final SolrCore core; // or single core
-  protected final String coreName;  // use MultiCore registry
+  protected final String coreName;  // use CoreContainer registry

private final SolrRequestParsers _parser;

@@ -73,10 +73,10 @@
  _parser = new SolrRequestParsers( null );
}

-  public EmbeddedSolrServer(  MultiCore multicore, String  
coreName )
+  public EmbeddedSolrServer(  CoreContainer multicore, String  
coreName )

{
  if ( multicore == null ) {
-  throw new NullPointerException("MultiCore instance  
required");
+  throw new NullPointerException("CoreContainer instance  
required");

  }
  this.core = null;
  this.multicore = multicore;

Modified: lucene/solr/trunk/client/java/solrj/test/org/apache/solr/ 
client/solrj/MultiCoreExampleTe

Re: svn commit: r685577 - in /lucene/solr/trunk: client/java/solrj/src/org/apache/solr/client/solrj/embedded/ client/java/solrj/test/org/apache/solr/client/solrj/ client/java/solrj/test/org/apache/sol

2008-08-14 Thread Grant Ingersoll 

Here's a _possible_ patch:

Index: src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
===
--- src/webapp/src/org/apache/solr/servlet/ 
SolrDispatchFilter.java  (revision 686097)
+++ src/webapp/src/org/apache/solr/servlet/ 
SolrDispatchFilter.java  (working copy)

@@ -64,7 +64,9 @@
 try {
   // web.xml configuration
   init.setPathPrefix(config.getInitParameter( "path-prefix" ));
+  this.pathPrefix = init.getPathPrefix();
   init.setSolrConfigFilename(config.getInitParameter("solrconfig- 
filename"));

+  this.solrConfigFilename = init.getSolrConfigFilename();

   this.cores = init.initialize();
   abortOnConfigurationError = init.isAbortOnConfigurationError();


-Grant


On Aug 14, 2008, at 8:56 PM, Grant Ingersoll wrote:


Hey Ryan,

Something's messed up with this commit in regards to the  
SolrDispatchFilter.  It appears the pathPrefix is no longer being  
set.  It gets set on the CoreContainer.Initializer(), but then the  
code later checks to see if the SolrDispatchFilter.pathPrefix is set  
and the path prefix on the init is ignored (not that it could use  
it, since it is out of scope anyway).


Not sure how you want to handle setting the pathPrefix in the SDF.   
It's easy enough to do, just not sure on the relation between the  
Initializer and the member variables in SDF.


-Grant

On Aug 13, 2008, at 10:57 AM, [EMAIL PROTECTED] wrote:


Author: ryan
Date: Wed Aug 13 07:57:20 2008
New Revision: 685577

URL: http://svn.apache.org/viewvc?rev=685577&view=rev
Log:
SOLR-695 -- refactoring MultiCore to CoreContainer

Added:
  lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
- copied, changed from r685549, lucene/solr/trunk/src/java/org/ 
apache/solr/core/MultiCore.java
  lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ 
CoreAdminHandler.java
- copied, changed from r685549, lucene/solr/trunk/src/java/org/ 
apache/solr/handler/admin/MultiCoreHandler.java

Removed:
  lucene/solr/trunk/src/java/org/apache/solr/core/MultiCore.java
  lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ 
MultiCoreHandler.java

Modified:
  lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/ 
solrj/embedded/EmbeddedSolrServer.java
  lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/ 
solrj/MultiCoreExampleTestBase.java
  lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/ 
solrj/embedded/JettyWebappTest.java

  lucene/solr/trunk/example/solr/conf/schema.xml
  lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java
  lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
  lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/ 
SolrDispatchFilter.java

  lucene/solr/trunk/src/webapp/web/admin/index.jsp
  lucene/solr/trunk/src/webapp/web/index.jsp

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

URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java?rev=685577&r1=685576&r2=685577&view=diff
= 
= 
= 
= 
= 
= 
= 
= 
= 
=
--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/ 
solrj/embedded/EmbeddedSolrServer.java (original)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/ 
solrj/embedded/EmbeddedSolrServer.java Wed Aug 13 07:57:20 2008

@@ -34,7 +34,7 @@
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.MultiCore;
+import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.BinaryResponseWriter;
import org.apache.solr.request.QueryResponseWriter;
@@ -55,9 +55,9 @@
public class EmbeddedSolrServer extends SolrServer
{

-  protected final MultiCore multicore; // either multicore
+  protected final CoreContainer multicore; // either multicore
 protected final SolrCore core; // or single core
-  protected final String coreName;  // use MultiCore registry
+  protected final String coreName;  // use CoreContainer registry

 private final SolrRequestParsers _parser;

@@ -73,10 +73,10 @@
   _parser = new SolrRequestParsers( null );
 }

-  public EmbeddedSolrServer(  MultiCore multicore, String coreName )
+  public EmbeddedSolrServer(  CoreContainer multicore, String  
coreName )

 {
   if ( multicore == null ) {
-  throw new NullPointerException("MultiCore instance required");
+  throw new NullPointerException("CoreContainer instance  
required");

   }
   this.core = null;
   this.multicore = multicore;

Modified: lucene/solr/trunk/client/java/solrj/test/org/apache/solr/ 
client/solrj/MultiCoreExampleTestBase.java

URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/test/or

Re: svn commit: r685577 - in /lucene/solr/trunk: client/java/solrj/src/org/apache/solr/client/solrj/embedded/ client/java/solrj/test/org/apache/solr/client/solrj/ client/java/solrj/test/org/apache/sol

2008-08-14 Thread Grant Ingersoll 

Hey Ryan,

Something's messed up with this commit in regards to the  
SolrDispatchFilter.  It appears the pathPrefix is no longer being  
set.  It gets set on the CoreContainer.Initializer(), but then the  
code later checks to see if the SolrDispatchFilter.pathPrefix is set  
and the path prefix on the init is ignored (not that it could use it,  
since it is out of scope anyway).


Not sure how you want to handle setting the pathPrefix in the SDF.   
It's easy enough to do, just not sure on the relation between the  
Initializer and the member variables in SDF.


-Grant

On Aug 13, 2008, at 10:57 AM, [EMAIL PROTECTED] wrote:


Author: ryan
Date: Wed Aug 13 07:57:20 2008
New Revision: 685577

URL: http://svn.apache.org/viewvc?rev=685577&view=rev
Log:
SOLR-695 -- refactoring MultiCore to CoreContainer

Added:
   lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
 - copied, changed from r685549, lucene/solr/trunk/src/java/org/ 
apache/solr/core/MultiCore.java
   lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ 
CoreAdminHandler.java
 - copied, changed from r685549, lucene/solr/trunk/src/java/org/ 
apache/solr/handler/admin/MultiCoreHandler.java

Removed:
   lucene/solr/trunk/src/java/org/apache/solr/core/MultiCore.java
   lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ 
MultiCoreHandler.java

Modified:
   lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/ 
solrj/embedded/EmbeddedSolrServer.java
   lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/ 
solrj/MultiCoreExampleTestBase.java
   lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/ 
solrj/embedded/JettyWebappTest.java

   lucene/solr/trunk/example/solr/conf/schema.xml
   lucene/solr/trunk/src/java/org/apache/solr/core/CoreDescriptor.java
   lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
   lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/ 
SolrDispatchFilter.java

   lucene/solr/trunk/src/webapp/web/admin/index.jsp
   lucene/solr/trunk/src/webapp/web/index.jsp

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

URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java?rev=685577&r1=685576&r2=685577&view=diff
= 
= 
= 
= 
= 
= 
= 
= 
==
--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/ 
solrj/embedded/EmbeddedSolrServer.java (original)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/ 
solrj/embedded/EmbeddedSolrServer.java Wed Aug 13 07:57:20 2008

@@ -34,7 +34,7 @@
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.MultiCore;
+import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.BinaryResponseWriter;
import org.apache.solr.request.QueryResponseWriter;
@@ -55,9 +55,9 @@
public class EmbeddedSolrServer extends SolrServer
{

-  protected final MultiCore multicore; // either multicore
+  protected final CoreContainer multicore; // either multicore
  protected final SolrCore core; // or single core
-  protected final String coreName;  // use MultiCore registry
+  protected final String coreName;  // use CoreContainer registry

  private final SolrRequestParsers _parser;

@@ -73,10 +73,10 @@
_parser = new SolrRequestParsers( null );
  }

-  public EmbeddedSolrServer(  MultiCore multicore, String coreName )
+  public EmbeddedSolrServer(  CoreContainer multicore, String  
coreName )

  {
if ( multicore == null ) {
-  throw new NullPointerException("MultiCore instance required");
+  throw new NullPointerException("CoreContainer instance  
required");

}
this.core = null;
this.multicore = multicore;

Modified: lucene/solr/trunk/client/java/solrj/test/org/apache/solr/ 
client/solrj/MultiCoreExampleTestBase.java

URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java?rev=685577&r1=685576&r2=685577&view=diff
= 
= 
= 
= 
= 
= 
= 
= 
==
--- lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/ 
solrj/MultiCoreExampleTestBase.java (original)
+++ lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/ 
solrj/MultiCoreExampleTestBase.java Wed Aug 13 07:57:20 2008

@@ -25,7 +25,7 @@
import org.apache.solr.client.solrj.request.UpdateRequest.ACTION;
import org.apache.solr.client.solrj.response.MultiCoreResponse;
import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.core.MultiCore;
+import org.apache.solr.core.CoreContainer;


/**
@@ -34,7 +34,7 @@
 */
public abstract class MultiCoreExampleTestBase extends  
SolrExampleTestBase