You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2009/05/23 19:29:27 UTC
svn commit: r777974 - in
/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container:
AggregateConverter.java BlueprintContainerImpl.java
Author: gnodet
Date: Sat May 23 17:29:27 2009
New Revision: 777974
URL: http://svn.apache.org/viewvc?rev=777974&view=rev
Log:
Rename conversionService field to converter
Modified:
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AggregateConverter.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AggregateConverter.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AggregateConverter.java?rev=777974&r1=777973&r2=777974&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AggregateConverter.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AggregateConverter.java Sat May 23 17:29:27 2009
@@ -37,7 +37,7 @@
* by using {@link #registerConverter(Converter)}
* and unregistered using {@link #unregisterConverter(Converter)}.
*
- * Each {@link org.osgi.service.blueprint.container.BlueprintContainer} has its own ConversionService
+ * Each {@link org.osgi.service.blueprint.container.BlueprintContainer} has its own AggregateConverter
* used to register converters defined by the related blueprint bundle.
*
* @author <a href="mailto:dev@geronimo.apache.org">Apache Geronimo Project</a>
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java?rev=777974&r1=777973&r2=777974&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java Sat May 23 17:29:27 2009
@@ -113,7 +113,7 @@
private final NamespaceHandlerRegistry handlers;
private final List<URL> urls;
private final ComponentDefinitionRegistryImpl componentDefinitionRegistry;
- private final AggregateConverter conversionService;
+ private final AggregateConverter converter;
private final ScheduledExecutorService executors;
private Set<URI> namespaces;
private State state = State.Unknown;
@@ -133,7 +133,7 @@
this.sender = sender;
this.handlers = handlers;
this.urls = urls;
- this.conversionService = new AggregateConverter(this);
+ this.converter = new AggregateConverter(this);
this.componentDefinitionRegistry = new ComponentDefinitionRegistryImpl();
this.executors = executors;
this.beanProcessors = new ArrayList<BeanProcessor>();
@@ -369,7 +369,7 @@
Map<String, Object> objects = instantiator.createAll(typeConverters.toArray(new String[typeConverters.size()]));
for (Object obj : objects.values()) {
if (obj instanceof Converter) {
- conversionService.registerConverter((Converter) obj);
+ converter.registerConverter((Converter) obj);
} else {
throw new ComponentDefinitionException("Type converter " + obj + " does not implement the " + Converter.class.getName() + " interface");
}
@@ -670,7 +670,7 @@
}
public Converter getConverter() {
- return conversionService;
+ return converter;
}
public ComponentDefinitionRegistryImpl getComponentDefinitionRegistry() {