diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-05-19 06:40:53 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-05-19 06:40:53 +0000 |
commit | 5885d969413db310978231a8255c5028f5249d89 (patch) | |
tree | 411ded70bcc2adce6c0e6e5d387a43d49eca3556 /sca-java-2.x/trunk/modules/domain-node/src/main/java/org | |
parent | 14a0ec53532b6c24f9d84e778c1d7cccf6ee461c (diff) |
Remove ActivationException on installs, add some TODO comments
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1124557 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/domain-node/src/main/java/org')
2 files changed, 10 insertions, 9 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java index 7cb76f4a76..5005708431 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/Node.java @@ -47,10 +47,9 @@ public interface Node { * @return the URI of the installed contribution * * @throws ContributionReadException - * @throws ActivationException * @throws ValidationException */ - String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException; + String installContribution(String contributionURL) throws ContributionReadException, ValidationException; /** * Creates an installed contribution from a supplied root contribution and installed at a supplied base URI. @@ -65,10 +64,9 @@ public interface Node { * @return the URI of the installed contribution * * @throws ContributionReadException - * @throws ActivationException * @throws ValidationException */ - String installContribution(String uri, String contributionURL, String metaDataURL, List<String> dependentContributionURIs) throws ContributionReadException, ActivationException, ValidationException; + String installContribution(String uri, String contributionURL, String metaDataURL, List<String> dependentContributionURIs) throws ContributionReadException, ValidationException; /** * Creates an installed contribution from a supplied Contribution object. @@ -134,9 +132,8 @@ public interface Node { * * @param contributionURI * @return List of contribution URIs (includes dependent contributions) which were removed - * @throws ActivationException */ - void uninstallContribution(String contributionURI) throws ActivationException; + void uninstallContribution(String contributionURI); /** * 4677 10.7.1 add To Domain-Level Composite @@ -248,4 +245,5 @@ public interface Node { // start and stop composites on remote members // get/display contribution content // a view-only Node + // dirty started composites (contributions updated while composite running) } diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java index 4e821734ce..bd17f9ddb3 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java @@ -93,15 +93,18 @@ public class NodeImpl implements Node { }); } - public String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException { + // TODO: install shouldn't throw ValidationException as it shouldn't do any validation, its + // only here from the loadContribution in mergeContributionMetaData so change that approach + + public String installContribution(String contributionURL) throws ContributionReadException, ValidationException { return installContribution(null, contributionURL, null, null); } - public String installContribution(String uri, String contributionURL) throws ContributionReadException, ActivationException, ValidationException { + public String installContribution(String uri, String contributionURL) throws ContributionReadException, ValidationException { return installContribution(uri, contributionURL, null, null); } - public String installContribution(String uri, String contributionURL, String metaDataURL, List<String> dependentContributionURIs) throws ContributionReadException, ActivationException, ValidationException { + public String installContribution(String uri, String contributionURL, String metaDataURL, List<String> dependentContributionURIs) throws ContributionReadException, ValidationException { InstalledContribution ic = new InstalledContribution(uri, contributionURL); if (dependentContributionURIs != null) { |