libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.


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

21 files changed, 3 insertions, 84 deletions

diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
index 9beab473ca6..8c059854e4a 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
@@ -38,8 +38,6 @@ exception statement from your version. */
 
 package gnu.javax.net.ssl.provider;
 
-import static gnu.javax.net.ssl.provider.CertificateRequest.ClientCertificateType;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientHandshake.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientHandshake.java
index a8780084508..fdbf262122b 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientHandshake.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientHandshake.java
@@ -56,7 +56,6 @@ import java.nio.ByteBuffer;
 import java.security.AccessController;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
-import java.security.KeyManagementException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.MessageDigest;
@@ -65,7 +64,6 @@ import java.security.PrivateKey;
 import java.security.SignatureException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPublicKey;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -77,7 +75,6 @@ import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
 import javax.crypto.interfaces.DHPrivateKey;
 import javax.crypto.interfaces.DHPublicKey;
 import javax.crypto.spec.DHParameterSpec;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientPSKParameters.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientPSKParameters.java
index 676a872f925..f08ec7f9062 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientPSKParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientPSKParameters.java
@@ -38,13 +38,9 @@ exception statement from your version. */
 
 package gnu.javax.net.ssl.provider;
 
-import gnu.classpath.debug.Component;
-import gnu.classpath.debug.SystemLogger;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
index f7483a94c30..860cc731f7a 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
@@ -38,13 +38,9 @@ exception statement from your version. */
 
 package gnu.javax.net.ssl.provider;
 
-import gnu.classpath.debug.Component;
-import gnu.classpath.debug.SystemLogger;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.nio.charset.Charset;
 
 /**
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ContentType.java b/libjava/classpath/gnu/javax/net/ssl/provider/ContentType.java
index f7165a2d769..eaebebf4b67 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ContentType.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ContentType.java
@@ -38,10 +38,6 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import java.io.EOFException;
-import java.io.InputStream;
-import java.io.IOException;
-
 /**
  * The content type enumeration, which marks packets in the record layer.
  *
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java b/libjava/classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
index ea7439bd2c6..85769cffcf2 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
@@ -38,9 +38,6 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import gnu.classpath.debug.Component;
-import gnu.classpath.debug.SystemLogger;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Handshake.java b/libjava/classpath/gnu/javax/net/ssl/provider/Handshake.java
index 52f61424e4c..dd36f2b3fc5 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Handshake.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Handshake.java
@@ -38,26 +38,11 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.io.StringReader;
 import java.io.StringWriter;
 
 import java.nio.ByteBuffer;
 
-import java.security.PublicKey;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-import javax.net.ssl.SSLProtocolException;
-
 /**
  * An SSL handshake message. SSL handshake messages have the following
  * form:
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java b/libjava/classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java
index 13a3ef814de..cf5ca6099ff 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java
@@ -47,11 +47,9 @@ import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 
 import java.util.Arrays;
-import java.util.logging.Level;
 import java.util.zip.DataFormatException;
 import java.util.zip.Inflater;
 
-import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.Mac;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java b/libjava/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
index 6da0d066741..228071a393d 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
@@ -40,16 +40,13 @@ package gnu.javax.net.ssl.provider;
 
 import gnu.classpath.debug.Component;
 import gnu.classpath.debug.SystemLogger;
-import gnu.java.security.util.ByteArray;
 import gnu.java.security.util.ByteBufferOutputStream;
 
 import java.nio.ByteBuffer;
 
-import java.util.logging.Level;
 import java.util.zip.DataFormatException;
 import java.util.zip.Deflater;
 
-import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.Mac;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ProtocolVersion.java b/libjava/classpath/gnu/javax/net/ssl/provider/ProtocolVersion.java
index ca62054a89c..3c3f29a21e6 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ProtocolVersion.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ProtocolVersion.java
@@ -40,7 +40,6 @@ package gnu.javax.net.ssl.provider;
 
 import java.io.InputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 
 public final class ProtocolVersion
   implements Comparable<ProtocolVersion>, Constructed
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Random.java b/libjava/classpath/gnu/javax/net/ssl/provider/Random.java
index e6815930934..f89acc1f8f5 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Random.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Random.java
@@ -38,10 +38,6 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java b/libjava/classpath/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java
index 5822afe0596..c5422871df5 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SRPTrustManagerFactory.java
@@ -44,8 +44,6 @@ import java.math.BigInteger;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyPair;
 import java.security.KeyStore;
-import java.security.Security;
-
 import java.util.HashMap;
 
 import javax.net.ssl.ManagerFactoryParameters;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java b/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
index edc3ac259cb..2d21d9d4554 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
@@ -38,9 +38,6 @@ exception statement from your version. */
 
 package gnu.javax.net.ssl.provider;
 
