From 37c624ca7d7bd356aca8e3aabd5103a1c8cf274f Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 4 Jun 2010 13:54:49 +0000
Subject: To keep it as simple as possible for now remove the multiple install
 methods

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951411 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tuscany/sca/something/Section10.java    |  9 ++++-----
 .../tuscany/sca/something/impl/Section10Impl.java      | 18 ------------------
 2 files changed, 4 insertions(+), 23 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 73a98816ff..e999a49943 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
@@ -64,15 +64,14 @@ public interface Section10 {
      * @throws ActivationException 
      * @throws ValidationException 
      */
-    void installContribution(String uri, String contributionURL, List<String> dependentContributionURIs) 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 deployDeployables) throws ContributionReadException, ActivationException, ValidationException;
 
-    /* and i'd expect short forms of that for when you don't care or have the others:*/
+    /* Useful short forms of that for when you don't care or have the others (but leave out for now to keep as simple as possible):
     String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException;
     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 deployDeployables) throws ContributionReadException, ActivationException, ValidationException;
-    void installContribution(Contribution contribution, List<String> dependentContributionURIs, boolean autoDeploy) throws ContributionReadException, ActivationException, ValidationException;
+    */
     
     /**
      * 4577 10.5.1 install Contribution & update Contribution
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 7a204c3278..c8486d3056 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
@@ -66,24 +66,6 @@ public class Section10Impl implements Section10 {
         this.extensionPointRegistry = extensionPointRegistry;
     }
 
-    public String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException {
-        installContribution(contributionURL, contributionURL, null, true);
-        return contributionURL;
-    }
-
-    public String installContribution(String contributionURL, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException {
-        installContribution(contributionURL, contributionURL, null, deployDeployables);
-        return contributionURL;
-    }
-
-    public void installContribution(String uri, String contributionURL) throws ContributionReadException, ActivationException, ValidationException {
-        installContribution(uri, contributionURL, null, true);
-    }
-
-    public void installContribution(String uri, String contributionURL, List<String> dependentContributionURIs) throws ContributionReadException, ActivationException, ValidationException {
-        installContribution(uri, contributionURL, dependentContributionURIs, true);
-    }
-    
     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();
-- 
cgit v1.2.3