Sat Aug 19 11:00:53 2000 Anthony Green <green@redhat.com>

	* java/util/jar/Attributes.java, java/util/jar/JarEntry.java,
	java/util/jar/JarException.java, java/util/jar/JarFile.java,
	java/util/jar/JarInputStream.java,
	java/util/jar/JarOutputStream.java, java/util/jar/Manifest.java,
	java/util/Set.java, java/util/Map.java, java/util/Bucket.java,
	java/util/AbstractSet.java, java/util/BasicMapEntry.java,
	java/security/cert/CRL.java, java/security/cert/CRLException.java,
	java/security/cert/Certificate.java,
	java/security/cert/CertificateEncodingException.java,
	java/security/cert/CertificateException.java,
	java/security/cert/CertificateExpiredException.java,
	java/security/cert/CertificateFactory.java,
	java/security/cert/CertificateFactorySpi.java,
	java/security/cert/CertificateNotYetValidException.java,
	java/security/cert/CertificateParsingException.java,
	java/security/cert/X509CRL.java,
	java/security/cert/X509CRLEntry.java,
	java/security/cert/X509Certificate.java,
	java/security/cert/X509Extension.java: Imported from Classpath.
	* java/util/Hashtable.java: Imported from Classpath.

	* java/util/zip/ZipInputStream.java: Create stub for
	createZipEntry.

	* gcj/javaprims.h: Updated class list.

	* Makefile.in, gcj/Makefile.in: Rebuilt.
	* Makefile.am (ordinary_java_source_files): Add these new classes.


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

1 files changed, 98 insertions, 0 deletions

diff --git a/libjava/java/util/jar/JarOutputStream.java b/libjava/java/util/jar/JarOutputStream.java
new file mode 100644
index 00000000000..78bb35979ea
--- /dev/null
+++ b/libjava/java/util/jar/JarOutputStream.java
@@ -0,0 +1,98 @@
+/* JarOutputStream.java - OutputStream for writing jar files
+   Copyright (C) 2000 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License. */
+
+package java.util.jar;
+
+import java.io.OutputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * OutputStream for writing jar files.
+ * A special ZipOutputStream that can take JarEntries and can have a optional
+ * Manifest as first entry.
+ *
+ * @author Mark Wielaard (mark@klomp.org)
+ */
+ 
+public class JarOutputStream extends ZipOutputStream {
+
+    // Constructors
+
+    /**
+     * Creates a new JarOutputStream without a manifest entry.
+     *
+     * @param out the stream to create the new jar on
+     * @exception IOException if something unexpected happend
+     */
+    public JarOutputStream(OutputStream out) throws IOException {
+        this(out, null);
+    }
+
+    /**
+     * Creates a new JarOutputStream with a manifest entry.
+     * The manifest will be the first entry in the jar.
+     *
+     * @param out the stream to create the new jar on
+     * @param man the manifest that should be put in the jar file or null
+     * for no manifest entry
+     * @exception IOException if something unexpected happend
+     */
+    public JarOutputStream(OutputStream out, Manifest man) throws IOException {
+        super(out);
+        if (man != null)
+            writeManifest(man);
+    }
+
+    // Methods
+
+    /**
+     * Writes the manifest to a new JarEntry in this JarOutputStream with as
+     * name JarFile.MANIFEST_NAME.
+     *
+     * @param manifest the non null manifest to be written
+     * @exception IOException if something unexpected happend
+     */
+    private void writeManifest(Manifest manifest) throws IOException {
+        // Create a new Jar Entry for the Manifest
+        JarEntry entry = new JarEntry(JarFile.MANIFEST_NAME);
+        putNextEntry(entry);
+        manifest.write(this);
+        closeEntry();
+    }
+
+    /**
+     * Prepares the JarOutputStream for writing the next entry. 
+     * This implementation just calls <code>super.putNextEntre()</code>.
+     *
+     * @param entry The information for the next entry
+     * @exception IOException when some unexpected I/O exception occured
+     */
+    public void putNextEntry(ZipEntry entry) throws IOException {
+        super.putNextEntry(entry); // XXX
+    }
+}