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

[antelder]

Author: antelder
Date: Tue Mar 15 10:26:20 2011
New Revision: 1081717

URL: http://svn.apache.org/viewvc?rev=1081717&view=rev
Log:
Remove unused code, rename config parameter to be domainURI, add nodeConfig 
(currently unused

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

Modified: 
tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.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/TuscanyRunMojo.java?rev=1081717&r1=1081716&r2=1081717&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
 Tue Mar 15 10:26:20 2011
@@ -27,9 +27,7 @@ import org.apache.maven.artifact.Artifac
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
-import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.shell.Shell;
 
 /**
@@ -86,9 +84,14 @@ public class TuscanyRunMojo extends Abst
     protected File finalName;
 
     /**
-     * @parameter expression="${config}" default-value="default"
+     * @parameter expression="${domainURI}" default-value="default"
      */
-    private String config;
+    private String domainURI;
+
+    /**
+     * @parameter expression="${nodeConfig}"
+     */
+    private String nodeConfig;
 
     /**
      * @parameter expression="${contributions}" 
@@ -105,7 +108,7 @@ public class TuscanyRunMojo extends Abst
         addAdditionalContributions(contributionList);
 
         contributionList.add(0, "-help");
-        contributionList.add(0, config);
+        contributionList.add(0, domainURI);
         
         try {
             Shell.main(contributionList.toArray(new 
String[contributionList.size()]));
@@ -113,7 +116,6 @@ public class TuscanyRunMojo extends Abst
             throw new MojoExecutionException("Exception in Shell", e);
         }
         
-//        waitForShutdown(new Ob, getLog());
         getLog().info("Tuscany Shell stopped.");
     }
 
@@ -159,40 +161,4 @@ public class TuscanyRunMojo extends Abst
             throw new MojoExecutionException("", e);
         }
     }
-
-    protected void waitForShutdown(Node node, Log log) {
-        Runtime.getRuntime().addShutdownHook(new ShutdownThread(node, log));
-        synchronized (this) {
-            try {
-                log.info("Ctrl-C to end...");
-                this.wait();
-            } catch (InterruptedException e) {
-                log.error(e);
-            }
-        }
-    }
-
-    protected static class ShutdownThread extends Thread {
-
-        private Node node;
-        private Log log;
-
-        public ShutdownThread(Node node, Log log) {
-            super();
-            this.node = node;
-            this.log = log;
-        }
-
-        @Override
-        public void run() {
-            try {
-
-                log.info("Stopping Tuscany Runtime...");
-                node.stop();
-
-            } catch (Exception e) {
-                log.error(e);
-            }
-        }
-    }
 }