You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2008/10/27 19:21:56 UTC

svn commit: r708266 - in /lucene/solr/trunk: CHANGES.txt client/java/solrj/src/org/apache/solr/client/solrj/request/CoreAdminRequest.java

Author: ryan
Date: Mon Oct 27 11:21:56 2008
New Revision: 708266

URL: http://svn.apache.org/viewvc?rev=708266&view=rev
Log:
SOLR-803: fix CoreAdminRequest.createCore error

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/CoreAdminRequest.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=708266&r1=708265&r2=708266&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Mon Oct 27 11:21:56 2008
@@ -96,6 +96,8 @@
 
  4. SOLR-805: DisMax queries are not being cached in QueryResultCache (Todd Feak via koji)
 
+ 5. SOLR-803: CoreAdminRequest.createCore fails because name parameter isn't set (Sean Colombo via ryan)
+ 
 
 Other Changes
 ----------------------

Modified: lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/CoreAdminRequest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/CoreAdminRequest.java?rev=708266&r1=708265&r2=708266&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/CoreAdminRequest.java (original)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/request/CoreAdminRequest.java Mon Oct 27 11:21:56 2008
@@ -66,7 +66,7 @@
       }
       ModifiableSolrParams params = new ModifiableSolrParams();
       params.set( CoreAdminParams.ACTION, action.toString() );
-      params.set( CoreAdminParams.CORE, core );
+      params.set( CoreAdminParams.NAME, core );
       params.set( CoreAdminParams.INSTANCE_DIR, instanceDir);
       if (configName != null) {
         params.set( CoreAdminParams.CONFIG, configName);
@@ -220,12 +220,23 @@
   
   public static CoreAdminResponse createCore( String name, String instanceDir, SolrServer server ) throws SolrServerException, IOException 
   {
+    return CoreAdminRequest.createCore(name, instanceDir, server, null, null);
+  }
+  
+  public static CoreAdminResponse createCore( String name, String instanceDir, SolrServer server, String configFile, String schemaFile ) throws SolrServerException, IOException 
+  {
     CoreAdminRequest.Create req = new CoreAdminRequest.Create();
     req.setCoreName( name );
     req.setInstanceDir(instanceDir);
+    if(configFile != null){
+      req.setConfigName(configFile);
+    }
+    if(schemaFile != null){
+      req.setSchemaName(schemaFile);
+    }
     return req.process( server );
   }
-    
+
   public static CoreAdminResponse persist(String fileName, SolrServer server) throws SolrServerException, IOException 
   {
     CoreAdminRequest.Persist req = new CoreAdminRequest.Persist();
@@ -233,4 +244,3 @@
     return req.process(server);
   }
 }
-