From 7655f8ce26db8ad66b4ec924921eba3ad097e8fd Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 4 Jun 2010 13:47:15 +0000
Subject: Rename autoDeploy to deployDeployables

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951410 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/tuscany/sca/something/Section10.java     |  2 +-
 .../org/apache/tuscany/sca/something/impl/Section10Impl.java | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sca-java-2.x/trunk/modules/domain/src/main')

diff --git a/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java b/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java
index 02bba46567..73a98816ff 100644
--- a/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java
+++ b/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java
@@ -71,7 +71,7 @@ public interface Section10 {
     void installContribution(String uri, String contributionURL) throws ContributionReadException, ActivationException, ValidationException;
     /* autoDeploy indicates whether or not to automatically deploy the deployables defined in sca-contribution.xml */
     String installContribution(String contributionURL, boolean autoDeploy) throws ContributionReadException, ActivationException, ValidationException;
-    void installContribution(String uri, String contributionURL, List<String> dependentContributionURIs, boolean autoDeploy) throws ContributionReadException, ActivationException, ValidationException;
+    void installContribution(String uri, String contributionURL, List<String> dependentContributionURIs, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException;
     void installContribution(Contribution contribution, List<String> dependentContributionURIs, boolean autoDeploy) throws ContributionReadException, ActivationException, ValidationException;
     
     /**
diff --git a/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java b/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java
index f87bf4c6ad..7a204c3278 100644
--- a/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java
+++ b/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java
@@ -71,8 +71,8 @@ public class Section10Impl implements Section10 {
         return contributionURL;
     }
 
-    public String installContribution(String contributionURL, boolean autoDeploy) throws ContributionReadException, ActivationException, ValidationException {
-        installContribution(contributionURL, contributionURL, null, autoDeploy);
+    public String installContribution(String contributionURL, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException {
+        installContribution(contributionURL, contributionURL, null, deployDeployables);
         return contributionURL;
     }
 
@@ -84,19 +84,19 @@ public class Section10Impl implements Section10 {
         installContribution(uri, contributionURL, dependentContributionURIs, true);
     }
     
-    public void installContribution(String uri, String contributionURL, List<String> dependentContributionURIs, boolean autoDeploy) throws ContributionReadException, ActivationException, ValidationException {
+    public void installContribution(String uri, String contributionURL, List<String> dependentContributionURIs, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException {
         URL url = IOHelper.getLocationAsURL(contributionURL);
         Monitor monitor = deployer.createMonitor();
         Contribution contribution = deployer.loadContribution(URI.create(uri), url, monitor);
         monitor.analyzeProblems();
-        installContribution(contribution, dependentContributionURIs, autoDeploy);
+        installContribution(contribution, dependentContributionURIs, deployDeployables);
     }
 
-    public void installContribution(Contribution contribution, List<String> dependentContributionURIs, boolean autoDeploy) throws ContributionReadException, ActivationException, ValidationException {
+    public void installContribution(Contribution contribution, List<String> dependentContributionURIs, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException {
         // TODO: dependentContributionURIs
         InstalledContribution ic = new InstalledContribution(contribution.getURI(), contribution.getLocation(), contribution);
         installedContributions.put(contribution.getURI(), ic);
-        if (autoDeploy) {
+        if (deployDeployables) {
             for (Composite c : ic.getDefaultDeployables()) {
                 deployComposite(c, ic);
             }
-- 
cgit v1.2.3