You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/04/20 21:46:38 UTC

svn commit: r1095490 - /tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java

Author: antelder
Date: Wed Apr 20 19:46:38 2011
New Revision: 1095490

URL: http://svn.apache.org/viewvc?rev=1095490&view=rev
Log:
Update start mojo to start runtimes and store them in the static map

Modified:
    tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java

Modified: tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java?rev=1095490&r1=1095489&r2=1095490&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java (original)
+++ tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyStartMojo.java Wed Apr 20 19:46:38 2011
@@ -30,7 +30,11 @@ import org.apache.maven.plugin.AbstractM
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
+import org.apache.tuscany.sca.Node;
 import org.apache.tuscany.sca.TuscanyRuntime;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.monitor.ValidationException;
+import org.apache.tuscany.sca.runtime.ActivationException;
 import org.apache.tuscany.sca.shell.Shell;
 
 /**
@@ -95,7 +99,7 @@ public class TuscanyStartMojo extends Ab
     private String id;
 
     /**
-     * @parameter expression="${domainURI}" default-value="default"
+     * @parameter expression="${domainURI}" default-value="uri:default"
      */
     private String domainURI;
 
@@ -110,27 +114,33 @@ public class TuscanyStartMojo extends Ab
     private String[] contributions;
 
     public void execute() throws MojoExecutionException, MojoFailureException {
-    }
-
-    private void executeShell() throws MojoExecutionException {
-        getLog().info("Starting Tuscany Shell...");
-
-        List<String> contributionList = new ArrayList<String>();
-
-        addProjectContribution(contributionList);
-
-        addAdditionalContributions(contributionList);
+        getLog().info("Starting Tuscany Runtime...");
+        
+        TuscanyRuntime runtime = TuscanyRuntime.newInstance();
+        runtimes.put(id, runtime);
+
+        if (nodeConfig != null && nodeConfig.length() > 0) {
+            try {
+                runtime.createNodeFromXML(nodeConfig);
+            } catch (Exception e) {
+                throw new MojoExecutionException("Exception creating node", e);
+            }
+        } else {
+            List<String> contributionList = new ArrayList<String>();
 
-        contributionList.add(0, "-help");
-        contributionList.add(0, domainURI);
+            addProjectContribution(contributionList);
 
-        try {
-            Shell.main(contributionList.toArray(new String[contributionList.size()]));
-        } catch (Exception e) {
-            throw new MojoExecutionException("Exception in Shell", e);
+            addAdditionalContributions(contributionList);
+            
+            Node node = runtime.createNode(domainURI);
+            for (String c : contributionList) {
+                try {
+                    node.installContribution(null, c, null, null, true);
+                } catch (Exception e) {
+                    throw new MojoExecutionException("Exception installing contribution", e);
+                }
+            }
         }
-
-        getLog().info("Tuscany Shell stopped.");
     }
 
     private void addAdditionalContributions(List<String> contributionList) throws MojoExecutionException {