You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2015/07/13 01:50:27 UTC

svn commit: r1690554 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/core/CoreContainer.java

Author: anshum
Date: Sun Jul 12 23:50:27 2015
New Revision: 1690554

URL: http://svn.apache.org/r1690554
Log:
SOLR-7703: Authentication plugin is now loaded using the RessourceLoader (merge from trunk)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/CoreContainer.java

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1690554&r1=1690553&r2=1690554&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Sun Jul 12 23:50:27 2015
@@ -266,6 +266,9 @@ Other Changes
 * SOLR-7750: Change TestConfig.testDefaults to cover all SolrIndexConfig fields
   (Christine Poerschke via Ramkumar Aiyengar)
 
+* SOLR-7703: Authentication plugin is now loaded using the RessourceLoader.
+  (Avi Digmi via Anshum Gupta)
+
 ==================  5.2.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1690554&r1=1690553&r2=1690554&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/CoreContainer.java Sun Jul 12 23:50:27 2015
@@ -259,12 +259,7 @@ public class CoreContainer {
 
     // Initialize the filter
     if (pluginClassName != null) {
-      try {
-        Class cl = Class.forName(pluginClassName);
-        authenticationPlugin = (AuthenticationPlugin) cl.newInstance();
-      } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
-        throw new SolrException(ErrorCode.SERVER_ERROR, e);
-      }
+      authenticationPlugin = getResourceLoader().newInstance(pluginClassName, AuthenticationPlugin.class);
     }
     if (authenticationPlugin != null) {
       authenticationPlugin.init(authenticationConfig);