You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/12/01 17:52:22 UTC
svn commit: r1041077 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: config/
config/annotation/ spi/ spi/impl/
Author: lu4242
Date: Wed Dec 1 16:52:22 2010
New Revision: 1041077
URL: http://svn.apache.org/viewvc?rev=1041077&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/ServiceProviderFinder.java
- copied, changed from r1041070, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceLoaderFinder.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java
- copied, changed from r1041070, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceLoaderFinderFactory.java
Removed:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceLoaderFinder.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceLoaderFinderFactory.java
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultServiceLoaderFinder.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java?rev=1041077&r1=1041076&r2=1041077&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java Wed Dec 1 16:52:22 2010
@@ -59,7 +59,7 @@ import org.apache.myfaces.shared_impl.ut
import org.apache.myfaces.spi.FacesConfigResourceProvider;
import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
import org.apache.myfaces.spi.FacesConfigurationProvider;
-import org.apache.myfaces.spi.ServiceLoaderFinderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
import org.xml.sax.SAXException;
/**
@@ -205,7 +205,7 @@ public class DefaultFacesConfigurationPr
for (String factoryName : FACTORY_NAMES)
{
- List<String> classList = ServiceLoaderFinderFactory.getServiceLoaderFinder(ectx).getServiceProviderList(factoryName);
+ List<String> classList = ServiceProviderFinderFactory.getServiceLoaderFinder(ectx).getServiceProviderList(factoryName);
for (String className : classList)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java?rev=1041077&r1=1041076&r2=1041077&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java Wed Dec 1 16:52:22 2010
@@ -35,7 +35,7 @@ import javax.naming.NamingException;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.spi.ServiceLoaderFinderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
/*
* Date: Mar 12, 2007
@@ -156,7 +156,7 @@ public class DefaultLifecycleProviderFac
InvocationTargetException,
PrivilegedActionException
{
- List<String> classList = ServiceLoaderFinderFactory.getServiceLoaderFinder(extContext).getServiceProviderList(LIFECYCLE_PROVIDER);
+ List<String> classList = ServiceProviderFinderFactory.getServiceLoaderFinder(extContext).getServiceProviderList(LIFECYCLE_PROVIDER);
Iterator<String> iter = classList.iterator();
while (iter.hasNext())
{
@@ -178,7 +178,7 @@ public class DefaultLifecycleProviderFac
}
else
{
- List<String> classList = ServiceLoaderFinderFactory.getServiceLoaderFinder(extContext).getServiceProviderList(LIFECYCLE_PROVIDER);
+ List<String> classList = ServiceProviderFinderFactory.getServiceLoaderFinder(extContext).getServiceProviderList(LIFECYCLE_PROVIDER);
Iterator<String> iter = classList.iterator();
while (iter.hasNext())
{
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinder.java (from r1041070, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceLoaderFinder.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinder.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinder.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceLoaderFinder.java&r1=1041070&r2=1041077&rev=1041077&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceLoaderFinder.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinder.java Wed Dec 1 16:52:22 2010
@@ -31,7 +31,7 @@ import java.util.List;
* @since 2.0.3
*
*/
-public abstract class ServiceLoaderFinder
+public abstract class ServiceProviderFinder
{
/**
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java (from r1041070, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceLoaderFinderFactory.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceLoaderFinderFactory.java&r1=1041070&r2=1041077&rev=1041077&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceLoaderFinderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/ServiceProviderFinderFactory.java Wed Dec 1 16:52:22 2010
@@ -32,7 +32,7 @@ import org.apache.myfaces.spi.impl.Defau
* @since 2.0.3
*
*/
-public class ServiceLoaderFinderFactory
+public class ServiceProviderFinderFactory
{
private final static String SERVICE_LOADER_KEY = "org.apache.myfaces.spi.ServiceLoaderFinder";
@@ -46,9 +46,9 @@ public class ServiceLoaderFinderFactory
* @param ectx
* @return
*/
- public static ServiceLoaderFinder getServiceLoaderFinder(ExternalContext ectx)
+ public static ServiceProviderFinder getServiceLoaderFinder(ExternalContext ectx)
{
- ServiceLoaderFinder slp = (ServiceLoaderFinder) ectx.getApplicationMap().get(SERVICE_LOADER_KEY);
+ ServiceProviderFinder slp = (ServiceProviderFinder) ectx.getApplicationMap().get(SERVICE_LOADER_KEY);
if (slp == null)
{
slp = _getServiceLoaderFinderFromInitParam(ectx);
@@ -73,12 +73,12 @@ public class ServiceLoaderFinderFactory
* @param ectx
* @param slp
*/
- public static void setServiceLoaderFinder(ExternalContext ectx, ServiceLoaderFinder slp)
+ public static void setServiceLoaderFinder(ExternalContext ectx, ServiceProviderFinder slp)
{
ectx.getApplicationMap().put(SERVICE_LOADER_KEY, slp);
}
- public static void setServiceLoaderFinder(ServletContext ctx, ServiceLoaderFinder slp)
+ public static void setServiceLoaderFinder(ServletContext ctx, ServiceProviderFinder slp)
{
ctx.setAttribute(SERVICE_LOADER_KEY, slp);
}
@@ -88,7 +88,7 @@ public class ServiceLoaderFinderFactory
* @param context
* @return
*/
- private static ServiceLoaderFinder _getServiceLoaderFinderFromInitParam(ExternalContext context)
+ private static ServiceProviderFinder _getServiceLoaderFinderFromInitParam(ExternalContext context)
{
String initializerClassName = context.getInitParameter(SERVICE_LOADER_FINDER_PARAM);
if (initializerClassName != null)
@@ -97,14 +97,14 @@ public class ServiceLoaderFinderFactory
{
// get Class object
Class<?> clazz = ClassUtils.classForName(initializerClassName);
- if (!ServiceLoaderFinder.class.isAssignableFrom(clazz))
+ if (!ServiceProviderFinder.class.isAssignableFrom(clazz))
{
throw new FacesException("Class " + clazz
+ " does not implement FacesInitializer");
}
// create instance and return it
- return (ServiceLoaderFinder) ClassUtils.newInstance(clazz);
+ return (ServiceProviderFinder) ClassUtils.newInstance(clazz);
}
catch (ClassNotFoundException cnfe)
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java?rev=1041077&r1=1041076&r2=1041077&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultAnnotationProviderFactory.java Wed Dec 1 16:52:22 2010
@@ -31,7 +31,7 @@ import javax.faces.context.ExternalConte
import org.apache.myfaces.config.annotation.DefaultAnnotationProvider;
import org.apache.myfaces.spi.AnnotationProvider;
import org.apache.myfaces.spi.AnnotationProviderFactory;
-import org.apache.myfaces.spi.ServiceLoaderFinderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
/**
*
@@ -115,7 +115,7 @@ public class DefaultAnnotationProviderFa
List<String> classList = (List<String>) externalContext.getApplicationMap().get(ANNOTATION_PROVIDER_LIST);
if (classList == null)
{
- classList = ServiceLoaderFinderFactory.getServiceLoaderFinder(externalContext).getServiceProviderList(ANNOTATION_PROVIDER);
+ classList = ServiceProviderFinderFactory.getServiceLoaderFinder(externalContext).getServiceProviderList(ANNOTATION_PROVIDER);
externalContext.getApplicationMap().put(ANNOTATION_PROVIDER_LIST, classList);
}
return SpiUtils.buildApplicationObject(externalContext, AnnotationProvider.class, classList, new DefaultAnnotationProvider());
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java?rev=1041077&r1=1041076&r2=1041077&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFaceletConfigResourceProviderFactory.java Wed Dec 1 16:52:22 2010
@@ -30,7 +30,7 @@ import javax.faces.context.ExternalConte
import org.apache.myfaces.spi.FaceletConfigResourceProvider;
import org.apache.myfaces.spi.FaceletConfigResourceProviderFactory;
-import org.apache.myfaces.spi.ServiceLoaderFinderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
import org.apache.myfaces.view.facelets.compiler.DefaultFaceletConfigResourceProvider;
/**
@@ -115,7 +115,7 @@ public class DefaultFaceletConfigResourc
List<String> classList = (List<String>) externalContext.getApplicationMap().get(FACELET_CONFIG_PROVIDER_LIST);
if (classList == null)
{
- classList = ServiceLoaderFinderFactory.getServiceLoaderFinder(externalContext).getServiceProviderList(FACELET_CONFIG_PROVIDER);
+ classList = ServiceProviderFinderFactory.getServiceLoaderFinder(externalContext).getServiceProviderList(FACELET_CONFIG_PROVIDER);
externalContext.getApplicationMap().put(FACELET_CONFIG_PROVIDER_LIST, classList);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java?rev=1041077&r1=1041076&r2=1041077&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigResourceProviderFactory.java Wed Dec 1 16:52:22 2010
@@ -31,7 +31,7 @@ import javax.faces.context.ExternalConte
import org.apache.myfaces.config.DefaultFacesConfigResourceProvider;
import org.apache.myfaces.spi.FacesConfigResourceProvider;
import org.apache.myfaces.spi.FacesConfigResourceProviderFactory;
-import org.apache.myfaces.spi.ServiceLoaderFinderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
/**
*
@@ -115,7 +115,7 @@ public class DefaultFacesConfigResourceP
List<String> classList = (List<String>) externalContext.getApplicationMap().get(FACES_CONFIG_PROVIDER_LIST);
if (classList == null)
{
- classList = ServiceLoaderFinderFactory.getServiceLoaderFinder(externalContext).getServiceProviderList(FACES_CONFIG_PROVIDER);
+ classList = ServiceProviderFinderFactory.getServiceLoaderFinder(externalContext).getServiceProviderList(FACES_CONFIG_PROVIDER);
externalContext.getApplicationMap().put(FACES_CONFIG_PROVIDER_LIST, classList);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java?rev=1041077&r1=1041076&r2=1041077&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesConfigurationProviderFactory.java Wed Dec 1 16:52:22 2010
@@ -31,7 +31,7 @@ import javax.faces.context.ExternalConte
import org.apache.myfaces.config.DefaultFacesConfigurationProvider;
import org.apache.myfaces.spi.FacesConfigurationProvider;
import org.apache.myfaces.spi.FacesConfigurationProviderFactory;
-import org.apache.myfaces.spi.ServiceLoaderFinderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
/**
*
@@ -117,7 +117,7 @@ public class DefaultFacesConfigurationPr
List<String> classList = (List<String>) externalContext.getApplicationMap().get(FACES_CONFIGURATION_PROVIDER_LIST);
if (classList == null)
{
- classList = ServiceLoaderFinderFactory.getServiceLoaderFinder(externalContext).getServiceProviderList(FACES_CONFIGURATION_PROVIDER);
+ classList = ServiceProviderFinderFactory.getServiceLoaderFinder(externalContext).getServiceProviderList(FACES_CONFIGURATION_PROVIDER);
externalContext.getApplicationMap().put(FACES_CONFIGURATION_PROVIDER_LIST, classList);
}
Modified: 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/DefaultServiceLoaderFinder.java?rev=1041077&r1=1041076&r2=1041077&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/DefaultServiceLoaderFinder.java Wed Dec 1 16:52:22 2010
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Set;
import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.spi.ServiceLoaderFinder;
+import org.apache.myfaces.spi.ServiceProviderFinder;
/**
*
@@ -40,7 +40,7 @@ import org.apache.myfaces.spi.ServiceLoa
* @since 2.0.3
*
*/
-public class DefaultServiceLoaderFinder extends ServiceLoaderFinder
+public class DefaultServiceLoaderFinder extends ServiceProviderFinder
{
private static final String META_INF_SERVICES = "META-INF/services/";
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java?rev=1041077&r1=1041076&r2=1041077&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java Wed Dec 1 16:52:22 2010
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
import javax.faces.FacesException;
import javax.faces.context.ExternalContext;
-import org.apache.myfaces.spi.ServiceLoaderFinderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
import org.apache.myfaces.spi.WebConfigProvider;
import org.apache.myfaces.spi.WebConfigProviderFactory;
@@ -119,7 +119,7 @@ public class DefaultWebConfigProviderFac
List<String> classList = (List<String>) externalContext.getApplicationMap().get(WEB_CONFIG_PROVIDER_LIST);
if (classList == null)
{
- classList = ServiceLoaderFinderFactory.getServiceLoaderFinder(externalContext).getServiceProviderList(WEB_CONFIG_PROVIDER);
+ classList = ServiceProviderFinderFactory.getServiceLoaderFinder(externalContext).getServiceProviderList(WEB_CONFIG_PROVIDER);
externalContext.getApplicationMap().put(WEB_CONFIG_PROVIDER_LIST, classList);
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java?rev=1041077&r1=1041076&r2=1041077&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/SpiUtils.java Wed Dec 1 16:52:22 2010
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
import javax.faces.context.ExternalContext;
import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.myfaces.spi.ServiceLoaderFinderFactory;
+import org.apache.myfaces.spi.ServiceProviderFinderFactory;
/**
* Utils for SPI implementations.
@@ -37,7 +37,7 @@ public final class SpiUtils
public static Object build(ExternalContext ectx, Class spiClass, String defaultImpl)
{
- List<String> classList = ServiceLoaderFinderFactory.getServiceLoaderFinder(ectx).getServiceProviderList(spiClass.getName());
+ List<String> classList = ServiceProviderFinderFactory.getServiceLoaderFinder(ectx).getServiceProviderList(spiClass.getName());
if (classList != null && !classList.isEmpty())
{
@@ -48,7 +48,7 @@ public final class SpiUtils
public static <T> T buildApplicationObject(ExternalContext ectx, Class<T> interfaceClass, T defaultObject)
{
- List<String> classList = ServiceLoaderFinderFactory.getServiceLoaderFinder(ectx).getServiceProviderList(interfaceClass.getName());
+ List<String> classList = ServiceProviderFinderFactory.getServiceLoaderFinder(ectx).getServiceProviderList(interfaceClass.getName());
if (classList != null && !classList.isEmpty())
{