From b86df0964ee1afd9ae69871930744e1570a43129 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 24 May 2010 10:03:37 +0000
Subject: Move all use of NodeFactory out of section10 class and associated
 code cleanup

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@947583 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca/something/impl/DeployedComposite.java      | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'sca-java-2.x/contrib/modules/section10/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java')

diff --git a/sca-java-2.x/contrib/modules/section10/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java b/sca-java-2.x/contrib/modules/section10/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java
index 09d59589d9..4f6f3f8b9f 100644
--- a/sca-java-2.x/contrib/modules/section10/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java
+++ b/sca-java-2.x/contrib/modules/section10/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java
@@ -43,9 +43,9 @@ import org.oasisopen.sca.ServiceRuntimeException;
 public class DeployedComposite {
     
     private String uri;
-    private Composite c; 
-    private InstalledContribution ic; 
-    private List<Contribution> dependedOnContributionURIs;
+    private Composite composite; 
+    private InstalledContribution installedContribution; 
+    private List<Contribution> dependedOnContributions;
     private Composite domainComposite; // TODO: this is misleadingly named
     
     private CompositeActivator compositeActivator;
@@ -55,17 +55,17 @@ public class DeployedComposite {
     private EndpointRegistry endpointRegistry;
     private ExtensionPointRegistry extensionPointRegistry;
 
-    public DeployedComposite(Composite c,
+    public DeployedComposite(Composite composite,
                              InstalledContribution ic,
-                             List<Contribution> dependedOnContributionURIs,
+                             List<Contribution> dependedOnContributions,
                              Deployer deployer,
                              CompositeActivator compositeActivator,
                              MonitorFactory monitorFactory,
                              EndpointRegistry endpointRegistry,
                              ExtensionPointRegistry extensionPointRegistry) throws ActivationException {
-        this.c = c;
-        this.ic = ic;
-        this.dependedOnContributionURIs = dependedOnContributionURIs;
+        this.composite = composite;
+        this.installedContribution = ic;
+        this.dependedOnContributions = dependedOnContributions;
         this.deployer = deployer;
         this.compositeActivator = compositeActivator;
         this.monitorFactory = monitorFactory;
@@ -80,16 +80,16 @@ public class DeployedComposite {
 
     protected void init() throws Throwable {
         
-        List<Contribution> contributions = new ArrayList<Contribution>();
-        contributions.add(ic.getContribution());
-        contributions.get(0).getDeployables().clear();
-        contributions.get(0).getDeployables().add(c);
+        List<Contribution> contribution = new ArrayList<Contribution>();
+        contribution.add(installedContribution.getContribution());
+        contribution.get(0).getDeployables().clear();
+        contribution.get(0).getDeployables().add(composite);
         
         Monitor monitor = monitorFactory.createMonitor();
         Monitor tcm = monitorFactory.setContextMonitor(monitor);
         try {
             
-            domainComposite = deployer.build(contributions, dependedOnContributionURIs, new HashMap<QName, List<String>>(), monitor);
+            domainComposite = deployer.build(contribution, dependedOnContributions, new HashMap<QName, List<String>>(), monitor);
             analyzeProblems(monitor);
 
         } finally {
@@ -108,7 +108,7 @@ public class DeployedComposite {
         compositeActivator.activate(compositeContext, domainComposite);
         compositeActivator.start(compositeContext, domainComposite);
 
-        this.uri = getCompositeURI(c, ic);
+        this.uri = getCompositeURI(composite, installedContribution);
     }
 
     public void unDeploy() throws ActivationException {
-- 
cgit v1.2.3