svn commit: r958540 - in /tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2: Node.java impl/NodeImpl.java

[antelder]

Author: antelder
Date: Mon Jun 28 11:01:23 2010
New Revision: 958540

URL: http://svn.apache.org/viewvc?rev=958540&view=rev
Log:
Add a short form create method

Modified:
    
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java
    
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java?rev=958540&r1=958539&r2=958540&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/Node.java
 Mon Jun 28 11:01:23 2010
@@ -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;
     */

Modified: 
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java?rev=958540&r1=958539&r2=958540&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java
 Mon Jun 28 11:01:23 2010
@@ -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);