geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r582197 - in /geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell: ./ branding/ layout/ layout/loader/
Date Fri, 05 Oct 2007 10:33:17 GMT
Author: jdillon
Date: Fri Oct  5 03:33:12 2007
New Revision: 582197

URL: http://svn.apache.org/viewvc?rev=582197&view=rev
Log:
Add constructors for some components for use outside of plexus

Modified:
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/CommandLineBuilder.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandExecutor.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultShell.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultShellInfo.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/DefaultBranding.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/PropertiesVersionLoader.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/DefaultLayoutManager.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/loader/XMLLayoutLoader.java

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/CommandLineBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/CommandLineBuilder.java?rev=582197&r1=582196&r2=582197&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/CommandLineBuilder.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/CommandLineBuilder.java
Fri Oct  5 03:33:12 2007
@@ -48,7 +48,13 @@
     private PlexusContainer container;
 
     private CommandLineParser parser = new CommandLineParser();
+
+    public CommandLineBuilder() {}
     
+    public CommandLineBuilder(final PlexusContainer container) {
+        this.container = container;
+    }
+
     private ASTCommandLine parse(final String input) throws ParseException {
         assert input != null;
 

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandExecutor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandExecutor.java?rev=582197&r1=582196&r2=582197&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandExecutor.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultCommandExecutor.java
Fri Oct  5 03:33:12 2007
@@ -53,6 +53,14 @@
     @Requirement
     private Environment env;
 
+    public DefaultCommandExecutor() {}
+    
+    public DefaultCommandExecutor(final LayoutManager layoutManager, final CommandLineBuilder
commandLineBuilder, final Environment env) {
+        this.layoutManager = layoutManager;
+        this.commandLineBuilder = commandLineBuilder;
+        this.env = env;
+    }
+
     public Object execute(final String line) throws Exception {
         assert line != null;
 

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultShell.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultShell.java?rev=582197&r1=582196&r2=582197&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultShell.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultShell.java
Fri Oct  5 03:33:12 2007
@@ -77,6 +77,17 @@
     @Requirement
     private IO io;
 
+    public DefaultShell() {}
+    
+    public DefaultShell(final ShellInfo shellInfo, final Branding branding, final CommandExecutor
executor, final Terminal terminal, final Environment env, final IO io) {
+        this.shellInfo = shellInfo;
+        this.branding = branding;
+        this.executor = executor;
+        this.terminal = terminal;
+        this.env = env;
+        this.io = io;
+    }
+
     public Environment getEnvironment() {
         return env;
     }

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultShellInfo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultShellInfo.java?rev=582197&r1=582196&r2=582197&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultShellInfo.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/DefaultShellInfo.java
Fri Oct  5 03:33:12 2007
@@ -51,6 +51,12 @@
 
     private File homeDir;
 
+    public DefaultShellInfo() {}
+    
+    public DefaultShellInfo(final Branding branding) {
+        this.branding = branding;
+    }
+
     public File getHomeDir() {
         if (homeDir == null) {
             throw new IllegalStateException();

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/DefaultBranding.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/DefaultBranding.java?rev=582197&r1=582196&r2=582197&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/DefaultBranding.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/DefaultBranding.java
Fri Oct  5 03:33:12 2007
@@ -45,6 +45,13 @@
     @Requirement
     private Terminal terminal;
 
+    public DefaultBranding() {}
+    
+    public DefaultBranding(final VersionLoader versionLoader, final Terminal terminal) {
+        this.versionLoader = versionLoader;
+        this.terminal = terminal;
+    }
+
     public String getName() {
         return "gshell";
     }

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/PropertiesVersionLoader.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/PropertiesVersionLoader.java?rev=582197&r1=582196&r2=582197&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/PropertiesVersionLoader.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/PropertiesVersionLoader.java
Fri Oct  5 03:33:12 2007
@@ -36,11 +36,17 @@
 public class PropertiesVersionLoader
     implements VersionLoader
 {
-    private Properties props;
-
     @Configuration(value="version.properties")
     private String resourceName;
+
+    private Properties props;
+
+    public PropertiesVersionLoader() {}
     
+    public PropertiesVersionLoader(final String resourceName) {
+        this.resourceName = resourceName;
+    }
+
     public String getVersion() {
         if (props == null) {
             InputStream input = getClass().getResourceAsStream(resourceName);

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/DefaultLayoutManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/DefaultLayoutManager.java?rev=582197&r1=582196&r2=582197&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/DefaultLayoutManager.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/DefaultLayoutManager.java
Fri Oct  5 03:33:12 2007
@@ -53,7 +53,15 @@
     private Environment env;
     
     private Layout layout;
+
+    public DefaultLayoutManager() {}
     
+    public DefaultLayoutManager(final CommandRegistry commandRegistry, final LayoutLoader
loader, final Environment env) {
+        this.commandRegistry = commandRegistry;
+        this.loader = loader;
+        this.env = env;
+    }
+
     public void initialize() throws InitializationException {
         assert loader != null;
 

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/loader/XMLLayoutLoader.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/loader/XMLLayoutLoader.java?rev=582197&r1=582196&r2=582197&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/loader/XMLLayoutLoader.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/loader/XMLLayoutLoader.java
Fri Oct  5 03:33:12 2007
@@ -51,6 +51,12 @@
 
     private URI location;
 
+    public XMLLayoutLoader() {}
+    
+    public XMLLayoutLoader(final ShellInfo info) {
+        this.info = info;
+    }
+
     public void initialize() throws InitializationException {
         assert info != null;
 



Mime
View raw message