You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by db...@apache.org on 2011/08/22 05:54:55 UTC
svn commit: r1160102 - in /openwebbeans/trunk:
webbeans-impl/src/main/java/org/apache/webbeans/config/
webbeans-impl/src/main/java/org/apache/webbeans/plugins/
webbeans-impl/src/main/java/org/apache/webbeans/portable/events/
webbeans-impl/src/main/java...
Author: dblevins
Date: Mon Aug 22 03:54:54 2011
New Revision: 1160102
URL: http://svn.apache.org/viewvc?rev=1160102&view=rev
Log:
OWB-582
Renamed ImplementationLoaderService to LoaderService
All interfaces are meant to be implemented, no need to spell it out.
Added:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java
- copied, changed from r1160098, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultImplementationLoaderService.java
openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/LoaderService.java
- copied, changed from r1160098, openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ImplementationLoaderService.java
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultImplementationLoaderService.java
openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ImplementationLoaderService.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1160102&r1=1160101&r2=1160102&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java Mon Aug 22 03:54:54 2011
@@ -46,9 +46,9 @@ import org.apache.webbeans.plugins.Plugi
import org.apache.webbeans.portable.AnnotatedElementFactory;
import org.apache.webbeans.portable.events.ExtensionLoader;
import org.apache.webbeans.proxy.JavassistProxyFactory;
-import org.apache.webbeans.service.DefaultImplementationLoaderService;
+import org.apache.webbeans.service.DefaultLoaderService;
import org.apache.webbeans.spi.ContextsService;
-import org.apache.webbeans.spi.ImplementationLoaderService;
+import org.apache.webbeans.spi.LoaderService;
import org.apache.webbeans.spi.ScannerService;
import org.apache.webbeans.spi.SecurityService;
import org.apache.webbeans.spi.plugins.OpenWebBeansPlugin;
@@ -91,7 +91,7 @@ public class WebBeansContext
private final WebBeansAnnotatedTypeUtil annotatedTypeUtil = new WebBeansAnnotatedTypeUtil(this);
private final ManagedBeanConfigurator managedBeanConfigurator = new ManagedBeanConfigurator(this);
private final SecurityService securityService;
- private final ImplementationLoaderService implementationLoaderService;
+ private final LoaderService loaderService;
public WebBeansContext()
{
@@ -108,17 +108,17 @@ public class WebBeansContext
this.openWebBeansConfiguration = openWebBeansConfiguration;
//pluggable service-loader
- if (initialServices == null || !initialServices.containsKey(ImplementationLoaderService.class))
+ if (initialServices == null || !initialServices.containsKey(LoaderService.class))
{
String implementationLoaderServiceName =
- openWebBeansConfiguration.getProperty(ImplementationLoaderService.class.getName());
+ openWebBeansConfiguration.getProperty(LoaderService.class.getName());
if (implementationLoaderServiceName == null)
{
- serviceMap.put(ImplementationLoaderService.class, new DefaultImplementationLoaderService());
+ serviceMap.put(LoaderService.class, new DefaultLoaderService());
}
else
{
- serviceMap.put(ImplementationLoaderService.class, ImplementationLoaderService.class.cast(get(implementationLoaderServiceName)));
+ serviceMap.put(LoaderService.class, LoaderService.class.cast(get(implementationLoaderServiceName)));
}
}
@@ -133,7 +133,7 @@ public class WebBeansContext
serviceMap.put(entry.getKey(), entry.getValue());
}
}
- this.implementationLoaderService = getService(ImplementationLoaderService.class);
+ this.loaderService = getService(LoaderService.class);
this.securityService = getService(SecurityService.class);
WebBeansUtil.initProxyFactoryClassLoaderProvider();
@@ -437,8 +437,8 @@ public class WebBeansContext
managerMap.clear();
}
- public ImplementationLoaderService getImplementationLoaderService()
+ public LoaderService getLoaderService()
{
- return this.implementationLoaderService;
+ return this.loaderService;
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=1160102&r1=1160101&r2=1160102&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java Mon Aug 22 03:54:54 2011
@@ -81,7 +81,7 @@ public class PluginLoader
logger.debug("PluginLoader startUp called.");
ArrayList<OpenWebBeansPlugin> ps = new ArrayList<OpenWebBeansPlugin>();
- List<OpenWebBeansPlugin> pluginList = WebBeansContext.getInstance().getImplementationLoaderService().load(OpenWebBeansPlugin.class);
+ List<OpenWebBeansPlugin> pluginList = WebBeansContext.getInstance().getLoaderService().load(OpenWebBeansPlugin.class);
for (OpenWebBeansPlugin plugin : pluginList)
{
if (logger.wblWillLogInfo())
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java?rev=1160102&r1=1160101&r2=1160102&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java Mon Aug 22 03:54:54 2011
@@ -85,7 +85,7 @@ public class ExtensionLoader
*/
public void loadExtensionServices(ClassLoader classLoader)
{
- List<Extension> loader = this.webBeansContext.getImplementationLoaderService().load(Extension.class, classLoader);
+ List<Extension> loader = this.webBeansContext.getLoaderService().load(Extension.class, classLoader);
for (Extension extension : loader)
{
if (!extensionClasses.contains(extension.getClass()))
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java (from r1160098, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultImplementationLoaderService.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultImplementationLoaderService.java&r1=1160098&r2=1160102&rev=1160102&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultImplementationLoaderService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java Mon Aug 22 03:54:54 2011
@@ -19,7 +19,7 @@
package org.apache.webbeans.service;
import org.apache.webbeans.logger.WebBeansLogger;
-import org.apache.webbeans.spi.ImplementationLoaderService;
+import org.apache.webbeans.spi.LoaderService;
import org.apache.webbeans.util.WebBeansUtil;
import java.util.ArrayList;
@@ -30,9 +30,9 @@ import java.util.ServiceLoader;
* Default implementation which delegates to the s{@link ServiceLoader} of Java 1.6 and
* uses a fallback for Java 1.5
*/
-public class DefaultImplementationLoaderService implements ImplementationLoaderService
+public class DefaultLoaderService implements LoaderService
{
- private static final WebBeansLogger logger = WebBeansLogger.getLogger(DefaultImplementationLoaderService.class);
+ private static final WebBeansLogger logger = WebBeansLogger.getLogger(DefaultLoaderService.class);
private static final boolean JAVA_6_AVAILABLE = isJava6();
Modified: openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1160102&r1=1160101&r2=1160102&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Mon Aug 22 03:54:54 2011
@@ -63,7 +63,7 @@ org.apache.webbeans.spi.SecurityService=
################################ Default Implementation-Loader Service ###########################################
# Service which encapsulates the Service-Loader of Java 1.6+ to allow custom implementations to support Java 1.5
-org.apache.webbeans.spi.ImplementationLoaderService=org.apache.webbeans.service.DefaultImplementationLoaderService
+org.apache.webbeans.spi.ImplementationLoaderService=org.apache.webbeans.service.DefaultLoaderService
################################################################################################
#################################### SEVERAL CONFIGURATION PARAMETERS ##########################
Modified: openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java?rev=1160102&r1=1160101&r2=1160102&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java (original)
+++ openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java Mon Aug 22 03:54:54 2011
@@ -49,7 +49,7 @@ public class ExtendedStandaloneResourceI
super(webBeansContext);
List<EjbResolver> ejbResolverServiceLoader =
- webBeansContext.getImplementationLoaderService().load(EjbResolver.class);
+ webBeansContext.getLoaderService().load(EjbResolver.class);
for (EjbResolver ejbResolver : ejbResolverServiceLoader)
{
Copied: openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/LoaderService.java (from r1160098, openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ImplementationLoaderService.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/LoaderService.java?p2=openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/LoaderService.java&p1=openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ImplementationLoaderService.java&r1=1160098&r2=1160102&rev=1160102&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ImplementationLoaderService.java (original)
+++ openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/LoaderService.java Mon Aug 22 03:54:54 2011
@@ -24,7 +24,7 @@ import java.util.List;
* Decouples OpenWebBeans from the Service-Loader approach.
* It allows to provide custom loaders with custom mechanisms as well as support for Java 1.5
*/
-public interface ImplementationLoaderService
+public interface LoaderService
{
/**
* Loads all active implementations for the given service-type
Re: svn commit: r1160102 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/config/ webbeans-impl/src/main/java/org/apache/webbeans/plugins/ webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ webbeans-impl/src/main/java...
Posted by Mark Struberg <st...@yahoo.de>.
Thats fine. Actually it's more like a ServiceLoader(Service?) than a LoaderService ;)
LieGrue,
strub
--- On Mon, 8/22/11, dblevins@apache.org <db...@apache.org> wrote:
> From: dblevins@apache.org <db...@apache.org>
> Subject: svn commit: r1160102 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/config/ webbeans-impl/src/main/java/org/apache/webbeans/plugins/ webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ webbeans-impl/src/main/java...
> To: commits@openwebbeans.apache.org
> Date: Monday, August 22, 2011, 3:54 AM
> Author: dblevins
> Date: Mon Aug 22 03:54:54 2011
> New Revision: 1160102
>
> URL: http://svn.apache.org/viewvc?rev=1160102&view=rev
> Log:
> OWB-582
> Renamed ImplementationLoaderService to LoaderService
> All interfaces are meant to be implemented, no need to
> spell it out.
>
> Added:
>
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java
> - copied, changed from r1160098,
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultImplementationLoaderService.java
>
> openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/LoaderService.java
> - copied, changed from r1160098,
> openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ImplementationLoaderService.java
> Removed:
>
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultImplementationLoaderService.java
>
> openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ImplementationLoaderService.java
> Modified:
>
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
>
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
>
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
>
> openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
>
> openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java
>
> Modified:
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
> URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1160102&r1=1160101&r2=1160102&view=diff
> ==============================================================================
> ---
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
> (original)
> +++
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
> Mon Aug 22 03:54:54 2011
> @@ -46,9 +46,9 @@ import org.apache.webbeans.plugins.Plugi
> import
> org.apache.webbeans.portable.AnnotatedElementFactory;
> import
> org.apache.webbeans.portable.events.ExtensionLoader;
> import org.apache.webbeans.proxy.JavassistProxyFactory;
> -import
> org.apache.webbeans.service.DefaultImplementationLoaderService;
> +import org.apache.webbeans.service.DefaultLoaderService;
> import org.apache.webbeans.spi.ContextsService;
> -import
> org.apache.webbeans.spi.ImplementationLoaderService;
> +import org.apache.webbeans.spi.LoaderService;
> import org.apache.webbeans.spi.ScannerService;
> import org.apache.webbeans.spi.SecurityService;
> import
> org.apache.webbeans.spi.plugins.OpenWebBeansPlugin;
> @@ -91,7 +91,7 @@ public class WebBeansContext
> private final
> WebBeansAnnotatedTypeUtil annotatedTypeUtil = new
> WebBeansAnnotatedTypeUtil(this);
> private final
> ManagedBeanConfigurator managedBeanConfigurator = new
> ManagedBeanConfigurator(this);
> private final SecurityService
> securityService;
> - private final ImplementationLoaderService
> implementationLoaderService;
> + private final LoaderService loaderService;
>
> public WebBeansContext()
> {
> @@ -108,17 +108,17 @@ public class WebBeansContext
>
> this.openWebBeansConfiguration =
> openWebBeansConfiguration;
>
> //pluggable
> service-loader
> - if (initialServices == null ||
> !initialServices.containsKey(ImplementationLoaderService.class))
> + if (initialServices == null ||
> !initialServices.containsKey(LoaderService.class))
> {
> String
> implementationLoaderServiceName =
> -
>
> openWebBeansConfiguration.getProperty(ImplementationLoaderService.class.getName());
> +
>
> openWebBeansConfiguration.getProperty(LoaderService.class.getName());
> if
> (implementationLoaderServiceName == null)
> {
> -
> serviceMap.put(ImplementationLoaderService.class, new
> DefaultImplementationLoaderService());
> +
> serviceMap.put(LoaderService.class, new
> DefaultLoaderService());
> }
> else
> {
> -
> serviceMap.put(ImplementationLoaderService.class,
> ImplementationLoaderService.class.cast(get(implementationLoaderServiceName)));
> +
> serviceMap.put(LoaderService.class,
> LoaderService.class.cast(get(implementationLoaderServiceName)));
> }
> }
>
> @@ -133,7 +133,7 @@ public class WebBeansContext
>
> serviceMap.put(entry.getKey(),
> entry.getValue());
> }
> }
> -
> this.implementationLoaderService =
> getService(ImplementationLoaderService.class);
> + this.loaderService =
> getService(LoaderService.class);
> this.securityService
> = getService(SecurityService.class);
>
> WebBeansUtil.initProxyFactoryClassLoaderProvider();
>
> @@ -437,8 +437,8 @@ public class WebBeansContext
> managerMap.clear();
> }
>
> - public ImplementationLoaderService
> getImplementationLoaderService()
> + public LoaderService getLoaderService()
> {
> - return
> this.implementationLoaderService;
> + return this.loaderService;
> }
> }
>
> Modified:
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
> URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=1160102&r1=1160101&r2=1160102&view=diff
> ==============================================================================
> ---
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
> (original)
> +++
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
> Mon Aug 22 03:54:54 2011
> @@ -81,7 +81,7 @@ public class PluginLoader
>
> logger.debug("PluginLoader startUp
> called.");
>
> ArrayList<OpenWebBeansPlugin> ps =
> new ArrayList<OpenWebBeansPlugin>();
>
> -
> List<OpenWebBeansPlugin> pluginList =
> WebBeansContext.getInstance().getImplementationLoaderService().load(OpenWebBeansPlugin.class);
> +
> List<OpenWebBeansPlugin> pluginList =
> WebBeansContext.getInstance().getLoaderService().load(OpenWebBeansPlugin.class);
> for
> (OpenWebBeansPlugin plugin : pluginList)
> {
>
> if (logger.wblWillLogInfo())
>
> Modified:
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
> URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java?rev=1160102&r1=1160101&r2=1160102&view=diff
> ==============================================================================
> ---
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
> (original)
> +++
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
> Mon Aug 22 03:54:54 2011
> @@ -85,7 +85,7 @@ public class ExtensionLoader
> */
> public void
> loadExtensionServices(ClassLoader classLoader)
> {
> - List<Extension> loader =
> this.webBeansContext.getImplementationLoaderService().load(Extension.class,
> classLoader);
> + List<Extension> loader =
> this.webBeansContext.getLoaderService().load(Extension.class,
> classLoader);
> for (Extension
> extension : loader)
> {
> if
> (!extensionClasses.contains(extension.getClass()))
>
> Copied:
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java
> (from r1160098,
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultImplementationLoaderService.java)
> URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultImplementationLoaderService.java&r1=1160098&r2=1160102&rev=1160102&view=diff
> ==============================================================================
> ---
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultImplementationLoaderService.java
> (original)
> +++
> openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/DefaultLoaderService.java
> Mon Aug 22 03:54:54 2011
> @@ -19,7 +19,7 @@
> package org.apache.webbeans.service;
>
> import org.apache.webbeans.logger.WebBeansLogger;
> -import
> org.apache.webbeans.spi.ImplementationLoaderService;
> +import org.apache.webbeans.spi.LoaderService;
> import org.apache.webbeans.util.WebBeansUtil;
>
> import java.util.ArrayList;
> @@ -30,9 +30,9 @@ import java.util.ServiceLoader;
> * Default implementation which delegates to the
> s{@link ServiceLoader} of Java 1.6 and
> * uses a fallback for Java 1.5
> */
> -public class DefaultImplementationLoaderService implements
> ImplementationLoaderService
> +public class DefaultLoaderService implements
> LoaderService
> {
> - private static final WebBeansLogger logger =
> WebBeansLogger.getLogger(DefaultImplementationLoaderService.class);
> + private static final WebBeansLogger logger =
> WebBeansLogger.getLogger(DefaultLoaderService.class);
>
> private static final boolean
> JAVA_6_AVAILABLE = isJava6();
>
>
> Modified:
> openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
> URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1160102&r1=1160101&r2=1160102&view=diff
> ==============================================================================
> ---
> openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
> (original)
> +++
> openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
> Mon Aug 22 03:54:54 2011
> @@ -63,7 +63,7 @@ org.apache.webbeans.spi.SecurityService=
>
> ################################ Default
> Implementation-Loader Service
> ###########################################
> # Service which encapsulates the Service-Loader of Java
> 1.6+ to allow custom implementations to support Java 1.5
> -org.apache.webbeans.spi.ImplementationLoaderService=org.apache.webbeans.service.DefaultImplementationLoaderService
> +org.apache.webbeans.spi.ImplementationLoaderService=org.apache.webbeans.service.DefaultLoaderService
>
>
> ################################################################################################
>
> #################################### SEVERAL CONFIGURATION
> PARAMETERS ##########################
>
> Modified:
> openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java
> URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java?rev=1160102&r1=1160101&r2=1160102&view=diff
> ==============================================================================
> ---
> openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java
> (original)
> +++
> openwebbeans/trunk/webbeans-jee5-ejb-resource/src/main/java/org/apache/webbeans/resource/spi/ee/ExtendedStandaloneResourceInjectionService.java
> Mon Aug 22 03:54:54 2011
> @@ -49,7 +49,7 @@ public class ExtendedStandaloneResourceI
>
> super(webBeansContext);
>
>
> List<EjbResolver>
> ejbResolverServiceLoader =
> -
> webBeansContext.getImplementationLoaderService().load(EjbResolver.class);
> +
> webBeansContext.getLoaderService().load(EjbResolver.class);
>
> for (EjbResolver
> ejbResolver : ejbResolverServiceLoader)
> {
>
> Copied:
> openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/LoaderService.java
> (from r1160098,
> openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ImplementationLoaderService.java)
> URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/LoaderService.java?p2=openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/LoaderService.java&p1=openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ImplementationLoaderService.java&r1=1160098&r2=1160102&rev=1160102&view=diff
> ==============================================================================
> ---
> openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ImplementationLoaderService.java
> (original)
> +++
> openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/LoaderService.java
> Mon Aug 22 03:54:54 2011
> @@ -24,7 +24,7 @@ import java.util.List;
> * Decouples OpenWebBeans from the Service-Loader
> approach.
> * It allows to provide custom loaders with custom
> mechanisms as well as support for Java 1.5
> */
> -public interface ImplementationLoaderService
> +public interface LoaderService
> {
> /**
> * Loads all active implementations for
> the given service-type
>
>
>