Imported GNU Classpath 0.90

       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111942 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 29 insertions, 20 deletions

diff --git a/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java b/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java
index 557d3d7f89f..b455dbb6c24 100644
--- a/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java
+++ b/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java
@@ -1,5 +1,5 @@
 /* AppConfigurationEntry.java
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,6 @@ import java.util.Map;
 
 public class AppConfigurationEntry
 {
-
   // Fields.
   // -------------------------------------------------------------------------
 
@@ -61,13 +60,16 @@ public class AppConfigurationEntry
   {
     if (loginModuleName == null || loginModuleName.length() == 0)
       throw new IllegalArgumentException ("module name cannot be null nor empty");
+
     if (LoginModuleControlFlag.OPTIONAL != controlFlag &&
         LoginModuleControlFlag.REQUIRED != controlFlag &&
         LoginModuleControlFlag.REQUISITE != controlFlag &&
         LoginModuleControlFlag.SUFFICIENT != controlFlag)
       throw new IllegalArgumentException ("invalid controlFlag");
+
     if (options == null)
       throw new IllegalArgumentException ("options cannot be null");
+
     this.loginModuleName = loginModuleName;
     this.controlFlag = controlFlag;
     this.options = Collections.unmodifiableMap (new HashMap (options));
@@ -91,7 +93,17 @@ public class AppConfigurationEntry
     return options;
   }
 
-// Inner class.
+  // Object methods ----------------------------------------------------------
+
+  public String toString()
+  {
+    
+    return loginModuleName + "\t"
+        + String.valueOf(controlFlag) + "\t"
+        + String.valueOf(options);
+  }
+
+  // Inner class.
   // -------------------------------------------------------------------------
 
   public static class LoginModuleControlFlag
@@ -117,19 +129,15 @@ public class AppConfigurationEntry
 
     public String toString()
     {
-      StringBuffer buf = new StringBuffer (LoginModuleControlFlag.class.getName());
-      buf.append ('.');
-      if (this == OPTIONAL)
-        buf.append ("OPTIONAL");
-      else if (this == REQUIRED)
-        buf.append ("REQUIRED");
-      else if (this == REQUISITE)
-        buf.append ("REQUISITE");
-      else if (this == SUFFICIENT)
-        buf.append ("SUFFICIENT");
-      else
-        buf.append ("HARVEY_THE_RABBIT");
-      return buf.toString();
+      if (this == LoginModuleControlFlag.REQUIRED)
+        return "REQUIRED";
+      if (this == LoginModuleControlFlag.REQUISITE)
+        return "REQUISITE";
+      if (this == LoginModuleControlFlag.SUFFICIENT)
+        return "SUFFICIENT";
+      if (this == LoginModuleControlFlag.OPTIONAL)
+        return "OPTIONAL";
+      return "???";
     }
   }
 }
diff --git a/libjava/classpath/javax/security/auth/login/Configuration.java b/libjava/classpath/javax/security/auth/login/Configuration.java
index eb5e4a81979..fe56f8a5909 100644
--- a/libjava/classpath/javax/security/auth/login/Configuration.java
+++ b/libjava/classpath/javax/security/auth/login/Configuration.java
@@ -1,5 +1,5 @@
 /* Configuration.java
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.security.auth.login;
 
+import gnu.javax.security.auth.login.GnuConfiguration;
+
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.Security;
@@ -46,7 +48,6 @@ import javax.security.auth.AuthPermission;
 
 public abstract class Configuration
 {
-
   // Fields.
   // -------------------------------------------------------------------------
 
@@ -108,11 +109,11 @@ public abstract class Configuration
             if (conf != null)
               config = (Configuration) Class.forName (conf).newInstance();
             else
-              config = new NullConfiguration();
+              config = new GnuConfiguration();
           }
         catch (Exception x)
           {
-            config = new NullConfiguration();
+            config = new GnuConfiguration();
           }
       }
     return config;