[jboss-osgi-commits] JBoss-OSGI SVN: r90426 - in projects/jboss-osgi/trunk/blueprint: impl/src/main/java/org/jboss/osgi/blueprint/reflect and 2 other directories.

jboss-osgi-commits at lists.jboss.org jboss-osgi-commits at lists.jboss.org
Thu Jun 18 10:16:15 EDT 2009


Author: thomas.diesler at jboss.com
Date: 2009-06-18 10:16:14 -0400 (Thu, 18 Jun 2009)
New Revision: 90426

Modified:
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/BeanManager.java
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/BlueprintContainerImpl.java
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/ServiceManager.java
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BlueprintMetadata.java
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentFactory.java
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentMetadataImpl.java
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceReferenceMetadataImpl.java
   projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanA.java
   projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanB.java
   projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd
Log:
KernelBeans get installed

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -27,6 +27,7 @@
 
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.osgi.common.log.LogServiceTracker;
 import org.jboss.osgi.spi.service.MicrocontainerService;
 import org.osgi.framework.BundleContext;
@@ -79,6 +80,11 @@
       return component.getInitialization();
    }
    
+   public void install()
+   {
+      log.log(LogService.LOG_DEBUG, "install: " + component);
+   }
+   
    public void activate()
    {
       log.log(LogService.LOG_DEBUG, "activate: " + component);
@@ -89,12 +95,13 @@
       log.log(LogService.LOG_DEBUG, "shutdown: " + component);
    }
    
-   protected void installKernelBean(BeanMetaData kernelBean)
+   protected KernelControllerContext installKernelBean(BeanMetaData kernelBean)
    {
-      KernelController controller = getKernelController();
       try
       {
-         controller.install(kernelBean);
+         KernelControllerContext ctrlContext = getKernelController().install(kernelBean);
+         log.log(LogService.LOG_DEBUG, "installed: " + ctrlContext);
+         return ctrlContext;
       }
       catch (RuntimeException rte)
       {
@@ -108,8 +115,8 @@
 
    protected void uninstallKernelBean(BeanMetaData kernelBean)
    {
-      KernelController controller = getKernelController();
-      controller.uninstall(kernelBean);
+      getKernelController().uninstall(kernelBean.getName());
+      log.log(LogService.LOG_DEBUG, "uninstalled: " + kernelBean.getName());
    }
 
    protected KernelController getKernelController()
@@ -120,6 +127,9 @@
       
       MicrocontainerService service = (MicrocontainerService)context.getService(sref);
       KernelController controller = service.getRegisteredBean(KernelController.class, BEAN_KERNEL_CONTROLLER);
+      if (controller == null)
+         throw new IllegalStateException("Cannot obtain KernelController");
+      
       return controller;
    }
 

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/BeanManager.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/BeanManager.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/BeanManager.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -23,7 +23,6 @@
 
 //$Id$
 
-
 import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
@@ -63,9 +62,9 @@
    }
 
    @Override
-   public void activate()
+   public void install()
    {
-      super.activate();
+      super.install();
 
       kernelBean = getKernelBean(beanMetadata);
       installKernelBean(kernelBean);
@@ -76,7 +75,7 @@
    {
       if (kernelBean != null)
          uninstallKernelBean(kernelBean);
-         
+
       super.shutdown();
    }
 
@@ -84,7 +83,7 @@
    {
       String name = compMetadata.getKey();
       String clazz = compMetadata.getClassName();
-      
+
       BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, clazz);
       return builder.getBeanMetaData();
    }

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/BlueprintContainerImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/BlueprintContainerImpl.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/BlueprintContainerImpl.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -67,17 +67,17 @@
  * @author thomas.diesler at jboss.com
  * @since 17-Jun-2009
  */
