javaprims.h: Updated class declaration list.

	* gcj/javaprims.h: Updated class declaration list.
	* Makefile.in: Rebuilt.
	* Makefile.am (core_java_source_files): Added
	PropertyPermissionCollection.java.
	* java/lang/Thread.java (group, name): Now package-private.
	* java/lang/ThreadGroup.java: Re-merge with Classpath.
	* java/util/AbstractList.java: Likewise.
	* java/util/AbstractMap.java: Likewise.
	* java/util/Calendar.java: Likewise.
	* java/util/Collections.java: Likewise.
	* java/util/HashMap.java: Likewise.
	* java/util/Hashtable.java: Likewise.
	* java/util/LinkedHashMap.java: Likewise.
	* java/util/LinkedList.java: Likewise.
	* java/util/List.java: Likewise.
	* java/util/ListResourceBundle.java: Likewise.
	* java/util/Map.java: Likewise.
	* java/util/Observable.java: Likewise.
	* java/util/Properties.java: Likewise.
	* java/util/PropertyPermission.java: Likewise.
	* java/util/PropertyPermissionCollection.java: Likewise.
	* java/util/PropertyResourceBundle.java: Likewise.
	* java/util/Random.java: Likewise.
	* java/util/SimpleTimeZone.java: Likewise.
	* java/util/StringTokenizer.java: Likewise.
	* java/util/TimerTask.java: Likewise.
	* java/util/TreeMap.java: Likewise.
	* java/util/WeakHashMap.java: Likewise.
	* java/util/jar/Attributes.java: Likewise.
	* java/util/jar/JarException.java: Likewise.
	* java/util/jar/Manifest.java: Likewise.

From-SVN: r54743

3 files changed, 21 insertions, 13 deletions

diff --git a/libjava/java/util/jar/Attributes.java b/libjava/java/util/jar/Attributes.java
index 46d4ada..0bf27bd 100644
--- a/libjava/java/util/jar/Attributes.java
+++ b/libjava/java/util/jar/Attributes.java
@@ -430,7 +430,7 @@ public class Attributes implements Cloneable, Map
    * @returns the old value of the attribute name or null if it didn't exist
    * yet
    */
-  private String putValue(Name name, String value)
+  String putValue(Name name, String value)
   {
     return (String) put(name, value);
   }
diff --git a/libjava/java/util/jar/JarException.java b/libjava/java/util/jar/JarException.java
index c8c0fba..54291c6 100644
--- a/libjava/java/util/jar/JarException.java
+++ b/libjava/java/util/jar/JarException.java
@@ -1,5 +1,5 @@
-/* Attributes.java -- exception thrown to indicate an problem with a jar file
-   Copyright (C) 2000 Free Software Foundation, Inc.
+/* JarException.java -- thrown to indicate an problem with a jar file
+   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,35 +41,34 @@ import java.util.zip.ZipException;
 
 /**
  * This exception is thrown to indicate an problem with a jar file.
- * It can be constructed with or without a descriptive message of the problem.
- * <p>
  * Note that none of the methods in the java.util.jar package actually declare
  * to throw this exception, most just declare that they throw an IOException
  * which is super class of JarException.
- * 
- * @since 1.2
+ *
  * @author Mark Wielaard (mark@klomp.org)
+ * @since 1.2
  */
-
 public class JarException extends ZipException
 {
-  // Constructors
+  /**
+   * Compatible with JDK 1.2+.
+   */
+  private static final long serialVersionUID = 7159778400963954473L;
 
   /**
    * Create a new JarException without a descriptive error message.
    */
   public JarException()
   {
-    super();
   }
 
   /**
    * Create a new JarException with a descriptive error message indicating
    * what went wrong. This message can later be retrieved by calling the
    * <code>getMessage()</code> method.
-   * @see java.lang.Throwable@getMessage()
    *
    * @param message The descriptive error message
+   * @see #getMessage()
    */
   public JarException(String message)
   {
diff --git a/libjava/java/util/jar/Manifest.java b/libjava/java/util/jar/Manifest.java
index 20220b1..9a15376 100644
--- a/libjava/java/util/jar/Manifest.java
+++ b/libjava/java/util/jar/Manifest.java
@@ -174,10 +174,19 @@ public class Manifest implements Cloneable
   private static void read_main_section(Attributes attr,
 					BufferedReader br) throws IOException
   {
-    read_version_info(attr, br);
+    // According to the spec we should actually call read_version_info() here.
     read_attributes(attr, br);
+    // Explicitly set Manifest-Version attribute if not set in Main
+    // attributes of Manifest.
+    if (attr.getValue(Attributes.Name.MANIFEST_VERSION) == null)
+	    attr.putValue(Attributes.Name.MANIFEST_VERSION, "0.0");
   }
 
+  /**
+   * Pedantic method that requires the next attribute in the Manifest to be
+   * the "Manifest-Version". This follows the Manifest spec closely but
+   * reject some jar Manifest files out in the wild.
+   */
   private static void read_version_info(Attributes attr,
 					BufferedReader br) throws IOException
   {
@@ -185,7 +194,7 @@ public class Manifest implements Cloneable
     try
       {
 	String value = expect_header(version_header, br);
-	attr.putValue(version_header, value);
+	attr.putValue(Attributes.Name.MANIFEST_VERSION, value);
       }
     catch (IOException ioe)
       {