geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r411065 - in /geronimo/sandbox/gshell/trunk: gshell-api/src/main/java/org/apache/geronimo/gshell/util/ gshell-api/src/main/java/org/apache/geronimo/gshell/util/util/ gshell-core/src/main/java/org/apache/geronimo/gshell/ gshell-core/src/main...
Date Fri, 02 Jun 2006 06:24:12 GMT
Author: jdillon
Date: Thu Jun  1 23:24:11 2006
New Revision: 411065

URL: http://svn.apache.org/viewvc?rev=411065&view=rev
Log:
Fix some problems encounted when moving... IDEA not so good at moving between modules
CommandManager is now an interface

Added:
    geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/Arguments.java
      - copied unchanged from r411055, geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/util/Arguments.java
    geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/Banner.java
      - copied unchanged from r411055, geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/util/Banner.java
    geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/Version.java
      - copied unchanged from r411055, geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/util/Version.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java
  (with props)
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesImpl.java
  (contents, props changed)
      - copied, changed from r411055, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesMap.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerImplTest.java
  (contents, props changed)
      - copied, changed from r411055, geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerTest.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesImplTest.java
  (contents, props changed)
      - copied, changed from r411055, geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesMapTest.java
Removed:
    geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/util/Arguments.java
    geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/util/Banner.java
    geronimo/sandbox/gshell/trunk/gshell-api/src/main/java/org/apache/geronimo/gshell/util/util/Version.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesMap.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerTest.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesMapTest.java
Modified:
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManager.java

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java?rev=411065&r1=411064&r2=411065&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/GShell.java
Thu Jun  1 23:24:11 2006
@@ -25,9 +25,10 @@
 import org.apache.geronimo.gshell.command.CommandManager;
 import org.apache.geronimo.gshell.command.CommandContext;
 import org.apache.geronimo.gshell.command.Variables;
-import org.apache.geronimo.gshell.command.VariablesMap;
+import org.apache.geronimo.gshell.command.VariablesImpl;
 import org.apache.geronimo.gshell.command.CommandException;
 import org.apache.geronimo.gshell.command.CommandDefinition;
+import org.apache.geronimo.gshell.command.CommandManagerImpl;
 import org.apache.geronimo.gshell.commandline.CommandLineBuilder;
 import org.apache.geronimo.gshell.commandline.CommandLine;
 import org.apache.geronimo.gshell.util.Arguments;
@@ -50,7 +51,7 @@
 
     private final CommandLineBuilder commandLineBuilder;
 
