svn commit: r1041093 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi: ServiceProviderFinderFactory.java impl/DefaultServiceLoaderFinder.java impl/DefaultServiceProviderFinder.java

[lu...@apache.org]

Author: lu4242
Date: Wed Dec  1 17:18:56 2010
New Revision: 1041093

URL: http://svn.apache.org/viewvc?rev=1041093&view=rev
Log:
MYFACES-2986 Provide an interface to override how to find spi interfaces (change ServiceLoaderFinder name to ServiceProviderFinder)

Added:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java
      - copied, changed from r1041077, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceLoaderFinder.java
Removed:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceLoaderFinder.java
Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java?rev=1041093&r1=1041092&r2=1041093&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java Wed Dec  1 17:18:56 2010
@@ -24,7 +24,7 @@ import javax.servlet.ServletContext;
 
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
 import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.spi.impl.DefaultServiceLoaderFinder;
+import org.apache.myfaces.spi.impl.DefaultServiceProviderFinder;
 
 /**
  * 
@@ -35,10 +35,10 @@ import org.apache.myfaces.spi.impl.Defau
 public class ServiceProviderFinderFactory
 {
 
-    private final static String SERVICE_LOADER_KEY = "org.apache.myfaces.spi.ServiceLoaderFinder";
+    private final static String SERVICE_PROVIDER_KEY = "org.apache.myfaces.spi.ServiceProviderFinder";
     
-    @JSFWebConfigParam(since = "2.0.3", desc = "Class name of a custom ServiceLoaderFinder implementation.")
-    private static final String SERVICE_LOADER_FINDER_PARAM = "org.apache.myfaces.SERVICE_LOADER_FINDER";
+    @JSFWebConfigParam(since = "2.0.3", desc = "Class name of a custom ServiceProviderFinder implementation.")
+    private static final String SERVICE_PROVIDER_FINDER_PARAM = "org.apache.myfaces.SERVICE_PROVIDER_FINDER";
     
 
     /**
@@ -48,13 +48,13 @@ public class ServiceProviderFinderFactor
      */
     public static ServiceProviderFinder getServiceLoaderFinder(ExternalContext ectx)
     {
-        ServiceProviderFinder slp = (ServiceProviderFinder) ectx.getApplicationMap().get(SERVICE_LOADER_KEY);
+        ServiceProviderFinder slp = (ServiceProviderFinder) ectx.getApplicationMap().get(SERVICE_PROVIDER_KEY);
         if (slp == null)
         {
             slp = _getServiceLoaderFinderFromInitParam(ectx);
             if (slp == null)
             {
-                slp = new DefaultServiceLoaderFinder();
+                slp = new DefaultServiceProviderFinder();
                 setServiceLoaderFinder(ectx, slp);
             }
         }
@@ -75,12 +75,12 @@ public class ServiceProviderFinderFactor
      */
     public static void setServiceLoaderFinder(ExternalContext ectx, ServiceProviderFinder slp)
     {
-        ectx.getApplicationMap().put(SERVICE_LOADER_KEY, slp);
+        ectx.getApplicationMap().put(SERVICE_PROVIDER_KEY, slp);
     }
     
     public static void setServiceLoaderFinder(ServletContext ctx, ServiceProviderFinder slp)
     {
-        ctx.setAttribute(SERVICE_LOADER_KEY, slp);
+        ctx.setAttribute(SERVICE_PROVIDER_KEY, slp);
     }
 
     /**
@@ -90,7 +90,7 @@ public class ServiceProviderFinderFactor
      */
     private static ServiceProviderFinder _getServiceLoaderFinderFromInitParam(ExternalContext context)
     {
-        String initializerClassName = context.getInitParameter(SERVICE_LOADER_FINDER_PARAM);
+        String initializerClassName = context.getInitParameter(SERVICE_PROVIDER_FINDER_PARAM);
         if (initializerClassName != null)
         {
             try

Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java (from r1041077, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceLoaderFinder.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceLoaderFinder.java&r1=1041077&r2=1041093&rev=1041093&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceLoaderFinder.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceProviderFinder.java Wed Dec  1 17:18:56 2010
@@ -40,7 +40,7 @@ import org.apache.myfaces.spi.ServicePro
  * @since 2.0.3
  *
  */
-public class DefaultServiceLoaderFinder extends ServiceProviderFinder
+public class DefaultServiceProviderFinder extends ServiceProviderFinder
 {
     private static final String META_INF_SERVICES = "META-INF/services/";