You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/06/13 22:51:50 UTC
svn commit: r547027 - in /incubator/tuscany/java/sca/modules/topology/src:
main/java/org/apache/tuscany/sca/topology/
main/java/org/apache/tuscany/sca/topology/impl/
test/java/org/apache/tuscany/sca/topology/
Author: jsdelfino
Date: Wed Jun 13 13:51:49 2007
New Revision: 547027
URL: http://svn.apache.org/viewvc?view=rev&rev=547027
Log:
Renamed processor to node and removed component mapping info, as it's probably better to keep it separate for now.
Added:
incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/NodeImplementation.java
- copied, changed from r547001, incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/ProcessorImplementation.java
incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImplementationImpl.java
- copied, changed from r547001, incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ProcessorImplementationImpl.java
Removed:
incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/ProcessorImplementation.java
incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ProcessorImplementationImpl.java
Modified:
incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java
incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java
incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java
Copied: incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/NodeImplementation.java (from r547001, incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/ProcessorImplementation.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/NodeImplementation.java?view=diff&rev=547027&p1=incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/ProcessorImplementation.java&r1=547001&p2=incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/NodeImplementation.java&r2=547027
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/ProcessorImplementation.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/NodeImplementation.java Wed Jun 13 13:51:49 2007
@@ -19,23 +19,13 @@
package org.apache.tuscany.sca.topology;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.Implementation;
/**
- * Represents an SCA processor implementation.
+ * Represents an SCA node implementation.
*
* @version $Rev$ $Date$
*/
-public interface ProcessorImplementation extends Implementation {
+public interface NodeImplementation extends Implementation {
- /**
- * A list containing the SCA components allocated to this processor.
- * @return a list of SCA components allocated to this processor
- */
-
- List<Component> getComponents();
-
}
Modified: incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java?view=diff&rev=547027&r1=547026&r2=547027
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/TopologyFactory.java Wed Jun 13 13:51:49 2007
@@ -27,9 +27,9 @@
public interface TopologyFactory {
/**
- * Creates a new processor implementation.
+ * Creates a new node implementation.
* @return
*/
- ProcessorImplementation createProcessorImplementation();
+ NodeImplementation createNodeImplementation();
}
Copied: incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImplementationImpl.java (from r547001, incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ProcessorImplementationImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImplementationImpl.java?view=diff&rev=547027&p1=incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ProcessorImplementationImpl.java&r1=547001&p2=incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImplementationImpl.java&r2=547027
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ProcessorImplementationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/NodeImplementationImpl.java Wed Jun 13 13:51:49 2007
@@ -29,14 +29,14 @@
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.topology.ProcessorImplementation;
+import org.apache.tuscany.sca.topology.NodeImplementation;
/**
- * Represents an SCA processor component implementation.
+ * Represents an SCA node implementation.
*
* @version $Rev$ $Date$
*/
-public class ProcessorImplementationImpl implements ProcessorImplementation {
+public class NodeImplementationImpl implements NodeImplementation {
private List<Component> components = new ArrayList<Component>();
private List<Property> properties = new ArrayList<Property>();
@@ -50,9 +50,9 @@
private String uri;
/**
- * Constructs a new processor implementation.
+ * Constructs a new node implementation.
*/
- protected ProcessorImplementationImpl() {
+ protected NodeImplementationImpl() {
}
public List<Component> getComponents() {
Modified: incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java?view=diff&rev=547027&r1=547026&r2=547027
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/TopologyFactoryImpl.java Wed Jun 13 13:51:49 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.topology.impl;
-import org.apache.tuscany.sca.topology.ProcessorImplementation;
+import org.apache.tuscany.sca.topology.NodeImplementation;
import org.apache.tuscany.sca.topology.TopologyFactory;
/**
@@ -29,8 +29,8 @@
*/
public class TopologyFactoryImpl implements TopologyFactory {
- public ProcessorImplementation createProcessorImplementation() {
- return new ProcessorImplementationImpl();
+ public NodeImplementation createNodeImplementation() {
+ return new NodeImplementationImpl();
}
}
Modified: incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java?view=diff&rev=547027&r1=547026&r2=547027
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java Wed Jun 13 13:51:49 2007
@@ -38,29 +38,14 @@
TopologyFactory factory;
AssemblyFactory assemblyFactory;
- Component calculatorServiceComponent;
- Component addServiceComponent;
- Component subtractServiceComponent;
-
public void setUp() throws Exception {
factory = new DefaultTopologyFactory();
assemblyFactory = new DefaultAssemblyFactory();
-
- // Create test components, they would normally be given from an SCA domain
- calculatorServiceComponent = assemblyFactory.createComponent();
- calculatorServiceComponent.setName("CalculatorServiceComponent");
- addServiceComponent = assemblyFactory.createComponent();
- addServiceComponent.setName("AddServiceComponent");
- subtractServiceComponent = assemblyFactory.createComponent();
- subtractServiceComponent.setName("SubtractServiceComponent");
}
public void tearDown() throws Exception {
factory = null;
assemblyFactory = null;
- calculatorServiceComponent = null;
- addServiceComponent = null;
- subtractServiceComponent = null;
}
public void testCreateTopology() {
@@ -69,34 +54,19 @@
Composite topology = assemblyFactory.createComposite();
topology.setName(new QName("http://my.network", "MyTopology"));
- // Create SCA processor A implementation
- // Configure it to run CalculatorServiceComponent
- ProcessorImplementation implA = factory.createProcessorImplementation();
- implA.getComponents().add(calculatorServiceComponent);
-
- // Create SCA processor B implementation
- // Configure it to run Add and SubtractServiceComponent
- ProcessorImplementation implB = factory.createProcessorImplementation();
- implB.getComponents().add(addServiceComponent);
- implB.getComponents().add(subtractServiceComponent);
-
- // Create SCA processor A
- Component processorA = assemblyFactory.createComponent();
- processorA.setName("ProcessorA");
- processorA.setImplementation(implA);
- topology.getComponents().add(processorA);
-
-// // Create SCA processor APrime
-// Component processorAPrime = assemblyFactory.createComponent();
-// processorAPrime.setName("ProcessorAPrime");
-// processorAPrime.setImplementation(implA);
-// topology.getComponents().add(processorAPrime);
+ // Create SCA node A
+ Component nodeA = assemblyFactory.createComponent();
+ nodeA.setName("NodeA");
+ NodeImplementation implA = factory.createNodeImplementation();
+ nodeA.setImplementation(implA);
+ topology.getComponents().add(nodeA);
- // Create SCA processor B
- Component processorB = assemblyFactory.createComponent();
- processorB.setName("ProcessorB");
- processorB.setImplementation(implB);
- topology.getComponents().add(processorB);
+ // Create SCA node B
+ Component nodeB = assemblyFactory.createComponent();
+ nodeB.setName("NodeB");
+ NodeImplementation implB = factory.createNodeImplementation();
+ nodeB.setImplementation(implB);
+ topology.getComponents().add(nodeB);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org