diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/domain-node/src/main')
2 files changed, 15 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java index 4325ce456a..fdf62b4bb2 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java @@ -68,9 +68,10 @@ public interface Node { */ void installContribution(String uri, String contributionURL, String metaDataURL, List<String> dependentContributionURIs, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException; void installContribution(Contribution contribution, List<String> dependentContributionURIs, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException; + + String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException; /* 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; String installContribution(String contributionURL, boolean autoDeploy) throws ContributionReadException, ActivationException, ValidationException; */ diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java index 57d2f9d304..0a849784c5 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java @@ -68,6 +68,19 @@ public class NodeImpl implements Node { this.extensionPointRegistry = extensionPointRegistry; } + public String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException { + int lastDot = contributionURL.lastIndexOf('.'); + int lastSep = contributionURL.lastIndexOf("/"); + String uri; + if (lastDot > -1 && lastSep > -1 && lastDot > lastSep) { + uri = contributionURL.substring(lastSep+1, lastDot); + } else { + uri = contributionURL; + } + installContribution(uri, contributionURL, null, null, true); + return uri; + } + public void installContribution(String uri, String contributionURL, String metaDataURL, List<String> dependentContributionURIs, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException { Monitor monitor = deployer.createMonitor(); Contribution contribution = deployer.loadContribution(URI.create(uri), IOHelper.getLocationAsURL(contributionURL), monitor); |