svn commit: r951410 - in /tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something: Section10.java impl/Section10Impl.java

[antelder]

Author: antelder
Date: Fri Jun  4 13:47:15 2010
New Revision: 951410

URL: http://svn.apache.org/viewvc?rev=951410&view=rev
Log:
Rename autoDeploy to deployDeployables

Modified:
    
tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java
    
tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java?rev=951410&r1=951409&r2=951410&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java
 Fri Jun  4 13:47:15 2010
@@ -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;
     
     /**

Modified: 
tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java?rev=951410&r1=951409&r2=951410&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/Section10Impl.java
 Fri Jun  4 13:47:15 2010
@@ -71,8 +71,8 @@ public class Section10Impl implements Se
         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 Se
         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);
             }