You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/06/12 15:43:36 UTC
svn commit: r667087 - in /geronimo/gshell/trunk: gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/

Author: jdillon
Date: Thu Jun 12 06:43:35 2008
New Revision: 667087

URL: http://svn.apache.org/viewvc?rev=667087&view=rev
Log:
Add ShellFactory inteface

Added:
    geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellFactory.java
      - copied, changed from r667043, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java
Modified:
    geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationManager.java
    geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java
    geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java

Copied: geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellFactory.java (from r667043, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellFactory.java?p2=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellFactory.java&p1=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java&r1=667043&r2=667087&rev=667087&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/Shell.java (original)
+++ geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellFactory.java Thu Jun 12 06:43:35 2008
@@ -19,21 +19,12 @@
 
 package org.apache.geronimo.gshell.shell;
 
-import org.apache.geronimo.gshell.commandline.CommandLineExecutor;
-
 /**
- * This is the primary interface to executing commands.
+ * ???
  *
  * @version $Rev$ $Date$
  */
-public interface Shell
-    extends CommandLineExecutor
+public interface ShellFactory
 {
-    ShellInfo getShellInfo();
-
-    Environment getEnvironment();
-
-    boolean isInteractive();
-    
-    void run(Object... args) throws Exception;
-}
+    Shell create() throws Exception;
+}
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationManager.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationManager.java?rev=667087&r1=667086&r2=667087&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationManager.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/ApplicationManager.java Thu Jun 12 06:43:35 2008
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.gshell.application;
 
-import org.apache.geronimo.gshell.shell.Shell;
+import org.apache.geronimo.gshell.shell.ShellFactory;
 
 /**
  * Provides the interface to manager applications.
@@ -27,10 +27,9 @@
  * @version $Rev$ $Date$
  */
 public interface ApplicationManager
+    extends ShellFactory
 {
     void configure(ApplicationConfiguration config) throws Exception;
 
-    Shell createShell() throws Exception;
-
     ApplicationContext getContext();
 }
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java?rev=667087&r1=667086&r2=667087&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/application/DefaultApplicationManager.java Thu Jun 12 06:43:35 2008
@@ -308,7 +308,7 @@
         return classPath;
     }
 
-    public Shell createShell() throws Exception {
+    public Shell create() throws Exception {
         // Make sure that we have a valid context
         getContext();
 

Modified: geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java?rev=667087&r1=667086&r2=667087&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java (original)
+++ geronimo/gshell/trunk/gshell-plugin/src/main/java/org/apache/geronimo/gshell/builder/ShellBuilder.java Thu Jun 12 06:43:35 2008
@@ -219,6 +219,6 @@
         // Configure application
         getApplicationManager().configure(applicationConfig);
 
-        return getApplicationManager().createShell();
+        return getApplicationManager().create();
     }
 }
\ No newline at end of file