-public class BlueprintContainerImpl implements BlueprintContainer 
+public class BlueprintContainerImpl implements BlueprintContainer
 {
    public static final String HEADER_BUNDLE_BLUEPRINT = "Bundle-Blueprint";
    public static final String PROPERTY_BLUEPRINT_BUNDLE_SYMBOLIC_NAME = "osgi.blueprint.container.symbolicname";
    public static final String PROPERTY_BLUEPRINT_BUNDLE_VERSION = "osgi.blueprint.container.version";
-   
+
    private BundleContext context;
    private Bundle bundle;
-   
+
    private Map<String, AbstractManager> managers = new LinkedHashMap<String, AbstractManager>();
-   
+
    public BlueprintContainerImpl(BundleContext context, Bundle bundle)
    {
       this.context = context;
@@ -88,34 +88,31 @@
    {
       // The Blueprint Container parses the definitions into metadata objects.
       BlueprintMetadata bpMetadata = getBlueprintMetadata();
-      
-      // For each of the ComponentMetadata objects, the Blueprint Container 
+
+      // For each of the ComponentMetadata objects, the Blueprint Container
       // has a corresponding component manager.
       createManagers(bpMetadata);
-      
+
       // If the Blueprint Container has successfully activated the eager managers, it
       // will register a Blueprint Container service.
       registerBlueprintContainerService();
    }
 
    /*
-    * When the Blueprint Container must be destroyed because the Blueprint
-    * bundle has stopped, there is a failure, or the Blueprint extender is stopped,
-    * then the Blueprint Container service is unregistered and all managers are
-    * deactivated. This will unregister any services and listeners, which release
-    * the component instances. Then all component instances are destroyed in
-    * reverse dependency order. That is, a component instance is destroyed when
-    * no other component instances depends on it.
+    * When the Blueprint Container must be destroyed because the Blueprint bundle has stopped, there is a failure, or the Blueprint extender is stopped, then the
+    * Blueprint Container service is unregistered and all managers are deactivated. This will unregister any services and listeners, which release the component
+    * instances. Then all component instances are destroyed in reverse dependency order. That is, a component instance is destroyed when no other component instances
+    * depends on it.
     */
    public void shutdown()
    {
       List<AbstractManager> list = new ArrayList<AbstractManager>(managers.values());
       Collections.reverse(list);
-      
+
       for (AbstractManager manager : list)
          manager.shutdown();
    }
-   
+
    public BundleContext getBundleContext()
    {
       return bundle.getBundleContext();
@@ -136,7 +133,7 @@
       AbstractManager manager = managers.get(name);
       if (manager == null)
          throw new NoSuchComponentException(name);
-      
+
       return manager.getComponentMetadata();
    }
 
@@ -157,12 +154,12 @@
    {
       throw new NotImplementedException();
    }
-   
+
    private void registerBlueprintContainerService()
    {
       String symbolicName = bundle.getSymbolicName();
       String version = (String)bundle.getHeaders().get(Constants.BUNDLE_VERSION);
-      
+
       Properties props = new Properties();
       props.setProperty(PROPERTY_BLUEPRINT_BUNDLE_SYMBOLIC_NAME, symbolicName);
       props.setProperty(PROPERTY_BLUEPRINT_BUNDLE_VERSION, version);
@@ -174,7 +171,7 @@
       for (ComponentMetadata comp : bpMetadata.getComponents())
       {
          AbstractManager manager = AbstractManager.createManager(context, comp);
-         
+
          String key = manager.getId();
          if (key == null)
             throw new IllegalStateException("Component id cannot be null for: " + comp);
@@ -183,10 +180,14 @@
          // That is, it is an error if the same id is used multiple times.
          if (managers.get(key) != null)
             throw new IllegalStateException("Duplicate top-level component: " + key);
-         
+
          managers.put(key, manager);
       }
-      
+
+      // Invoke install for every manager 
+      for (AbstractManager manager : managers.values())
+         manager.install();
+
       // Activated the eager managers
       for (AbstractManager manager : managers.values())
       {

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/ServiceManager.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/ServiceManager.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/ServiceManager.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -23,8 +23,13 @@
 
 //$Id$
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import org.jboss.osgi.blueprint.reflect.ServiceMetadataImpl;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.blueprint.reflect.BeanMetadata;
 import org.osgi.service.blueprint.reflect.ServiceMetadata;
 
@@ -41,7 +46,9 @@
 public class ServiceManager extends AbstractManager
 {
    private ServiceMetadataImpl serviceMetadata;
-   private AbstractManager beanManager;
+   
+   private BeanManager anonymousBean;
+   private List<ServiceRegistration> serviceRegs = new ArrayList<ServiceRegistration>(); 
 
    public ServiceManager(BundleContext context, ServiceMetadata compMetadata)
    {
@@ -49,26 +56,50 @@
       this.serviceMetadata = (ServiceMetadataImpl)compMetadata;
 
       // Create the anonymous bean manager
-      BeanMetadata beanMetadata = serviceMetadata.getBeanMetadata();
+      BeanMetadata beanMetadata = (BeanMetadata)serviceMetadata.getServiceComponent();
       if (beanMetadata != null)
-         beanManager = (AbstractManager)AbstractManager.createManager(context, beanMetadata);         
+         anonymousBean = (BeanManager)AbstractManager.createManager(context, beanMetadata);         
    }
 
    @Override
+   public void install()
+   {
+      super.install();
+      
+      if (anonymousBean != null)
+         anonymousBean.install();
+   }
+
+   @Override
    public void activate()
    {
       super.activate();
       
-      if (beanManager != null)
-         beanManager.activate();
+      BeanManager beanManager = anonymousBean;
+      if (beanManager == null)
+      {
+      }
+      
+      // Register the services
+      for (String interf : serviceMetadata.getInterfaces())
+      {
+         //ServiceRegistration sreg = context.registerService(interf, this, null);
+         //serviceRegs.add(sreg);
+      }
    }
 
    @Override
    public void shutdown()
    {
-      if (beanManager != null)
-         beanManager.shutdown();
+      // Unregister the services
+      List<ServiceRegistration> list = new ArrayList<ServiceRegistration>(serviceRegs);
+      Collections.reverse(list);
+      for (ServiceRegistration sreg : list)
+         sreg.unregister();
       
+      if (anonymousBean != null)
+         anonymousBean.shutdown();
+      
       super.shutdown();
    }
 }
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BeanMetadataImpl.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -45,14 +45,14 @@
    private ComponentMetadata parent;
    private TBean tBean;
    
-   public BeanMetadataImpl(BundleContext context, TBean tBean)
+   public BeanMetadataImpl(BundleContext context, BlueprintMetadata blueprint, TBean tBean)
    {
-      this(context, null, tBean);
+      this(context, blueprint, null, tBean);
    }
 
-   public BeanMetadataImpl(BundleContext context, ComponentMetadata parent, TBean tBean)
+   public BeanMetadataImpl(BundleContext context, BlueprintMetadata blueprint, ComponentMetadata parent, TBean tBean)
    {
-      super(context, tBean);
+      super(context, blueprint, tBean);
       this.parent = parent;
       this.tBean = tBean;
    }

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BlueprintMetadata.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BlueprintMetadata.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/BlueprintMetadata.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -33,6 +33,7 @@
 import org.jboss.osgi.blueprint.parser.xb.TComponent;
 import org.jboss.osgi.spi.NotImplementedException;
 import org.osgi.framework.BundleContext;
+import org.osgi.service.blueprint.container.NoSuchComponentException;
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
 
 /**
@@ -63,7 +64,7 @@
 
    public void initialize()
    {
-      ComponentFactory factory = new ComponentFactory(context);
+      ComponentFactory factory = new ComponentFactory(context, this);
       for (TComponent tComp : tBlueprint.getComponents())
       {
          ComponentMetadata comp = factory.createComponent(tComp);
@@ -78,6 +79,15 @@
       }
    }
 
+   public ComponentMetadata getComponent(String name)
+   {
+      ComponentMetadata comp = components.get(name);
+      if (comp == null)
+         throw new NoSuchComponentException(name);
+      
+      return comp;
+   }
+
    public List<ComponentMetadata> getComponents()
    {
       ArrayList<ComponentMetadata> list = new ArrayList<ComponentMetadata>(components.values());

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentFactory.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentFactory.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentFactory.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -39,11 +39,13 @@
 public class ComponentFactory
 {
    private BundleContext context;
+   private BlueprintMetadata blueprint;
    private int anonymousId;
 
-   public ComponentFactory(BundleContext context)
+   public ComponentFactory(BundleContext context, BlueprintMetadata blueprint)
    {
       this.context = context;
+      this.blueprint = blueprint;
    }
 
    public ComponentMetadata createComponent(TComponent tComp)
@@ -59,13 +61,13 @@
          tComp.setId(".anonymousId#" + (++anonymousId));
       
       if (tComp instanceof TBean)
-         comp = new BeanMetadataImpl(context, parent, (TBean)tComp);
+         comp = new BeanMetadataImpl(context, blueprint, parent, (TBean)tComp);
       
       else if (tComp instanceof TService)
-         comp = new ServiceMetadataImpl(context, (TService)tComp);
+         comp = new ServiceMetadataImpl(context, blueprint, (TService)tComp);
       
       else if (tComp instanceof TServiceReference)
-         comp = new ServiceReferenceMetadataImpl(context, (TServiceReference)tComp);
+         comp = new ServiceReferenceMetadataImpl(context, blueprint, (TServiceReference)tComp);
       
       if (comp == null)
          throw new IllegalArgumentException("Unsupported component type: " + tComp);

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentMetadataImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentMetadataImpl.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ComponentMetadataImpl.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -38,11 +38,13 @@
 public class ComponentMetadataImpl implements ComponentMetadata
 {
    protected BundleContext context;
+   protected BlueprintMetadata blueprint;
    protected TComponent tComp;
 
-   public ComponentMetadataImpl(BundleContext context, TComponent tComp)
+   public ComponentMetadataImpl(BundleContext context, BlueprintMetadata blueprint, TComponent tComp)
    {
       this.context = context;
+      this.blueprint = blueprint;
       this.tComp = tComp;
    }
 

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceMetadataImpl.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -47,9 +47,9 @@
    private TService tService;
    private BeanMetadata beanMetadata;
    
-   public ServiceMetadataImpl(BundleContext context, TService tService)
+   public ServiceMetadataImpl(BundleContext context, BlueprintMetadata blueprint, TService tService)
    {
-      super(context, tService);
+      super(context, blueprint, tService);
       this.tService = tService;
    }
 
@@ -85,24 +85,30 @@
 
    public Target getServiceComponent()
    {
-      throw new NotImplementedException();
+      if (beanMetadata == null)
+      {
+         if (tService.getBean() != null)
+         {
+            ComponentFactory factory = new ComponentFactory(context, blueprint);
+            beanMetadata = (BeanMetadata)factory.createComponent(this, tService.getBean(), true);
+         }
+         //else if (tService.getRef() != null)
+         //{
+         //   beanMetadata = (BeanMetadata)blueprint.getComponent(tService.getRef());
+         //}
+      }
+      
+      //if (beanMetadata == null)
+      //   throw new IllegalStateException("Cannot get service component");
+      
+      return beanMetadata;
    }
 
    public List<MapEntry> getServiceProperties()
    {
       throw new NotImplementedException();
    }
-
-   public BeanMetadata getBeanMetadata()
-   {
-      if (beanMetadata == null && tService.getBean() != null)
-      {
-         ComponentFactory factory = new ComponentFactory(context);
-         beanMetadata = (BeanMetadata)factory.createComponent(this, tService.getBean(), true);
-      }
-      return beanMetadata;
-   }
-
+   
    public String toString()
    {
       return "Service[id=" + getId() + "]";

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceReferenceMetadataImpl.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceReferenceMetadataImpl.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/reflect/ServiceReferenceMetadataImpl.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -43,9 +43,9 @@
 {
    private TServiceReference tService;
    
-   public ServiceReferenceMetadataImpl(BundleContext context, TServiceReference tService)
+   public ServiceReferenceMetadataImpl(BundleContext context, BlueprintMetadata blueprint, TServiceReference tService)
    {
-      super(context, tService);
+      super(context, blueprint, tService);
       this.tService = tService;
    }
 

Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanA.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanA.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanA.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -37,6 +37,11 @@
    private MBeanServer mbeanServer;
    private BeanB beanB;
 
+   public BeanA()
+   {
+      System.out.println("new BeanA");
+   }
+
    public MBeanServer getMbeanServer()
    {
       return mbeanServer;
@@ -44,6 +49,7 @@
 
    public void setMbeanServer(MBeanServer mbeanServer)
    {
+      System.out.println("BeanA: setMbeanServer");
       this.mbeanServer = mbeanServer;
    }
 
@@ -54,6 +60,7 @@
 
    public void setBeanB(BeanB beanB)
    {
+      System.out.println("BeanA: setBeanB");
       this.beanB = beanB;
    }
 }
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanB.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanB.java	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/bundle/BeanB.java	2009-06-18 14:16:14 UTC (rev 90426)
@@ -34,6 +34,11 @@
 {
    private BeanA beanA;
 
+   public BeanB()
+   {
+      System.out.println("new BeanB");
+   }
+
    public BeanA getBeanA()
    {
       return beanA;
@@ -41,6 +46,7 @@
 
    public void setBeanA(BeanA beanA)
    {
+      System.out.println("BeanB: setBeanA");
       this.beanA = beanA;
    }
 }
\ No newline at end of file

Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd	2009-06-18 14:11:06 UTC (rev 90425)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/container/container-basic.bnd	2009-06-18 14:16:14 UTC (rev 90426)
@@ -2,7 +2,7 @@
 
 Bundle-SymbolicName: container-basic
 
-Export-Package: org.jboss.test.osgi.blueprint.container
+Export-Package: org.jboss.test.osgi.blueprint.container, org.jboss.test.osgi.blueprint.container.bundle
 
 Private-Package: org.jboss.test.osgi.blueprint.container.bundle
 




More information about the jboss-osgi-commits mailing list