2 files changed, 4 insertions, 23 deletions
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();