svn commit: r817043 - in /lucene/solr/trunk/src: java/org/apache/solr/core/SolrCore.java java/org/apache/solr/core/SolrResourceLoader.java test/org/apache/solr/core/SolrCoreTest.java

[yonik]

Author: yonik
Date: Sun Sep 20 15:30:58 2009
New Revision: 817043

URL: http://svn.apache.org/viewvc?rev=817043&view=rev
Log:
revert most of SOLR-1427

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
    lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java
    lucene/solr/trunk/src/test/org/apache/solr/core/SolrCoreTest.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java?rev=817043&r1=817042&r2=817043&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java Sun Sep 20 
15:30:58 2009
@@ -574,8 +574,6 @@
       // Finally tell anyone who wants to know
       resourceLoader.inform( resourceLoader );
       resourceLoader.inform( this );
-      //register any SolrInfoMBeans
-      resourceLoader.inform(infoRegistry);
       instance = this;   // set singleton for backwards compatibility
     } catch (IOException e) {
       throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
@@ -832,11 +830,7 @@
   }
   private <T> void addIfNotPresent(Map<String ,T> registry, String name, 
Class<? extends  T> c){
     if(!registry.containsKey(name)){
-      T searchComp = (T) resourceLoader.newInstance(c.getName());
-      registry.put(name, searchComp);
-      if (searchComp instanceof SolrInfoMBean){
-        infoRegistry.put(((SolrInfoMBean)searchComp).getName(), 
(SolrInfoMBean)searchComp);
-      }
+      registry.put(name, (T) resourceLoader.newInstance(c.getName()));
     }
   }
   

Modified: 
lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=817043&r1=817042&r2=817043&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java 
(original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java Sun 
Sep 20 15:30:58 2009
@@ -68,7 +68,6 @@
   private String dataDir;
   
   private final List<SolrCoreAware> waitingForCore = new 
ArrayList<SolrCoreAware>();
-  private final List<SolrInfoMBean> infoMBeans = new 
ArrayList<SolrInfoMBean>();
   private final List<ResourceLoaderAware> waitingForResources = new 
ArrayList<ResourceLoaderAware>();
   private static final Charset UTF_8 = Charset.forName("UTF-8");
 
@@ -346,10 +345,6 @@
       assertAwareCompatibility( ResourceLoaderAware.class, obj );
       waitingForResources.add( (ResourceLoaderAware)obj );
     }
-    if (obj instanceof SolrInfoMBean){
-      //TODO: Assert here?
-      infoMBeans.add((SolrInfoMBean) obj);
-    }
     return obj;
   }
 
@@ -406,10 +401,6 @@
       assertAwareCompatibility( ResourceLoaderAware.class, obj );
       waitingForResources.add( (ResourceLoaderAware)obj );
     }
-    if (obj instanceof SolrInfoMBean){
-      //TODO: Assert here?
-      infoMBeans.add((SolrInfoMBean) obj);
-    }
     return obj;
   }
 
@@ -436,16 +427,6 @@
     }
     waitingForResources.clear();
   }
-
-  /**
-   * Register any {...@link org.apache.solr.core.SolrInfoMBean}s
-   * @param infoRegistry The Info Registry
-   */
-  public void inform(Map<String, SolrInfoMBean> infoRegistry) {
-    for (SolrInfoMBean bean : infoMBeans) {
-      infoRegistry.put(bean.getName(), bean);
-    }
-  }
   /**
    * Determines the solrhome from the environment.
    * Tries JNDI (java:comp/env/solr/home) then system property 
(solr.solr.home);
@@ -554,5 +535,4 @@
     throw new SolrException( SolrException.ErrorCode.SERVER_ERROR, 
builder.toString() );
   }
 
-
 }

Modified: lucene/solr/trunk/src/test/org/apache/solr/core/SolrCoreTest.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/core/SolrCoreTest.java?rev=817043&r1=817042&r2=817043&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/core/SolrCoreTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/core/SolrCoreTest.java Sun Sep 
20 15:30:58 2009
@@ -18,8 +18,6 @@
 package org.apache.solr.core;
 
 import org.apache.solr.handler.RequestHandlerBase;
-import org.apache.solr.handler.component.SpellCheckComponent;
-import org.apache.solr.handler.component.QueryComponent;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.request.SolrQueryResponse;
 import org.apache.solr.request.SolrRequestHandler;
@@ -166,24 +164,6 @@
     service.shutdown();
     assertTrue("Running for too long...", service.awaitTermination(60, 
TimeUnit.SECONDS));
   }
-
-  public void testInfoRegistry() throws Exception {
-    //TEst that SolrInfoMBeans are registered, including SearchComponents
-    SolrCore core = h.getCore();
-
-    Map<String, SolrInfoMBean> infoRegistry = core.getInfoRegistry();
-    assertTrue("infoRegistry Size: " + infoRegistry.size() + " is not greater 
than: " + 0, infoRegistry.size() > 0);
-    //try out some that we know are in the config
-    SolrInfoMBean bean = infoRegistry.get(SpellCheckComponent.class.getName());
-    assertNotNull("bean not registered", bean);
-    //try a default one
-    bean = infoRegistry.get(QueryComponent.class.getName());
-    assertNotNull("bean not registered", bean);
-    //try a Req Handler, which are stored by name, not clas
-    bean = infoRegistry.get("standard");
-    assertNotNull("bean not registered", bean);
-  }
-
 }