geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r777730 - in /geronimo/sandbox/blueprint: blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/ blueprint-core/src/main/java/org/apache/geronimo/blueprint/ blueprint-core/src/main/java/org/apache/geronimo/blueprint/contain...
Date Fri, 22 May 2009 22:38:18 GMT
Author: gnodet
Date: Fri May 22 22:38:17 2009
New Revision: 777730

URL: http://svn.apache.org/viewvc?rev=777730&view=rev
Log:
Change environment component names + various minor fixes

Added:
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintEventSender.java
      - copied, changed from r777650, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintContextEventSender.java
Removed:
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintContextEventSender.java
Modified:
    geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedProperties.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintExtender.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedBlueprintContainer.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AbstractServiceReferenceRecipe.java
    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/BlueprintObjectInstantiator.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/DefaultBlueprintContextEventSender.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/RecipeBuilder.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/DefaultExecutionContext.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/TestBlueprintContainer.java
    geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml

Modified: geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedProperties.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedProperties.java?rev=777730&r1=777729&r2=777730&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedProperties.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedProperties.java
Fri May 22 22:38:17 2009
@@ -214,7 +214,7 @@
                             Class methodParameterType = method.getParameterTypes()[0];
                             Object propertyValue;
                             try {
-                                propertyValue = blueprintContainer.getConversionService().convert(val,
methodParameterType);
+                                propertyValue = blueprintContainer.getConverter().convert(val,
methodParameterType);
                             } catch (Throwable t) {
                                 LOGGER.debug("Unable to convert value for setter: " + method,
t);
                                 continue;

Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintEventSender.java
(from r777650, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintContextEventSender.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintEventSender.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintEventSender.java&p1=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintContextEventSender.java&r1=777650&r2=777730&rev=777730&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintContextEventSender.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintEventSender.java
Fri May 22 22:38:17 2009
@@ -26,7 +26,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 interface BlueprintContextEventSender extends Destroyable {
+public interface BlueprintEventSender extends Destroyable {
 
     void sendCreating(Bundle bundle);
     void sendCreated(Bundle bundle);

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintExtender.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintExtender.java?rev=777730&r1=777729&r2=777730&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintExtender.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintExtender.java
Fri May 22 22:38:17 2009
@@ -52,18 +52,20 @@
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BlueprintExtender.class);
 
+    private BundleContext context;
     private ScheduledExecutorService executors;
-    private Map<Bundle, BlueprintContainerImpl> contextMap;
-    private BlueprintContextEventSender sender;
+    private Map<Bundle, BlueprintContainerImpl> containers;
+    private BlueprintEventSender sender;
     private NamespaceHandlerRegistry handlers;
 
     public void start(BundleContext context) {
         LOGGER.debug("Starting blueprint extender...");
 
+        this.context = context;
         sender = new DefaultBlueprintContextEventSender(context);
         handlers = new NamespaceHandlerRegistryImpl(context);
         executors = Executors.newScheduledThreadPool(1);
-        contextMap = new HashMap<Bundle, BlueprintContainerImpl>();
+        containers = new HashMap<Bundle, BlueprintContainerImpl>();
 
         context.addBundleListener(this);
 
@@ -83,7 +85,7 @@
         // TODO: also if a blueprint bundle is being stopped at the same time (this could
happen if the framework
         // TODO: is shut down, we should not wait for the blueprint container to be destroyed
if it is already being
         // TODO: destroyed by the extender
-        List<Bundle> bundles = new ArrayList<Bundle>(contextMap.keySet());
+        List<Bundle> bundles = new ArrayList<Bundle>(containers.keySet());
         for (Bundle bundle : bundles) {
             destroyContext(bundle);
         }
@@ -99,7 +101,7 @@
         if (event.getType() == BundleEvent.LAZY_ACTIVATION) {
             checkBundle(bundle, true);
         } else if (event.getType() == BundleEvent.STARTED) {
-            BlueprintContainerImpl blueprintContainer = contextMap.get(bundle);
+            BlueprintContainerImpl blueprintContainer = containers.get(bundle);
             if (blueprintContainer == null) {
                 checkBundle(bundle, false);
             } else {
@@ -111,7 +113,7 @@
     }
 
     private void destroyContext(Bundle bundle) {
-        BlueprintContainerImpl blueprintContainer = contextMap.remove(bundle);
+        BlueprintContainerImpl blueprintContainer = containers.remove(bundle);
         if (blueprintContainer != null) {
             LOGGER.debug("Destroying BlueprintContainer for bundle {}", bundle.getSymbolicName());
             blueprintContainer.destroy();
@@ -152,8 +154,8 @@
                 // the bundle to be fully started
                 boolean compatible = lazyActivation || isCompatible(bundle);
                 if (compatible) {
-                    final BlueprintContainerImpl blueprintContainer = new BlueprintContainerImpl(bundle.getBundleContext(),
sender, handlers, executors, urls, lazyActivation);
-                    contextMap.put(bundle, blueprintContainer);
+                    final BlueprintContainerImpl blueprintContainer = new BlueprintContainerImpl(bundle.getBundleContext(),
context.getBundle(), sender, handlers, executors, urls, lazyActivation);
+                    containers.put(bundle, blueprintContainer);
                     // run synchronous when bundle is lazy activated
                     blueprintContainer.run(lazyActivation ? false: true);
                 } else {

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedBlueprintContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedBlueprintContainer.java?rev=777730&r1=777729&r2=777730&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedBlueprintContainer.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedBlueprintContainer.java
Fri May 22 22:38:17 2009
@@ -29,7 +29,7 @@
  */
 public interface ExtendedBlueprintContainer extends BlueprintContainer {
 
-    Converter getConversionService();
+    Converter getConverter();
 
     Class loadClass(String name) throws ClassNotFoundException;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AbstractServiceReferenceRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AbstractServiceReferenceRecipe.java?rev=777730&r1=777729&r2=777730&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AbstractServiceReferenceRecipe.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/AbstractServiceReferenceRecipe.java
Fri May 22 22:38:17 2009
@@ -31,7 +31,7 @@
 import net.sf.cglib.proxy.Dispatcher;
 import net.sf.cglib.proxy.Enhancer;
 import org.apache.geronimo.blueprint.BlueprintConstants;
-import org.apache.geronimo.blueprint.BlueprintContextEventSender;
+import org.apache.geronimo.blueprint.BlueprintEventSender;
 import org.apache.geronimo.blueprint.ExtendedBlueprintContainer;
 import org.apache.geronimo.blueprint.di.AbstractRecipe;
 import org.apache.geronimo.blueprint.di.ConstructionException;
@@ -56,7 +56,7 @@
 public abstract class AbstractServiceReferenceRecipe extends AbstractRecipe implements ServiceListener,
SatisfiableRecipe {
 
     protected final ExtendedBlueprintContainer blueprintContainer;
-    protected final BlueprintContextEventSender sender;
+    protected final BlueprintEventSender sender;
     protected final ServiceReferenceMetadata metadata;
     protected final Recipe listenersRecipe;
     protected List<Listener> listeners;
@@ -66,7 +66,7 @@
     protected boolean optional;
 
     protected AbstractServiceReferenceRecipe(ExtendedBlueprintContainer blueprintContainer,
-                                             BlueprintContextEventSender sender,
+                                             BlueprintEventSender sender,
                                              ServiceReferenceMetadata metadata,
                                              Recipe listenersRecipe) {
         this.blueprintContainer = blueprintContainer;

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=777730&r1=777729&r2=777730&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
Fri May 22 22:38:17 2009
@@ -37,7 +37,7 @@
 
 import org.apache.geronimo.blueprint.BeanProcessor;
 import org.apache.geronimo.blueprint.BlueprintConstants;
-import org.apache.geronimo.blueprint.BlueprintContextEventSender;
+import org.apache.geronimo.blueprint.BlueprintEventSender;
 import org.apache.geronimo.blueprint.ComponentDefinitionRegistryProcessor;
 import org.apache.geronimo.blueprint.Destroyable;
 import org.apache.geronimo.blueprint.ExtendedBeanMetadata;
@@ -113,7 +113,8 @@
     }
 
     private final BundleContext bundleContext;
-    private final BlueprintContextEventSender sender;
+    private final Bundle extenderBundle;
+    private final BlueprintEventSender sender;
     private final NamespaceHandlerRegistry handlers;
     private final List<URL> urls;
     private final boolean lazyActivation;
@@ -135,8 +136,9 @@
     private boolean waitForDependencies = true;
     private ScheduledFuture timeoutFuture;
 
-    public BlueprintContainerImpl(BundleContext bundleContext, BlueprintContextEventSender
sender, NamespaceHandlerRegistry handlers, ScheduledExecutorService executors, List<URL>
urls, boolean lazyActivation) {
+    public BlueprintContainerImpl(BundleContext bundleContext, Bundle extenderBundle, BlueprintEventSender
sender, NamespaceHandlerRegistry handlers, ScheduledExecutorService executors, List<URL>
urls, boolean lazyActivation) {
         this.bundleContext = bundleContext;
+        this.extenderBundle = extenderBundle;
         this.sender = sender;
         this.handlers = handlers;
         this.urls = urls;
@@ -149,6 +151,10 @@
         this.services = Collections.synchronizedMap(new HashMap<ServiceMetadata, ServiceRegistrationProxy>());
     }
 
+    public Bundle getExtenderBundle() {
+        return extenderBundle;
+    }
+
     public Class loadClass(String name) throws ClassNotFoundException {
         return bundleContext.getBundle().loadClass(name);
     }
@@ -161,7 +167,7 @@
         return beanProcessors;
     }
 
-    public BlueprintContextEventSender getSender() {
+    public BlueprintEventSender getSender() {
         return sender;
     }
 
@@ -768,7 +774,7 @@
         return instantiator.getRepository();
     }
     
-    public Converter getConversionService() {
+    public Converter getConverter() {
         return conversionService;
     }
     

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintObjectInstantiator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintObjectInstantiator.java?rev=777730&r1=777729&r2=777730&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintObjectInstantiator.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintObjectInstantiator.java
Fri May 22 22:38:17 2009
@@ -72,7 +72,7 @@
                 Object obj = createInstance(name);
                 try {
                     // Make sure to go through the conversion step in case we have a Convertible
object
-                    obj = ConversionUtils.convert(obj, Object.class, blueprintContainer.getConversionService());
+                    obj = ConversionUtils.convert(obj, Object.class, blueprintContainer.getConverter());
                 } catch (Exception e) {
                     throw new ConstructionException("Unable to convert instance " + name,
e);
                 }

Modified: 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/CollectionBasedServiceReferenceRecipe.java?rev=777730&r1=777729&r2=777730&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/CollectionBasedServiceReferenceRecipe.java
Fri May 22 22:38:17 2009
@@ -33,7 +33,7 @@
 import java.util.SortedSet;
 
 import net.sf.cglib.proxy.Dispatcher;
-import org.apache.geronimo.blueprint.BlueprintContextEventSender;
+import org.apache.geronimo.blueprint.BlueprintEventSender;
 import org.apache.geronimo.blueprint.Destroyable;
 import org.apache.geronimo.blueprint.ExtendedBlueprintContainer;
 import org.apache.geronimo.blueprint.di.ConstructionException;
@@ -68,7 +68,7 @@
     private ManagedCollection collection;
 
     public CollectionBasedServiceReferenceRecipe(ExtendedBlueprintContainer blueprintContainer,
-                                                 BlueprintContextEventSender sender,
+                                                 BlueprintEventSender sender,
                                                  RefCollectionMetadata metadata,
                                                  Recipe listenersRecipe,
                                                  Recipe comparatorRecipe) {

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/DefaultBlueprintContextEventSender.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/DefaultBlueprintContextEventSender.java?rev=777730&r1=777729&r2=777730&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/DefaultBlueprintContextEventSender.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/DefaultBlueprintContextEventSender.java
Fri May 22 22:38:17 2009
@@ -26,7 +26,7 @@
 import java.util.concurrent.Executors;
 
 import org.apache.geronimo.blueprint.BlueprintConstants;
-import org.apache.geronimo.blueprint.BlueprintContextEventSender;
+import org.apache.geronimo.blueprint.BlueprintEventSender;
 import org.apache.geronimo.blueprint.BlueprintStateManager;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -50,7 +50,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 DefaultBlueprintContextEventSender implements BlueprintContextEventSender, EventConstants,
BlueprintStateManager {
+public class DefaultBlueprintContextEventSender implements BlueprintEventSender, EventConstants,
BlueprintStateManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultBlueprintContextEventSender.class);
 
@@ -186,11 +186,15 @@
         props.put(EventConstants.BUNDLE_ID, event.getBundle().getBundleId());
         Version version = getBundleVersion(event.getBundle());
         if (version != null) {
-            props.put(BlueprintConstants.BUNDLE_VERSION, version);
+            props.put(EventConstants.BUNDLE_VERSION, version);
         }
         props.put(EventConstants.EXTENDER_BUNDLE, extenderBundle);
         props.put(EventConstants.EXTENDER_BUNDLE_ID, extenderBundle.getBundleId());
         props.put(EventConstants.EXTENDER_BUNDLE_SYMBOLICNAME, extenderBundle.getSymbolicName());
+        version = getBundleVersion(extenderBundle);
+        if (version != null) {
+            props.put(EventConstants.EXTENDER_BUNDLE_VERSION, version);
+        }
 
         if (event.getException() != null) {
             props.put(EventConstants.EXCEPTION, event.getException());

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=777730&r1=777729&r2=777730&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
Fri May 22 22:38:17 2009
@@ -55,6 +55,7 @@
 import org.osgi.service.blueprint.reflect.RegistrationListener;
 import org.osgi.service.blueprint.reflect.ServiceMetadata;
 import org.osgi.service.blueprint.reflect.ValueMetadata;
+import org.osgi.framework.Bundle;
 
 /**
  * TODO: javadoc
@@ -76,9 +77,10 @@
     private void addBuiltinComponents(DefaultRepository repository) {
         if (blueprintContainer != null) {
             repository.putDefault("blueprintContainer", blueprintContainer);
-            repository.putDefault("bundleContext", blueprintContainer.getBundleContext());
-            repository.putDefault("bundle", blueprintContainer.getBundleContext().getBundle());
-            repository.putDefault("conversionService", blueprintContainer.getConversionService());
+            repository.putDefault("blueprintBundle", blueprintContainer.getBundleContext().getBundle());
+            repository.putDefault("blueprintBundleContext", blueprintContainer.getBundleContext());
+            repository.putDefault("blueprintConverter", blueprintContainer.getConverter());
+            repository.putDefault("blueprintExtenderBundle", blueprintContainer.getExtenderBundle());
         }
     }
     
@@ -364,7 +366,7 @@
     }
     
     protected Converter getConversionService() {
-        return blueprintContainer.getConversionService();
+        return blueprintContainer.getConverter();
     }
     
     private String getName(String name) {

Modified: 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/UnaryServiceReferenceRecipe.java?rev=777730&r1=777729&r2=777730&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/UnaryServiceReferenceRecipe.java
Fri May 22 22:38:17 2009
@@ -21,7 +21,7 @@
 import java.lang.reflect.Type;
 
 import net.sf.cglib.proxy.Dispatcher;
-import org.apache.geronimo.blueprint.BlueprintContextEventSender;
+import org.apache.geronimo.blueprint.BlueprintEventSender;
 import org.apache.geronimo.blueprint.ExtendedBlueprintContainer;
 import org.apache.geronimo.blueprint.di.ConstructionException;
 import org.apache.geronimo.blueprint.di.Recipe;
@@ -54,7 +54,7 @@
     private final Object monitor = new Object();
 
     public UnaryServiceReferenceRecipe(ExtendedBlueprintContainer blueprintContainer,
-                                       BlueprintContextEventSender sender,
+                                       BlueprintEventSender sender,
                                        ReferenceMetadata metadata,
                                        Recipe listenersRecipe) {
         super(blueprintContainer,  sender, metadata, listenersRecipe);

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/DefaultExecutionContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/DefaultExecutionContext.java?rev=777730&r1=777729&r2=777730&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/DefaultExecutionContext.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/DefaultExecutionContext.java
Fri May 22 22:38:17 2009
@@ -174,7 +174,7 @@
     }
 
     public Object convert(Object value, Type type) throws Exception {
-        return ConversionUtils.convert(value, type, blueprintContainer.getConversionService());
+        return ConversionUtils.convert(value, type, blueprintContainer.getConverter());
     }
 
     private static Map<String, Class> primitiveClasses = new HashMap<String, Class>();

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/TestBlueprintContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/TestBlueprintContainer.java?rev=777730&r1=777729&r2=777730&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/TestBlueprintContainer.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/TestBlueprintContainer.java
Fri May 22 22:38:17 2009
@@ -26,7 +26,7 @@
     private ComponentDefinitionRegistryImpl registry;
     
     public TestBlueprintContainer(ComponentDefinitionRegistryImpl registry) {
-        super(new TestBundleContext(), null, null, null, null, false);
+        super(new TestBundleContext(), null, null, null, null, null, false);
         this.registry = registry;
     }
 

Modified: geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml?rev=777730&r1=777729&r2=777730&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml
(original)
+++ geronimo/sandbox/blueprint/blueprint-sample/src/main/resources/OSGI-INF/blueprint/config.xml
Fri May 22 22:38:17 2009
@@ -48,7 +48,7 @@
 
     <bean id="bar" class="org.apache.geronimo.blueprint.sample.Bar">
         <property name="value"><value>Hello FooBar</value></property>
-        <property name="context" ref="bundleContext"/>
+        <property name="context" ref="blueprintBundleContext"/>
         <property name="list">
             <list>
                 <value>a list element</value>



Mime
View raw message