You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/06/21 19:12:27 UTC

svn commit: r549551 - in /incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed: core/DistributedCompositeActivatorImpl.java host/impl/NodeServiceRuntime.java host/impl/NodeServiceRuntimeBuilder.java

Author: slaws
Date: Thu Jun 21 10:12:23 2007
New Revision: 549551

URL: http://svn.apache.org/viewvc?view=rev&rev=549551
Log:
bring up to speed with changes to the ReallySmallRuntime

Modified:
    incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/core/DistributedCompositeActivatorImpl.java
    incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeServiceRuntime.java
    incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeServiceRuntimeBuilder.java

Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/core/DistributedCompositeActivatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/core/DistributedCompositeActivatorImpl.java?view=diff&rev=549551&r1=549550&r2=549551
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/core/DistributedCompositeActivatorImpl.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/core/DistributedCompositeActivatorImpl.java Thu Jun 21 10:12:23 2007
@@ -140,7 +140,21 @@
                         
                         // check if reference and service are operating on 
                         // different nodes 
-                        if ( !referenceNode.equals(serviceNode) ) {
+                        if ( referenceNode == null ) {
+                            // if the reference component hasn't been assigned to a particular
+                            // node then it may be valid to let it run everywhere. For now
+                            // raise an exception
+                            throw new CompositeBuilderException("Component " +
+                                                                sourceComponent.getName() + 
+                                                                " is not assigned to a node");
+                        } else if ( serviceNode == null) {
+                            // if the service component hasn't been assigned to a particular
+                            // node then it may be valid to let it run everywhere. For now
+                            // raise an exception
+                            throw new CompositeBuilderException("Component " +
+                                                                targetComponent.getName() + 
+                                                                " is not assigned to a node");                            
+                        } else if ( !referenceNode.equals(serviceNode) ) {
                             // TODO - need to check if the service
                             // interface is remoteable
                            

Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeServiceRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeServiceRuntime.java?view=diff&rev=549551&r1=549550&r2=549551
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeServiceRuntime.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeServiceRuntime.java Thu Jun 21 10:12:23 2007
@@ -28,6 +28,7 @@
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.DefaultSCABindingFactory;
 import org.apache.tuscany.sca.assembly.SCABindingFactory;
+import org.apache.tuscany.sca.contribution.ContributionFactory;
 import org.apache.tuscany.sca.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
@@ -75,7 +76,8 @@
     }
     
     /**
-     * The node service runtime uses a bog standards composite activator
+     * The node service runtime uses a bog standard composite activator
+     * 
      * @param registry
      * @param assemblyFactory
      * @param scaBindingFactory
@@ -103,18 +105,21 @@
                                            wireProcessor,
                                            providerFactories);
 
-}    
+    }    
     
     /**
      *  Use the node service runtime builder. The only thing that is different is
      *  that the .node document processor is added instead of .composite
      */
-    public  ContributionService createContributionService(ExtensionPointRegistry registry,
-                                                          AssemblyFactory assemblyFactory,
-                                                          PolicyFactory policyFactory,
-                                                          InterfaceContractMapper mapper)
+    @Override
+    public ContributionService createContributionService(ExtensionPointRegistry registry,
+                                                         ContributionFactory contributionFactory,
+                                                         AssemblyFactory assemblyFactory,
+                                                         PolicyFactory policyFactory,
+                                                         InterfaceContractMapper mapper)
       throws ActivationException {        
         return NodeServiceRuntimeBuilder.createContributionService(registry,
+                                                                   contributionFactory,
                                                                    assemblyFactory,
                                                                    policyFactory,
                                                                    mapper);        

Modified: incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeServiceRuntimeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeServiceRuntimeBuilder.java?view=diff&rev=549551&r1=549550&r2=549551
==============================================================================
--- incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeServiceRuntimeBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/distributed/src/main/java/org/apache/tuscany/sca/distributed/host/impl/NodeServiceRuntimeBuilder.java Thu Jun 21 10:12:23 2007
@@ -94,7 +94,7 @@
  * options are required to run and manage the node. 
  *
  */
-public class NodeServiceRuntimeBuilder extends ReallySmallRuntimeBuilder {
+public class NodeServiceRuntimeBuilder {
 
 
     /**
@@ -103,9 +103,10 @@
      * @throws ActivationException
      */
     public static ContributionService createContributionService(ExtensionPointRegistry registry,
-                                                                AssemblyFactory assemblyFactory,
-                                                                PolicyFactory policyFactory,
-                                                                InterfaceContractMapper mapper)
+                                                          ContributionFactory contributionFactory,
+                                                          AssemblyFactory assemblyFactory,
+                                                          PolicyFactory policyFactory,
+                                                          InterfaceContractMapper mapper)
         throws ActivationException {
 
         XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
@@ -154,7 +155,6 @@
             throw new ActivationException(e);
         }
 
-        ContributionFactory contributionFactory = new ContributionFactoryImpl();
         ExtensibleURLArtifactProcessor documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors);
         ContributionService contributionService = new ContributionServiceImpl(repository, packageProcessor,
                                                                               documentProcessor, assemblyFactory,



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org