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/25 11:50:15 UTC
svn commit: r778369 - in
/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint:
container/ di/
Author: gnodet
Date: Mon May 25 09:50:15 2009
New Revision: 778369
URL: http://svn.apache.org/viewvc?rev=778369&view=rev
Log:
Rename some recipes to be consistent with their metadatas
Added:
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java (contents, props changed)
- copied, changed from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintObjectRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RefCollectionRecipe.java
- copied, changed from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/CollectionBasedServiceReferenceRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ReferenceRecipe.java
- copied, changed from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/UnaryServiceReferenceRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java
- copied, changed from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceExportRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/IdRefRecipe.java (contents, props changed)
- copied, changed from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ReferenceNameRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/RefRecipe.java
- copied, changed from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ReferenceRecipe.java
Removed:
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintObjectRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/CollectionBasedServiceReferenceRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceExportRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/UnaryServiceReferenceRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ReferenceNameRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ReferenceRecipe.java
Modified:
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.java
Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java (from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintObjectRecipe.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java&p1=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintObjectRecipe.java&r1=778365&r2=778369&rev=778369&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintObjectRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java Mon May 25 09:50:15 2009
@@ -36,7 +36,6 @@
import org.apache.geronimo.blueprint.ExtendedBlueprintContainer;
import org.apache.geronimo.blueprint.di.AbstractRecipe;
import org.apache.geronimo.blueprint.di.Recipe;
-import org.apache.geronimo.blueprint.di.ReferenceRecipe;
import org.apache.geronimo.blueprint.di.ExecutionContext;
import org.apache.geronimo.blueprint.utils.ReflectionUtils;
import static org.apache.geronimo.blueprint.utils.TypeUtils.toClass;
@@ -49,9 +48,9 @@
* @author <a href="mailto:dev@geronimo.apache.org">Apache Geronimo Project</a>
* @version $Rev$, $Date$
*/
-public class BlueprintObjectRecipe extends AbstractRecipe {
+public class BeanRecipe extends AbstractRecipe {
- private static final Logger LOGGER = LoggerFactory.getLogger(BlueprintObjectRecipe.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BeanRecipe.class);
private Object type;
private final LinkedHashMap<String,Object> properties = new LinkedHashMap<String,Object>();
@@ -69,7 +68,7 @@
protected ExtendedBlueprintContainer blueprintContainer;
- public BlueprintObjectRecipe(String name, ExtendedBlueprintContainer blueprintContainer, Object type) {
+ public BeanRecipe(String name, ExtendedBlueprintContainer blueprintContainer, Object type) {
super(name);
this.blueprintContainer = blueprintContainer;
this.type = type;
Propchange: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BeanRecipe.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=778369&r1=778368&r2=778369&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 Mon May 25 09:50:15 2009
@@ -36,7 +36,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
import org.apache.geronimo.blueprint.BeanProcessor;
import org.apache.geronimo.blueprint.BlueprintConstants;
@@ -49,8 +48,8 @@
import org.apache.geronimo.blueprint.di.DefaultRepository;
import org.apache.geronimo.blueprint.di.ExecutionContext;
import org.apache.geronimo.blueprint.di.Recipe;
-import org.apache.geronimo.blueprint.di.ReferenceNameRecipe;
-import org.apache.geronimo.blueprint.di.ReferenceRecipe;
+import org.apache.geronimo.blueprint.di.IdRefRecipe;
+import org.apache.geronimo.blueprint.di.RefRecipe;
import org.apache.geronimo.blueprint.di.Repository;
import org.apache.geronimo.blueprint.namespace.ComponentDefinitionRegistryImpl;
import org.apache.geronimo.blueprint.namespace.NamespaceHandlerRegistryImpl;
@@ -346,10 +345,10 @@
DefaultRepository repository = (DefaultRepository) instantiator.getRepository();
for (Recipe recipe : getAllRecipes()) {
String ref = null;
- if (recipe instanceof ReferenceRecipe) {
- ref = ((ReferenceRecipe) recipe).getReferenceName();
- } else if (recipe instanceof ReferenceNameRecipe) {
- ref = ((ReferenceNameRecipe) recipe).getReferenceName();
+ if (recipe instanceof RefRecipe) {
+ ref = ((RefRecipe) recipe).getReferenceName();
+ } else if (recipe instanceof IdRefRecipe) {
+ ref = ((IdRefRecipe) recipe).getReferenceName();
}
if (ref != null && repository.get(ref) == null) {
throw new ComponentDefinitionException("Unresolved ref/idref to component: " + ref);
@@ -480,7 +479,7 @@
break;
}
}
- ServiceExportRecipe reg = (ServiceExportRecipe) getComponentInstance(name);
+ ServiceRecipe reg = (ServiceRecipe) getComponentInstance(name);
if (satisfied && !reg.isRegistered()) {
LOGGER.debug("Registering service {} due to satisfied references", name);
reg.register();
@@ -520,8 +519,8 @@
}
private void registerServices() {
- List<ServiceExportRecipe> recipes = getAllRecipes(ServiceExportRecipe.class);
- for (ServiceExportRecipe r : recipes) {
+ List<ServiceRecipe> recipes = getAllRecipes(ServiceRecipe.class);
+ for (ServiceRecipe r : recipes) {
List<SatisfiableRecipe> dependencies = getSatisfiableDependenciesMap().get(r.getName());
boolean satisfied = true;
if (dependencies != null) {
@@ -540,8 +539,8 @@
private void unregisterServices() {
if (instantiator != null) {
- List<ServiceExportRecipe> recipes = getAllRecipes(ServiceExportRecipe.class);
- for (ServiceExportRecipe r : recipes) {
+ List<ServiceRecipe> recipes = getAllRecipes(ServiceRecipe.class);
+ for (ServiceRecipe r : recipes) {
r.unregister();
}
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.java?rev=778369&r1=778368&r2=778369&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.java Mon May 25 09:50:15 2009
@@ -32,8 +32,8 @@
import org.apache.geronimo.blueprint.di.DefaultRepository;
import org.apache.geronimo.blueprint.di.MapRecipe;
import org.apache.geronimo.blueprint.di.Recipe;
-import org.apache.geronimo.blueprint.di.ReferenceNameRecipe;
-import org.apache.geronimo.blueprint.di.ReferenceRecipe;
+import org.apache.geronimo.blueprint.di.IdRefRecipe;
+import org.apache.geronimo.blueprint.di.RefRecipe;
import org.apache.geronimo.blueprint.di.ValueRecipe;
import org.apache.geronimo.blueprint.mutable.MutableMapMetadata;
import org.apache.geronimo.blueprint.reflect.MetadataUtil;
@@ -107,15 +107,15 @@
} else if (component instanceof ServiceMetadata) {
return createServiceRecipe((ServiceMetadata) component);
} else if (component instanceof ReferenceMetadata) {
- return createUnaryServiceReferenceRecipe((ReferenceMetadata) component);
+ return createReferenceRecipe((ReferenceMetadata) component);
} else if (component instanceof RefCollectionMetadata) {
- return createCollectionBasedServiceReferenceRecipe((RefCollectionMetadata) component);
+ return createRefCollectionRecipe((RefCollectionMetadata) component);
} else {
throw new IllegalStateException("Unsupported component type " + component.getClass());
}
}
- private Recipe createCollectionBasedServiceReferenceRecipe(RefCollectionMetadata metadata) throws Exception {
+ private Recipe createRefCollectionRecipe(RefCollectionMetadata metadata) throws Exception {
CollectionRecipe listenersRecipe = null;
if (metadata.getServiceListeners() != null) {
listenersRecipe = new CollectionRecipe(getName(null), ArrayList.class);
@@ -127,16 +127,15 @@
if (metadata.getComparator() != null) {
comparatorRecipe = getValue(metadata.getComparator(), Comparator.class);
}
- CollectionBasedServiceReferenceRecipe recipe = new CollectionBasedServiceReferenceRecipe(
- getName(metadata.getId()),
- blueprintContainer,
- metadata,
- listenersRecipe,
- comparatorRecipe);
+ RefCollectionRecipe recipe = new RefCollectionRecipe(getName(metadata.getId()),
+ blueprintContainer,
+ metadata,
+ listenersRecipe,
+ comparatorRecipe);
return recipe;
}
- private UnaryServiceReferenceRecipe createUnaryServiceReferenceRecipe(ReferenceMetadata metadata) throws Exception {
+ private ReferenceRecipe createReferenceRecipe(ReferenceMetadata metadata) throws Exception {
CollectionRecipe listenersRecipe = null;
if (metadata.getServiceListeners() != null) {
listenersRecipe = new CollectionRecipe(getName(null), ArrayList.class);
@@ -144,10 +143,10 @@
listenersRecipe.add(createRecipe(listener));
}
}
- UnaryServiceReferenceRecipe recipe = new UnaryServiceReferenceRecipe(getName(metadata.getId()),
- blueprintContainer,
- metadata,
- listenersRecipe);
+ ReferenceRecipe recipe = new ReferenceRecipe(getName(metadata.getId()),
+ blueprintContainer,
+ metadata,
+ listenersRecipe);
return recipe;
}
@@ -158,45 +157,44 @@
listenersRecipe.add(createRecipe(listener));
}
}
- ServiceExportRecipe recipe = new ServiceExportRecipe(
- getName(serviceExport.getId()),
- blueprintContainer,
- serviceExport,
- getValue(serviceExport.getServiceComponent(), null),
- listenersRecipe,
- (MapRecipe) getServicePropertiesRecipe(serviceExport));
+ ServiceRecipe recipe = new ServiceRecipe(getName(serviceExport.getId()),
+ blueprintContainer,
+ serviceExport,
+ getValue(serviceExport.getServiceComponent(), null),
+ listenersRecipe,
+ getServicePropertiesRecipe(serviceExport));
return recipe;
}
- protected Recipe getServicePropertiesRecipe(ServiceMetadata metadata) throws Exception {
+ protected MapRecipe getServicePropertiesRecipe(ServiceMetadata metadata) throws Exception {
List<MapEntry> properties = metadata.getServiceProperties();
if (properties != null) {
MutableMapMetadata map = MetadataUtil.createMetadata(MutableMapMetadata.class);
for (MapEntry e : properties) {
map.addEntry(e);
}
- return getValue(map, null);
+ return createMapRecipe(map);
} else {
return null;
}
}
- private BlueprintObjectRecipe createBeanRecipe(BeanMetadata local) throws Exception {
- BlueprintObjectRecipe recipe = new BlueprintObjectRecipe(
- getName(local.getId()),
+ private BeanRecipe createBeanRecipe(BeanMetadata beanMetadata) throws Exception {
+ BeanRecipe recipe = new BeanRecipe(
+ getName(beanMetadata.getId()),
blueprintContainer,
- local.getRuntimeClass() != null ? local.getRuntimeClass() : local.getClassName());
- recipe.setExplicitDependencies(local.getExplicitDependencies());
- for (BeanProperty property : local.getProperties()) {
+ beanMetadata.getRuntimeClass() != null ? beanMetadata.getRuntimeClass() : beanMetadata.getClassName());
+ recipe.setExplicitDependencies(beanMetadata.getExplicitDependencies());
+ for (BeanProperty property : beanMetadata.getProperties()) {
Recipe value = getValue(property.getValue(), null);
recipe.setProperty(property.getName(), value);
}
- if (BeanMetadata.SCOPE_PROTOTYPE.equals(local.getScope())) {
+ if (BeanMetadata.SCOPE_PROTOTYPE.equals(beanMetadata.getScope())) {
recipe.setKeepRecipe(true);
}
- recipe.setInitMethod(local.getInitMethodName());
- recipe.setDestroyMethod(local.getDestroyMethodName());
- List<BeanArgument> beanArguments = local.getArguments();
+ recipe.setInitMethod(beanMetadata.getInitMethodName());
+ recipe.setDestroyMethod(beanMetadata.getDestroyMethodName());
+ List<BeanArgument> beanArguments = beanMetadata.getArguments();
if (beanArguments != null && !beanArguments.isEmpty()) {
boolean hasIndex = (beanArguments.get(0).getIndex() >= 0);
if (hasIndex) {
@@ -215,22 +213,22 @@
recipe.setArgTypes(argTypes);
recipe.setReorderArguments(!hasIndex);
}
- recipe.setFactoryMethod(local.getFactoryMethodName());
- if (local.getFactoryComponent() != null) {
- recipe.setFactoryComponent(getValue(local.getFactoryComponent(), null));
+ recipe.setFactoryMethod(beanMetadata.getFactoryMethodName());
+ if (beanMetadata.getFactoryComponent() != null) {
+ recipe.setFactoryComponent(getValue(beanMetadata.getFactoryComponent(), null));
}
return recipe;
}
private Recipe createRecipe(RegistrationListener listener) throws Exception {
- BlueprintObjectRecipe recipe = new BlueprintObjectRecipe(getName(null), blueprintContainer, ServiceExportRecipe.Listener.class);
+ BeanRecipe recipe = new BeanRecipe(getName(null), blueprintContainer, ServiceRecipe.Listener.class);
recipe.setProperty("listener", getValue(listener.getListenerComponent(), null));
recipe.setProperty("metadata", listener);
return recipe;
}
private Recipe createRecipe(Listener listener) throws Exception {
- BlueprintObjectRecipe recipe = new BlueprintObjectRecipe(getName(null), blueprintContainer, AbstractServiceReferenceRecipe.Listener.class);
+ BeanRecipe recipe = new BeanRecipe(getName(null), blueprintContainer, AbstractServiceReferenceRecipe.Listener.class);
recipe.setProperty("listener", getValue(listener.getListenerComponent(), null));
recipe.setProperty("metadata", listener);
return recipe;
@@ -250,7 +248,7 @@
} else if (v instanceof RefMetadata) {
// TODO: make it work with property-placeholders?
String componentName = ((RefMetadata) v).getComponentId();
- ReferenceRecipe rr = new ReferenceRecipe(getName(null), componentName);
+ RefRecipe rr = new RefRecipe(getName(null), componentName);
return rr;
} else if (v instanceof CollectionMetadata) {
CollectionMetadata collectionMetadata = (CollectionMetadata) v;
@@ -270,16 +268,7 @@
return cr;
}
} else if (v instanceof MapMetadata) {
- MapMetadata mapValue = (MapMetadata) v;
- Object keyType = mapValue.getKeyTypeName();
- Object valueType = mapValue.getValueTypeName();
- MapRecipe mr = new MapRecipe(getName(null), HashMap.class);
- for (MapEntry entry : mapValue.getEntries()) {
- Recipe key = getValue(entry.getKey(), keyType);
- Recipe val = getValue(entry.getValue(), valueType);
- mr.put(key, val);
- }
- return mr;
+ return createMapRecipe((MapMetadata) v);
} else if (v instanceof PropsMetadata) {
PropsMetadata mapValue = (PropsMetadata) v;
MapRecipe mr = new MapRecipe(getName(null), Properties.class);
@@ -292,17 +281,25 @@
} else if (v instanceof IdRefMetadata) {
// TODO: make it work with property-placeholders?
String componentName = ((IdRefMetadata) v).getComponentId();
- ReferenceNameRecipe rnr = new ReferenceNameRecipe(getName(null), componentName);
+ IdRefRecipe rnr = new IdRefRecipe(getName(null), componentName);
return rnr;
} else {
throw new IllegalStateException("Unsupported value: " + v.getClass().getName());
}
}
-
- protected Converter getConversionService() {
- return blueprintContainer.getConverter();
+
+ private MapRecipe createMapRecipe(MapMetadata mapValue) throws Exception {
+ Object keyType = mapValue.getKeyTypeName();
+ Object valueType = mapValue.getValueTypeName();
+ MapRecipe mr = new MapRecipe(getName(null), HashMap.class);
+ for (MapEntry entry : mapValue.getEntries()) {
+ Recipe key = getValue(entry.getKey(), keyType);
+ Recipe val = getValue(entry.getValue(), valueType);
+ mr.put(key, val);
+ }
+ return mr;
}
-
+
private String getName(String name) {
// TODO: what if name.startWith("recipe-") ?
if (name == null) {
@@ -311,5 +308,5 @@
return name;
}
}
-
+
}
Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RefCollectionRecipe.java (from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/CollectionBasedServiceReferenceRecipe.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RefCollectionRecipe.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RefCollectionRecipe.java&p1=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/CollectionBasedServiceReferenceRecipe.java&r1=778365&r2=778369&rev=778369&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/CollectionBasedServiceReferenceRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RefCollectionRecipe.java Mon May 25 09:50:15 2009
@@ -57,15 +57,15 @@
* @author <a href="mailto:dev@geronimo.apache.org">Apache Geronimo Project</a>
* @version $Rev: 760378 $, $Date: 2009-03-31 11:31:38 +0200 (Tue, 31 Mar 2009) $
*/
-public class CollectionBasedServiceReferenceRecipe extends AbstractServiceReferenceRecipe {
+public class RefCollectionRecipe extends AbstractServiceReferenceRecipe {
- private static final Logger LOGGER = LoggerFactory.getLogger(CollectionBasedServiceReferenceRecipe.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RefCollectionRecipe.class);
private final RefCollectionMetadata metadata;
private final Recipe comparatorRecipe;
private ManagedCollection collection;
- public CollectionBasedServiceReferenceRecipe(String name,
+ public RefCollectionRecipe(String name,
ExtendedBlueprintContainer blueprintContainer,
RefCollectionMetadata metadata,
Recipe listenersRecipe,
Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ReferenceRecipe.java (from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/UnaryServiceReferenceRecipe.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ReferenceRecipe.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ReferenceRecipe.java&p1=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/UnaryServiceReferenceRecipe.java&r1=778365&r2=778369&rev=778369&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/UnaryServiceReferenceRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ReferenceRecipe.java Mon May 25 09:50:15 2009
@@ -42,7 +42,7 @@
* @author <a href="mailto:dev@geronimo.apache.org">Apache Geronimo Project</a>
* @version $Rev: 760378 $, $Date: 2009-03-31 11:31:38 +0200 (Tue, 31 Mar 2009) $
*/
-public class UnaryServiceReferenceRecipe extends AbstractServiceReferenceRecipe {
+public class ReferenceRecipe extends AbstractServiceReferenceRecipe {
private final ReferenceMetadata metadata;
private Class proxyClass;
@@ -52,7 +52,7 @@
private volatile Object trackedService;
private final Object monitor = new Object();
- public UnaryServiceReferenceRecipe(String name,
+ public ReferenceRecipe(String name,
ExtendedBlueprintContainer blueprintContainer,
ReferenceMetadata metadata,
Recipe listenersRecipe) {
Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java (from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceExportRecipe.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java&p1=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceExportRecipe.java&r1=778365&r2=778369&rev=778369&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceExportRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java Mon May 25 09:50:15 2009
@@ -19,7 +19,7 @@
import org.apache.geronimo.blueprint.di.ExecutionContext;
import org.apache.geronimo.blueprint.di.MapRecipe;
import org.apache.geronimo.blueprint.di.Recipe;
-import org.apache.geronimo.blueprint.di.ReferenceRecipe;
+import org.apache.geronimo.blueprint.di.RefRecipe;
import org.apache.geronimo.blueprint.di.Repository;
import org.apache.geronimo.blueprint.utils.ReflectionUtils;
import org.osgi.framework.Bundle;
@@ -43,9 +43,9 @@
* @author <a href="mailto:dev@geronimo.apache.org">Apache Geronimo Project</a>
* @version $Rev: 776360 $, $Date: 2009-05-19 17:40:47 +0200 (Tue, 19 May 2009) $
*/
-public class ServiceExportRecipe extends AbstractRecipe implements ServiceRegistration {
+public class ServiceRecipe extends AbstractRecipe implements ServiceRegistration {
- private static final Logger LOGGER = LoggerFactory.getLogger(ServiceExportRecipe.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ServiceRecipe.class);
private ExtendedBlueprintContainer blueprintContainer;
private ServiceMetadata metadata;
@@ -61,7 +61,7 @@
private Object service;
private boolean bundleScope;
- public ServiceExportRecipe(String name,
+ public ServiceRecipe(String name,
ExtendedBlueprintContainer blueprintContainer,
ServiceMetadata metadata,
Recipe serviceRecipe,
@@ -229,8 +229,8 @@
if (scoped) {
Recipe recipe = serviceRecipe;
Repository objectRepository = blueprintContainer.getRepository();
- if (recipe instanceof ReferenceRecipe) {
- recipe = (Recipe) objectRepository.get(((ReferenceRecipe) recipe).getReferenceName());
+ if (recipe instanceof RefRecipe) {
+ recipe = (Recipe) objectRepository.get(((RefRecipe) recipe).getReferenceName());
}
DefaultRepository repository = new DefaultRepository((DefaultRepository) objectRepository);
repository.putRecipe(recipe.getName(), recipe);
@@ -254,10 +254,10 @@
private void destroyInstance(Object instance) {
Recipe recipe = serviceRecipe;
Repository objectRepository = blueprintContainer.getRepository();
- if (recipe instanceof ReferenceRecipe) {
- recipe = (Recipe) objectRepository.get(((ReferenceRecipe) recipe).getReferenceName());
+ if (recipe instanceof RefRecipe) {
+ recipe = (Recipe) objectRepository.get(((RefRecipe) recipe).getReferenceName());
}
- ((BlueprintObjectRecipe) recipe).destroyInstance(instance);
+ ((BeanRecipe) recipe).destroyInstance(instance);
}
private boolean isBundleScope(Metadata value) {
@@ -306,11 +306,11 @@
private class TriggerServiceFactory implements ServiceFactory {
public Object getService(Bundle bundle, ServiceRegistration registration) {
- return ServiceExportRecipe.this.getService(bundle, registration);
+ return ServiceRecipe.this.getService(bundle, registration);
}
public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
- ServiceExportRecipe.this.ungetService(bundle, registration, service);
+ ServiceRecipe.this.ungetService(bundle, registration, service);
}
}
@@ -332,16 +332,16 @@
this.metadata = metadata;
}
- public void register(ServiceExportRecipe recipe) {
+ public void register(ServiceRecipe recipe) {
init(recipe);
invokeMethod(registerMethods, recipe);
}
- public void unregister(ServiceExportRecipe recipe) {
+ public void unregister(ServiceRecipe recipe) {
invokeMethod(unregisterMethods, recipe);
}
- private synchronized void init(ServiceExportRecipe recipe) {
+ private synchronized void init(ServiceRecipe recipe) {
if (initialized) {
return;
}
@@ -358,7 +358,7 @@
initialized = true;
}
- private void invokeMethod(List<Method> methods, ServiceExportRecipe recipe) {
+ private void invokeMethod(List<Method> methods, ServiceRecipe recipe) {
if (methods == null || methods.isEmpty()) {
return;
}
Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/IdRefRecipe.java (from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ReferenceNameRecipe.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/IdRefRecipe.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/IdRefRecipe.java&p1=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ReferenceNameRecipe.java&r1=778365&r2=778369&rev=778369&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ReferenceNameRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/IdRefRecipe.java Mon May 25 09:50:15 2009
@@ -27,11 +27,11 @@
* The ReferenceNameRecipe is used to inject the reference name into the object (as a String).
* The ReferenceNameRecipe ensures the actual reference object exists before the reference name is injected.
*/
-public class ReferenceNameRecipe extends AbstractRecipe {
+public class IdRefRecipe extends AbstractRecipe {
private String referenceName;
- public ReferenceNameRecipe(String name, String referenceName) {
+ public IdRefRecipe(String name, String referenceName) {
super(name);
this.referenceName = referenceName;
}
Propchange: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/IdRefRecipe.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/IdRefRecipe.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/IdRefRecipe.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/RefRecipe.java (from r778365, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ReferenceRecipe.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/RefRecipe.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/RefRecipe.java&p1=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ReferenceRecipe.java&r1=778365&r2=778369&rev=778369&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/ReferenceRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/RefRecipe.java Mon May 25 09:50:15 2009
@@ -23,10 +23,10 @@
import org.osgi.service.blueprint.container.ComponentDefinitionException;
import org.osgi.service.blueprint.container.NoSuchComponentException;
-public class ReferenceRecipe extends AbstractRecipe {
+public class RefRecipe extends AbstractRecipe {
private String referenceName;
- public ReferenceRecipe(String name, String referenceName) {
+ public RefRecipe(String name, String referenceName) {
super(name);
this.referenceName = referenceName;
}