-import gnu.classpath.debug.Component;
-import gnu.classpath.debug.SystemLogger;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.ByteBuffer;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java b/libjava/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java
index 300012a4b30..e30f04241a0 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java
@@ -775,7 +775,7 @@ class ServerHandshake extends AbstractHandshake
     //     outgoing buffer. This isn't that great because we'd need to
     //     store and copy things unnecessarily.
     //
-    //  2. Build outgoing handshake objects “virtually,” that is, store them
+    //  2. Build outgoing handshake objects 'virtually', that is, store them
     //     as collections of objects, then compute the length, and then write
     //     them to a buffer, instead of making the objects views on
     //     ByteBuffers for both input and output. This would complicate the
@@ -784,7 +784,7 @@ class ServerHandshake extends AbstractHandshake
     //     pretty OK), and we still need to figure out how exactly to chunk
     //     those objects across record boundaries.
     //
-    //  3. Try to build these objects on the buffer we’re given, but detect
+    //  3. Try to build these objects on the buffer we're given, but detect
     //     when we run out of space in the output buffer, and split the
     //     overflow message. This sounds like the best, but also probably
     //     the hardest to code.
@@ -1374,4 +1374,4 @@ output_loop:
       setupSecurityParameters(keys, false, engine, compression);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SessionImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SessionImpl.java
index 86dcb4915cd..6a4020117ec 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SessionImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SessionImpl.java
@@ -40,22 +40,16 @@ package gnu.javax.net.ssl.provider;
 
 import gnu.javax.crypto.key.GnuPBEKey;
 import gnu.javax.net.ssl.Session;
-import gnu.javax.net.ssl.Session.ID;
-
 import java.io.IOException;
 import java.io.Serializable;
 
-import java.security.Certificate;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.SealedObject;
-import javax.crypto.spec.PBEKeySpec;
 import javax.net.ssl.SSLException;
 
 public class SessionImpl extends Session
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Signature.java b/libjava/classpath/gnu/javax/net/ssl/provider/Signature.java
index 8c6cfadc734..d95e181370e 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Signature.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Signature.java
@@ -38,26 +38,11 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import java.math.BigInteger;
-
 import java.nio.ByteBuffer;
 
-import java.security.PublicKey;
-import java.security.interfaces.RSAKey;
-
-import java.util.Arrays;
-
-import gnu.java.security.der.*;
-
 /**
  * The signature structure.
  *
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SimpleSessionContext.java b/libjava/classpath/gnu/javax/net/ssl/provider/SimpleSessionContext.java
index b9d0f95519d..20503d3cabe 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SimpleSessionContext.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SimpleSessionContext.java
@@ -41,8 +41,6 @@ package gnu.javax.net.ssl.provider;
 import gnu.javax.net.ssl.AbstractSessionContext;
 import gnu.javax.net.ssl.Session;
 import gnu.javax.net.ssl.SessionStoreException;
-import gnu.javax.net.ssl.Session.ID;
-
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/TLSHMac.java b/libjava/classpath/gnu/javax/net/ssl/provider/TLSHMac.java
index 18aa8f5f4c7..8bdda930b3c 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/TLSHMac.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/TLSHMac.java
@@ -39,7 +39,6 @@ exception statement from your version.  */
 package gnu.javax.net.ssl.provider;
 
 import java.security.InvalidKeyException;
-import java.util.HashMap;
 import java.util.Map;
 
 import gnu.java.security.hash.IMessageDigest;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java b/libjava/classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java
index 1e4b173595d..85e359675a7 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java
@@ -38,7 +38,6 @@ exception statement from your version.  */
 
 package gnu.javax.net.ssl.provider;
 
-import gnu.java.security.x509.X500DistinguishedName;
 import gnu.javax.net.ssl.provider.Extension.Value;
 
 import java.io.PrintWriter;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java b/libjava/classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
index 2094daf9098..f54dda5bc6d 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
@@ -40,8 +40,6 @@ package gnu.javax.net.ssl.provider;
 
 import gnu.javax.net.ssl.provider.Extension.Value;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.nio.ByteBuffer;
 
 public class UnresolvedExtensionValue extends Value
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java b/libjava/classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
index dc772886697..c3b7e5f4b8f 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
@@ -64,8 +64,6 @@ import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.List;
 
@@ -77,8 +75,6 @@ import javax.net.ssl.KeyManagerFactorySpi;
 import javax.net.ssl.ManagerFactoryParameters;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.X509ExtendedKeyManager;
-import javax.net.ssl.X509KeyManager;
-
 import gnu.javax.net.ssl.NullManagerParameters;
 import gnu.javax.net.ssl.PrivateCredentials;