geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r693724 - in /geronimo/gshell/trunk: gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/ gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/ gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/
Date Wed, 10 Sep 2008 07:52:28 GMT
Author: jdillon
Date: Wed Sep 10 00:52:27 2008
New Revision: 693724

URL: http://svn.apache.org/viewvc?rev=693724&view=rev
Log:
Add ShellBuilder interface, which can eventually be moved to another module to allow wisdom/rapture
interop

Added:
    geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilder.java
  (contents, props changed)
      - copied, changed from r680934, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellFactory.java
    geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilderImpl.java
  (contents, props changed)
      - copied, changed from r693719, geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/ShellBuilder.java
Removed:
    geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/ShellBuilder.java
Modified:
    geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java

Modified: geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=693724&r1=693723&r2=693724&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
(original)
+++ geronimo/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
Wed Sep 10 00:52:27 2008
@@ -32,6 +32,8 @@
 import org.apache.geronimo.gshell.model.settings.Settings;
 import org.apache.geronimo.gshell.application.settings.SettingsLocator;
 import org.apache.geronimo.gshell.wisdom.ShellBuilder;
+import org.apache.geronimo.gshell.wisdom.shell.ShellBuilder;
+import org.apache.geronimo.gshell.wisdom.shell.ShellBuilderImpl;
 import org.codehaus.plexus.classworlds.ClassWorld;
 
 import java.util.ArrayList;
@@ -203,7 +205,7 @@
         });
 
         try {
-            ShellBuilder builder = new ShellBuilder();
+            ShellBuilder builder = new ShellBuilderImpl();
             builder.setClassLoader(getClass().getClassLoader());
             builder.setIo(io);
 

Copied: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilder.java
(from r680934, geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellFactory.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilder.java?p2=geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilder.java&p1=geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellFactory.java&r1=680934&r2=693724&rev=693724&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/shell/ShellFactory.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilder.java
Wed Sep 10 00:52:27 2008
@@ -17,21 +17,54 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.shell;
+package org.apache.geronimo.gshell.wisdom.shell;
+
+import org.apache.geronimo.gshell.io.IO;
+import org.apache.geronimo.gshell.command.Variables;
+import org.apache.geronimo.gshell.shell.ShellFactory;
+import org.apache.geronimo.gshell.application.settings.SettingsManager;
+import org.apache.geronimo.gshell.application.ApplicationManager;
+import org.apache.geronimo.gshell.model.application.Application;
+import org.apache.geronimo.gshell.model.settings.Settings;
+import org.apache.geronimo.gshell.artifact.ArtifactManager;
 
 /**
- * Creates {@link Shell} instanes.
+ * Builds {@link org.apache.geronimo.gshell.shell.Shell} instanes.
  *
  * @version $Rev$ $Date$
  */
-public interface ShellFactory
+public interface ShellBuilder
+    extends ShellFactory
 {
-    /**
-     * Create a new shell instance.
-     *
-     * @return  A new shell instance.
-     * 
-     * @throws Exception    Failed to create shell instance.
-     */
-    Shell create() throws Exception;
+    ClassLoader getClassLoader();
+
+    void setClassLoader(ClassLoader classLoader);
+
+    IO getIo();
+
+    void setIo(IO io);
+
+    Variables getVariables();
+
+    void setVariables(Variables variables);
+
+    Settings getSettings();
+
+    void setSettings(Settings settings);
+
+    SettingsManager getSettingsManager();
+
+    void setSettingsManager(SettingsManager settingsManager);
+
+    Application getApplication();
+
+    void setApplication(Application application);
+
+    ApplicationManager getApplicationManager();
+
+    void setApplicationManager(ApplicationManager applicationManager);
+
+    ArtifactManager getArtifactManager();
+
+    void setArtifactManager(ArtifactManager artifactManager);
 }
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilder.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilderImpl.java
(from r693719, geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/ShellBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilderImpl.java?p2=geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilderImpl.java&p1=geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/ShellBuilder.java&r1=693719&r2=693724&rev=693724&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/ShellBuilder.java
(original)
+++ geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilderImpl.java
Wed Sep 10 00:52:27 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.wisdom;
+package org.apache.geronimo.gshell.wisdom.shell;
 
 import org.apache.geronimo.gshell.application.ApplicationConfiguration;
 import org.apache.geronimo.gshell.application.ApplicationManager;
@@ -31,19 +31,18 @@
 import org.apache.geronimo.gshell.model.application.Application;
 import org.apache.geronimo.gshell.model.settings.Settings;
 import org.apache.geronimo.gshell.shell.Shell;
-import org.apache.geronimo.gshell.shell.ShellFactory;
 import org.apache.geronimo.gshell.spring.BeanContainer;
 import org.apache.geronimo.gshell.spring.BeanContainerImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Builds {@link org.apache.geronimo.gshell.shell.Shell} instances.
- *
+ * GShell Wisdom {@link ShellBuilder}.
+ * 
  * @version $Rev$ $Date$
  */
-public class ShellBuilder
-    implements ShellFactory
+public class ShellBuilderImpl
+    implements ShellBuilder
 {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -61,7 +60,7 @@
 
     private ArtifactManager artifactManager;
 
-    public ShellBuilder() {}
+    public ShellBuilderImpl() {}
 
     private BeanContainer createContainer() {
         return new BeanContainerImpl(getClassLoader());

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilderImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-wisdom/src/main/java/org/apache/geronimo/gshell/wisdom/shell/ShellBuilderImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message