You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/06/27 11:17:09 UTC

svn commit: r1140065 - /tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java

Author: antelder
Date: Mon Jun 27 09:17:09 2011
New Revision: 1140065

URL: http://svn.apache.org/viewvc?rev=1140065&view=rev
Log:
Make DeployedComposite set the Contribution ClassLoader when a composite is started. It feels like there should be a better place for this to be happening, perhaps in the builder somewhere but for now this ensures that a composite's contribution will have a classloader set after the a composite is started.

Modified:
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java?rev=1140065&r1=1140064&r2=1140065&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/DeployedComposite.java Mon Jun 27 09:17:09 2011
@@ -34,6 +34,8 @@ import org.apache.tuscany.sca.assembly.i
 import org.apache.tuscany.sca.context.CompositeContext;
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.resolver.ClassReference;
+import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.deployment.Deployer;
 import org.apache.tuscany.sca.monitor.Monitor;
@@ -103,6 +105,10 @@ public class DeployedComposite {
         builtComposite.setName(composite.getName());
         builtComposite.setURI(composite.getURI());
         builtComposite.setContributionURI(composite.getContributionURI());
+        
+        if (contribution.getClassLoader() == null) {
+            contribution.setClassLoader((ClassLoader)((ExtensibleModelResolver)contribution.getModelResolver()).getModelResolverInstance(ClassReference.class));        
+        }
 
         compositeContext = new CompositeContext(extensionPointRegistry, 
                                                 domainRegistry,