-    private final Variables vars = new VariablesMap();
+    private final Variables vars = new VariablesImpl();
 
     public GShell(final IO io) throws CommandException {
         if (io == null) {
@@ -60,7 +61,7 @@
         this.io = io;
 
         shellContainer.registerComponentInstance(this);
-        shellContainer.registerComponentImplementation(CommandManager.class);
+        shellContainer.registerComponentImplementation(CommandManagerImpl.class);
         shellContainer.registerComponentImplementation(CommandLineBuilder.class);
 
         //
@@ -128,7 +129,7 @@
         final Variables parent = getVariables();
 
         cmd.init(new CommandContext() {
-            final Variables vars = new VariablesMap(parent);
+            final Variables vars = new VariablesImpl(parent);
 
             public IO getIO() {
                 return io;

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManager.java?rev=411065&r1=411064&r2=411065&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManager.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManager.java
Thu Jun  1 23:24:11 2006
@@ -16,92 +16,18 @@
 
 package org.apache.geronimo.gshell.command;
 
-import org.apache.xbean.finder.ResourceFinder;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.Map;
-import java.util.Properties;
-import java.util.HashMap;
 import java.util.Set;
-import java.util.Collections;
 
 /**
- * Manager of command definitions and provides access to command instances.
+ * ???
  *
  * @version $Id$
  */
-public class CommandManager
+public interface CommandManager
 {
-    //
-    // TODO: Rename, this has become a registry
-    //
-    
-    private static final Log log = LogFactory.getLog(CommandManager.class);
-
-    private Map<String,CommandDefinition> commandDefMap = new HashMap<String,CommandDefinition>();
-
-    public CommandManager() throws CommandException {
-        try {
-            discoverCommands();
-        }
-        catch (Exception e) {
-            throw new CommandException(e);
-        }
-    }
-
-    private void discoverCommands() throws Exception {
-        log.info("Discovering commands");
-
-        ResourceFinder finder = new ResourceFinder("META-INF/");
-        Map<String, Properties> map = finder.mapAllProperties("org.apache.geronimo.gshell.command");
-
-        for (String filename : map.keySet()) {
-            Properties props = map.get(filename);
-            CommandDefinition def = new CommandDefinition(props);
-            addCommandDefinition(def);
-        }
-    }
-
-    public void addCommandDefinition(final CommandDefinition def) {
-        if (def == null) {
-            throw new IllegalArgumentException("Def is null");
-        }
-
-        commandDefMap.put(def.getName(), def);
-
-        if (log.isDebugEnabled()) {
-            log.debug("Added definition: " + def);
-        }
-    }
-
-    public CommandDefinition getCommandDefinition(String name) throws CommandNotFoundException
{
-        if (name == null) {
-            throw new IllegalArgumentException("Name is null");
-        }
-        if (name.trim().length() == 0) {
-            throw new IllegalArgumentException("Name is empty");
-        }
-
-        //
-        // TODO: Issue warning if there is whitespace, that is a programming error (for someone)
-        //       Investigate auto-trim and complain from the parser too, looks like we are
catching
-        //       non-traditional whitespace (ctrl chars, etc).
-        //
-
-        // Make sure there is not funky whitespace in there (from Telnet or something)
-        name = name.trim();
-
-        CommandDefinition def = commandDefMap.get(name);
-        if (def == null) {
-            throw new CommandNotFoundException(name);
-        }
+    void addCommandDefinition(CommandDefinition def);
 
-        return def;
-    }
+    CommandDefinition getCommandDefinition(String name) throws CommandNotFoundException;
 
-    public Set<String> commandNames() {
-        return Collections.unmodifiableSet(commandDefMap.keySet());
-    }
+    Set<String> commandNames();
 }

Added: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java?rev=411065&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java
(added)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java
Thu Jun  1 23:24:11 2006
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.gshell.command;
+
+import org.apache.xbean.finder.ResourceFinder;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.Map;
+import java.util.Properties;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.Collections;
+
+/**
+ * Manager of command definitions and provides access to command instances.
+ *
+ * @version $Id$
+ */
+public class CommandManagerImpl
+    implements CommandManager
+{
+    //
+    // TODO: Rename, this has become a registry
+    //
+
+    private static final Log log = LogFactory.getLog(CommandManager.class);
+
+    private Map<String,CommandDefinition> commandDefMap = new HashMap<String,CommandDefinition>();
+
+    public CommandManagerImpl() throws CommandException {
+        try {
+            discoverCommands();
+        }
+        catch (Exception e) {
+            throw new CommandException(e);
+        }
+    }
+
+    private void discoverCommands() throws Exception {
+        log.info("Discovering commands");
+
+        ResourceFinder finder = new ResourceFinder("META-INF/");
+        Map<String, Properties> map = finder.mapAllProperties("org.apache.geronimo.gshell.command");
+
+        for (String filename : map.keySet()) {
+            Properties props = map.get(filename);
+            CommandDefinition def = new CommandDefinition(props);
+            addCommandDefinition(def);
+        }
+    }
+
+    public void addCommandDefinition(final CommandDefinition def) {
+        if (def == null) {
+            throw new IllegalArgumentException("Def is null");
+        }
+
+        commandDefMap.put(def.getName(), def);
+
+        if (log.isDebugEnabled()) {
+            log.debug("Added definition: " + def);
+        }
+    }
+
+    public CommandDefinition getCommandDefinition(String name) throws CommandNotFoundException
{
+        if (name == null) {
+            throw new IllegalArgumentException("Name is null");
+        }
+        if (name.trim().length() == 0) {
+            throw new IllegalArgumentException("Name is empty");
+        }
+
+        //
+        // TODO: Issue warning if there is whitespace, that is a programming error (for someone)
+        //       Investigate auto-trim and complain from the parser too, looks like we are
catching
+        //       non-traditional whitespace (ctrl chars, etc).
+        //
+
+        // Make sure there is not funky whitespace in there (from Telnet or something)
+        name = name.trim();
+
+        CommandDefinition def = commandDefMap.get(name);
+        if (def == null) {
+            throw new CommandNotFoundException(name);
+        }
+
+        return def;
+    }
+
+    public Set<String> commandNames() {
+        return Collections.unmodifiableSet(commandDefMap.keySet());
+    }
+}

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/CommandManagerImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesImpl.java
(from r411055, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesMap.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesImpl.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesImpl.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesMap.java&r1=411055&r2=411065&rev=411065&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesMap.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesImpl.java
Thu Jun  1 23:24:11 2006
@@ -19,7 +19,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Collections;
@@ -29,7 +28,7 @@
  *
  * @version $Id$
  */
-public class VariablesMap
+public class VariablesImpl
     implements Variables
 {
     private final Map<String,Object> map;
@@ -38,7 +37,7 @@
 
     private final Set<String> immutables = new HashSet<String>();
 
-    public VariablesMap(final Map<String,Object> map, final Variables parent) {
+    public VariablesImpl(final Map<String,Object> map, final Variables parent) {
         if (map == null) {
             throw new IllegalArgumentException("Map is null");
         }
@@ -50,7 +49,7 @@
         this.parent = parent;
     }
 
-    public VariablesMap(final Variables parent) {
+    public VariablesImpl(final Variables parent) {
         if (parent == null) {
             throw new IllegalArgumentException("Parent is null");
         }
@@ -59,7 +58,7 @@
         this.parent = parent;
     }
 
-    public VariablesMap(final Map<String,Object> map) {
+    public VariablesImpl(final Map<String,Object> map) {
         if (map == null) {
             throw new IllegalArgumentException("Map is null");
         }
@@ -68,7 +67,7 @@
         this.parent = null;
     }
 
-    public VariablesMap() {
+    public VariablesImpl() {
         this(new HashMap<String,Object>());
     }
 

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/command/VariablesImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerImplTest.java
(from r411055, geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerTest.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerImplTest.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerImplTest.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerTest.java&r1=411055&r2=411065&rev=411065&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerTest.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerImplTest.java
Thu Jun  1 23:24:11 2006
@@ -23,10 +23,10 @@
  *
  * @version $Id$
  */
-public class CommandManagerTest
+public class CommandManagerImplTest
     extends TestCase
 {
     public void testConstructor() throws Exception {
-        new CommandManager();
+        new CommandManagerImpl();
     }
 }

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerImplTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/CommandManagerImplTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesImplTest.java
(from r411055, geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesMapTest.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesImplTest.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesImplTest.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesMapTest.java&r1=411055&r2=411065&rev=411065&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesMapTest.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesImplTest.java
Thu Jun  1 23:24:11 2006
@@ -23,16 +23,16 @@
 import java.util.Iterator;
 
 /**
- * Unit tests for the {@link VariablesMap} class.
+ * Unit tests for the {@link VariablesImpl} class.
  *
  * @version $Id$
  */
-public class VariablesMapTest
+public class VariablesImplTest
     extends TestCase
 {
     public void testConstructorArgsNull() throws Exception {
         try {
-            new VariablesMap((Map<String,Object>)null);
+            new VariablesImpl((Map<String,Object>)null);
             fail("Accepted a null value");
         }
         catch (IllegalArgumentException expected) {
@@ -40,7 +40,7 @@
         }
 
         try {
-            new VariablesMap((Variables)null);
+            new VariablesImpl((Variables)null);
             fail("Accepted a null value");
         }
         catch (IllegalArgumentException expected) {
@@ -48,7 +48,7 @@
         }
 
         try {
-            new VariablesMap(new HashMap<String,Object>(), null);
+            new VariablesImpl(new HashMap<String,Object>(), null);
             fail("Accepted a null value");
         }
         catch (IllegalArgumentException expected) {
@@ -56,13 +56,13 @@
         }
 
         // Happy day
-        new VariablesMap(new HashMap<String,Object>(), new VariablesMap());
+        new VariablesImpl(new HashMap<String,Object>(), new VariablesImpl());
     }
 
     /*
     public void testSetNameIsNull() throws Exception {
         try {
-            new VariablesMap().set(null, null);
+            new VariablesImpl().set(null, null);
             fail("Accepted a null value");
         }
         catch (IllegalArgumentException expected) {
@@ -72,7 +72,7 @@
     */
 
     public void testSet() throws Exception {
-        VariablesMap vars = new VariablesMap();
+        VariablesImpl vars = new VariablesImpl();
         String name = "a";
         Object value = new Object();
 
@@ -88,7 +88,7 @@
     }
 
     public void testSetAsImmutable() throws Exception {
-        VariablesMap vars = new VariablesMap();
+        VariablesImpl vars = new VariablesImpl();
         String name = "a";
         Object value = new Object();
 
@@ -106,8 +106,8 @@
     }
 
     public void testSetAsImmutableInParent() throws Exception {
-        Variables parent = new VariablesMap();
-        VariablesMap vars = new VariablesMap(parent);
+        Variables parent = new VariablesImpl();
+        VariablesImpl vars = new VariablesImpl(parent);
         String name = "a";
         Object value = new Object();
 
@@ -125,7 +125,7 @@
     }
 
     public void testGet() throws Exception {
-        VariablesMap vars = new VariablesMap();
+        VariablesImpl vars = new VariablesImpl();
         String name = "a";
         Object value = new Object();
 
@@ -138,7 +138,7 @@
     }
 
     public void testGetUsingDefault() throws Exception {
-        VariablesMap vars = new VariablesMap();
+        VariablesImpl vars = new VariablesImpl();
         String name = "a";
         Object value = new Object();
 
@@ -150,8 +150,8 @@
     }
 
     public void testGetCloaked() throws Exception {
-        Variables parent = new VariablesMap();
-        VariablesMap vars = new VariablesMap(parent);
+        Variables parent = new VariablesImpl();
+        VariablesImpl vars = new VariablesImpl(parent);
         String name = "a";
         Object value = new Object();
 
@@ -168,7 +168,7 @@
     }
 
     public void testUnsetAsImmutable() throws Exception {
-        VariablesMap vars = new VariablesMap();
+        VariablesImpl vars = new VariablesImpl();
         String name = "a";
         Object value = new Object();
 
@@ -186,8 +186,8 @@
     }
 
     public void testUnsetAsImmutableInParent() throws Exception {
-        Variables parent = new VariablesMap();
-        VariablesMap vars = new VariablesMap(parent);
+        Variables parent = new VariablesImpl();
+        VariablesImpl vars = new VariablesImpl(parent);
         String name = "a";
         Object value = new Object();
 
@@ -205,8 +205,8 @@
     }
 
     public void testCloaking() throws Exception {
-        Variables parent = new VariablesMap();
-        VariablesMap vars = new VariablesMap(parent);
+        Variables parent = new VariablesImpl();
+        VariablesImpl vars = new VariablesImpl(parent);
         String name = "a";
         Object value = new Object();
 
@@ -219,24 +219,24 @@
     }
 
     public void testParent() throws Exception {
-        Variables parent = new VariablesMap();
+        Variables parent = new VariablesImpl();
         assertNull(parent.parent());
 
-        VariablesMap vars = new VariablesMap(parent);
+        VariablesImpl vars = new VariablesImpl(parent);
         assertNotNull(vars.parent());
 
         assertEquals(parent, vars.parent());
     }
 
     public void testNames() throws Exception {
-        VariablesMap vars = new VariablesMap();
+        VariablesImpl vars = new VariablesImpl();
         Iterator<String> iter = vars.names();
         assertNotNull(iter);
         assertFalse(iter.hasNext());
     }
 
     public void testNamesImmutable() throws Exception {
-        VariablesMap vars = new VariablesMap();
+        VariablesImpl vars = new VariablesImpl();
         vars.set("a", "b");
 
         Iterator<String> iter = vars.names();

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesImplTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/command/VariablesImplTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message