Index: src/java/org/apache/avalon/phoenix/frontends/CLIMain.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java,v
retrieving revision 1.43
diff -u -r1.43 CLIMain.java
--- src/java/org/apache/avalon/phoenix/frontends/CLIMain.java	6 Sep 2002 11:22:33 -0000	1.43
+++ src/java/org/apache/avalon/phoenix/frontends/CLIMain.java	6 Sep 2002 21:16:57 -0000
@@ -8,7 +8,7 @@
 package org.apache.avalon.phoenix.frontends;
 
 import java.io.File;
-import java.util.Hashtable;
+import java.util.Map;
 import java.util.Observable;
 import java.util.Observer;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
@@ -68,7 +68,7 @@
      * @param args the command line arguments
      */
     public int main( final String[] args,
-                     final Hashtable data,
+                     final Map data,
                      final boolean blocking )
     {
         try
@@ -115,7 +115,7 @@
      * @throws Exception if an error occurs
      */
     private void execute( final Parameters parameters,
-                          final Hashtable data,
+                          final Map data,
                           final boolean blocking )
         throws Exception
     {
@@ -175,7 +175,7 @@
      * Startup the embeddor.
      */
     private synchronized boolean startup( final Parameters parameters,
-                                          final Hashtable data )
+                                          final Map data )
     {
         try
         {
Index: src/java/org/apache/avalon/phoenix/launcher/Main.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java,v
retrieving revision 1.22
diff -u -r1.22 Main.java
--- src/java/org/apache/avalon/phoenix/launcher/Main.java	6 Aug 2002 11:57:41 -0000	1.22
+++ src/java/org/apache/avalon/phoenix/launcher/Main.java	6 Sep 2002 21:16:57 -0000
@@ -16,7 +16,7 @@
 import java.security.Permissions;
 import java.security.Policy;
 import java.util.ArrayList;
-import java.util.Hashtable;
+import java.util.Map;
 import java.util.StringTokenizer;
 
 /**
@@ -42,7 +42,7 @@
     public static final void main( final String[] args )
         throws Exception
     {
-        int exitCode = startup( args, new Hashtable(), true );
+        int exitCode = startup( args, new java.util.HashMap(), true );
         System.exit( exitCode );
     }
 
@@ -60,7 +60,7 @@
      * @throws Exception if an error occurs
      */
     protected static final int startup( final String[] args,
-                                        final Hashtable data,
+                                        final Map data,
                                         final boolean blocking )
         throws Exception
     {
@@ -84,7 +84,7 @@
             //Create main launcher
             final Class clazz = classLoader.loadClass( MAIN_CLASS );
             final Class[] paramTypes =
-                new Class[]{args.getClass(), Hashtable.class, Boolean.TYPE};
+                new Class[]{args.getClass(), Map.class, Boolean.TYPE};
             final Method method = clazz.getMethod( "main", paramTypes );
             c_frontend = clazz.newInstance();