2 files changed, 22 insertions, 21 deletions
diff --git a/branches/sca-java-2.0-M4/modules/core/META-INF/MANIFEST.MF b/branches/sca-java-2.0-M4/modules/core/META-INF/MANIFEST.MF
index 98800de77d..5205527437 100644
--- a/branches/sca-java-2.0-M4/modules/core/META-INF/MANIFEST.MF
+++ b/branches/sca-java-2.0-M4/modules/core/META-INF/MANIFEST.MF
@@ -1,5 +1,7 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.core.assembly;version="2.0.0";uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core",
+Export-Package: org.apache.tuscany.sca.core.assembly;version="2.0.0";
+ uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core",
+ org.apache.tuscany.sca.core.assembly.impl;version="2.0.0";scope=internal;mandatory:=scope,
  org.apache.tuscany.sca.core.context;version="2.0.0";
   uses:="javax.xml.stream,
    org.apache.tuscany.sca.runtime,
diff --git a/branches/sca-java-2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/branches/sca-java-2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
index 1c4ded13fc..ecc1a4e599 100644
--- a/branches/sca-java-2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
+++ b/branches/sca-java-2.0-M4/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
@@ -497,7 +497,26 @@ public class CompositeActivatorImpl implements CompositeActivator {
         }
 
         compositeContext.bindComponent(runtimeComponent);
+        Implementation implementation = component.getImplementation();
+        
+        if (implementation instanceof Composite) {
+            start(compositeContext, (Composite)implementation);
+        } else {
+            for (PolicyProvider policyProvider : runtimeComponent.getPolicyProviders()) {
+                policyProvider.start();
+            }
+            ImplementationProvider implementationProvider = runtimeComponent.getImplementationProvider();
+            if (implementationProvider != null) {
+                implementationProvider.start();
+            }
+        }
 
+        if (component instanceof ScopedRuntimeComponent) {
+            ScopedRuntimeComponent scopedRuntimeComponent = (ScopedRuntimeComponent)component;
+            if (scopedRuntimeComponent.getScopeContainer() != null) {
+                scopedRuntimeComponent.getScopeContainer().start();
+            }
+        }
         // Reference bindings aren't started until the wire is first used
 
         for (ComponentService service : component.getServices()) {
@@ -526,26 +545,6 @@ public class CompositeActivatorImpl implements CompositeActivator {
             }
         }
 
-        Implementation implementation = component.getImplementation();
-        if (implementation instanceof Composite) {
-            start(compositeContext, (Composite)implementation);
-        } else {
-            for (PolicyProvider policyProvider : runtimeComponent.getPolicyProviders()) {
-                policyProvider.start();
-            }
-            ImplementationProvider implementationProvider = runtimeComponent.getImplementationProvider();
-            if (implementationProvider != null) {
-                implementationProvider.start();
-            }
-        }
-
-        if (component instanceof ScopedRuntimeComponent) {
-            ScopedRuntimeComponent scopedRuntimeComponent = (ScopedRuntimeComponent)component;
-            if (scopedRuntimeComponent.getScopeContainer() != null) {
-                scopedRuntimeComponent.getScopeContainer().start();
-            }
-        }
-
         runtimeComponent.setStarted(true);
     }