[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: overall cleanups
Kaffe CVS
cvs-commits at kaffe.org
Sat Oct 23 04:28:26 PDT 2004
PatchSet 5332
Date: 2004/10/23 11:24:18
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: overall cleanups
2004-10-23 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/io/File.java,
libraries/javalib/java/sql/Timestamp.java,
libraries/javalib/java/text/AttributedCharacterIterator.java,
libraries/javalib/java/text/AttributedString.java,
libraries/javalib/java/util/zip/CheckedOutputStream.java,
libraries/javalib/java/util/zip/GZIPInputStream.java,
libraries/javalib/javax/crypto/Cipher.java,
libraries/javalib/javax/crypto/ExemptionMechanismException.java,
libraries/javalib/javax/crypto/SecretKey.java,
libraries/javalib/javax/crypto/SecretKeyFactory.java,
libraries/javalib/javax/naming/directory/ModificationItem.java,
libraries/javalib/javax/naming/directory/SearchControls.java,
libraries/javalib/javax/naming/event/NamingListener.java,
libraries/javalib/javax/naming/ldap/Control.java,
libraries/javalib/javax/naming/ldap/ExtendedResponse.java,
libraries/javalib/javax/net/ssl/SSLSocketFactory.java:
Resynced with GNU Classpath.
2004-10-20 Michael Koch <konqueror at gmx.de>
* java/io/File.java:
Fixed @author tag to be HTML compatible.
* java/sql/Timestamp.java,
java/text/AttributedCharacterIterator.java,
java/text/AttributedString.java,
java/util/zip/CheckedOutputStream.java,
java/util/zip/DeflaterOutputStream.java,
java/util/zip/GZIPInputStream.java,
java/util/zip/ZipFile.java,
javax/crypto/Cipher.java,
javax/crypto/ExemptionMechanismException.java,
javax/crypto/SecretKey.java,
javax/crypto/SecretKeyFactory.java,
javax/naming/directory/ModificationItem.java,
javax/naming/directory/SearchControls.java,
javax/naming/event/NamingListener.java,
javax/naming/ldap/Control.java,
javax/naming/ldap/ExtendedResponse.java,
javax/net/ssl/SSLSocketFactory.java:
Reorganized imports and fixed copyright headers.
Members:
ChangeLog:1.2884->1.2885
libraries/javalib/java/io/File.java:1.54->1.55
libraries/javalib/java/sql/Timestamp.java:1.9->1.10
libraries/javalib/java/text/AttributedCharacterIterator.java:1.7->1.8
libraries/javalib/java/text/AttributedString.java:1.8->1.9
libraries/javalib/java/util/zip/CheckedOutputStream.java:1.4->1.5
libraries/javalib/java/util/zip/GZIPInputStream.java:1.13->1.14
libraries/javalib/javax/crypto/Cipher.java:1.1->1.2
libraries/javalib/javax/crypto/ExemptionMechanismException.java:1.1->1.2
libraries/javalib/javax/crypto/SecretKey.java:1.1->1.2
libraries/javalib/javax/crypto/SecretKeyFactory.java:1.1->1.2
libraries/javalib/javax/naming/directory/ModificationItem.java:1.1->1.2
libraries/javalib/javax/naming/directory/SearchControls.java:1.2->1.3
libraries/javalib/javax/naming/event/NamingListener.java:1.2->1.3
libraries/javalib/javax/naming/ldap/Control.java:1.2->1.3
libraries/javalib/javax/naming/ldap/ExtendedResponse.java:1.2->1.3
libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2884 kaffe/ChangeLog:1.2885
--- kaffe/ChangeLog:1.2884 Sat Oct 23 10:40:48 2004
+++ kaffe/ChangeLog Sat Oct 23 11:24:18 2004
@@ -1,5 +1,48 @@
2004-10-23 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/java/io/File.java,
+ libraries/javalib/java/sql/Timestamp.java,
+ libraries/javalib/java/text/AttributedCharacterIterator.java,
+ libraries/javalib/java/text/AttributedString.java,
+ libraries/javalib/java/util/zip/CheckedOutputStream.java,
+ libraries/javalib/java/util/zip/GZIPInputStream.java,
+ libraries/javalib/javax/crypto/Cipher.java,
+ libraries/javalib/javax/crypto/ExemptionMechanismException.java,
+ libraries/javalib/javax/crypto/SecretKey.java,
+ libraries/javalib/javax/crypto/SecretKeyFactory.java,
+ libraries/javalib/javax/naming/directory/ModificationItem.java,
+ libraries/javalib/javax/naming/directory/SearchControls.java,
+ libraries/javalib/javax/naming/event/NamingListener.java,
+ libraries/javalib/javax/naming/ldap/Control.java,
+ libraries/javalib/javax/naming/ldap/ExtendedResponse.java,
+ libraries/javalib/javax/net/ssl/SSLSocketFactory.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-20 Michael Koch <konqueror at gmx.de>
+
+ * java/io/File.java:
+ Fixed @author tag to be HTML compatible.
+ * java/sql/Timestamp.java,
+ java/text/AttributedCharacterIterator.java,
+ java/text/AttributedString.java,
+ java/util/zip/CheckedOutputStream.java,
+ java/util/zip/DeflaterOutputStream.java,
+ java/util/zip/GZIPInputStream.java,
+ java/util/zip/ZipFile.java,
+ javax/crypto/Cipher.java,
+ javax/crypto/ExemptionMechanismException.java,
+ javax/crypto/SecretKey.java,
+ javax/crypto/SecretKeyFactory.java,
+ javax/naming/directory/ModificationItem.java,
+ javax/naming/directory/SearchControls.java,
+ javax/naming/event/NamingListener.java,
+ javax/naming/ldap/Control.java,
+ javax/naming/ldap/ExtendedResponse.java,
+ javax/net/ssl/SSLSocketFactory.java:
+ Reorganized imports and fixed copyright headers.
+
+2004-10-23 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/java/util/logging/ConsoleHandler.java,
libraries/javalib/java/util/logging/ErrorManager.java,
libraries/javalib/java/util/logging/FileHandler.java,
Index: kaffe/libraries/javalib/java/io/File.java
diff -u kaffe/libraries/javalib/java/io/File.java:1.54 kaffe/libraries/javalib/java/io/File.java:1.55
--- kaffe/libraries/javalib/java/io/File.java:1.54 Tue Aug 17 17:55:01 2004
+++ kaffe/libraries/javalib/java/io/File.java Sat Oct 23 11:24:19 2004
@@ -55,8 +55,8 @@
* types of path separators ("/" versus "\", for example). It also
* contains method useful for creating and deleting files and directories.
*
- * @author Aaron M. Renn <arenn at urbanophile.com>
- * @author Tom Tromey <tromey at cygnus.com>
+ * @author Aaron M. Renn (arenn at urbanophile.com)
+ * @author Tom Tromey (tromey at cygnus.com)
*/
public class File implements Serializable, Comparable
{
Index: kaffe/libraries/javalib/java/sql/Timestamp.java
diff -u kaffe/libraries/javalib/java/sql/Timestamp.java:1.9 kaffe/libraries/javalib/java/sql/Timestamp.java:1.10
--- kaffe/libraries/javalib/java/sql/Timestamp.java:1.9 Sun Aug 8 19:46:01 2004
+++ kaffe/libraries/javalib/java/sql/Timestamp.java Sat Oct 23 11:24:19 2004
@@ -1,5 +1,5 @@
/* Time.java -- Wrapper around java.util.Date
- Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,8 +38,8 @@
package java.sql;
-import java.text.ParseException;
import java.text.DecimalFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
/**
Index: kaffe/libraries/javalib/java/text/AttributedCharacterIterator.java
diff -u kaffe/libraries/javalib/java/text/AttributedCharacterIterator.java:1.7 kaffe/libraries/javalib/java/text/AttributedCharacterIterator.java:1.8
--- kaffe/libraries/javalib/java/text/AttributedCharacterIterator.java:1.7 Fri Apr 23 17:35:12 2004
+++ kaffe/libraries/javalib/java/text/AttributedCharacterIterator.java Sat Oct 23 11:24:21 2004
@@ -38,10 +38,10 @@
package java.text;
-import java.io.Serializable;
import java.io.InvalidObjectException;
-import java.util.Set;
+import java.io.Serializable;
import java.util.Map;
+import java.util.Set;
/**
* This interface extends the <code>CharacterIterator</code> interface
Index: kaffe/libraries/javalib/java/text/AttributedString.java
diff -u kaffe/libraries/javalib/java/text/AttributedString.java:1.8 kaffe/libraries/javalib/java/text/AttributedString.java:1.9
--- kaffe/libraries/javalib/java/text/AttributedString.java:1.8 Tue Aug 17 17:55:03 2004
+++ kaffe/libraries/javalib/java/text/AttributedString.java Sat Oct 23 11:24:21 2004
@@ -38,8 +38,8 @@
package java.text;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
Index: kaffe/libraries/javalib/java/util/zip/CheckedOutputStream.java
diff -u kaffe/libraries/javalib/java/util/zip/CheckedOutputStream.java:1.4 kaffe/libraries/javalib/java/util/zip/CheckedOutputStream.java:1.5
--- kaffe/libraries/javalib/java/util/zip/CheckedOutputStream.java:1.4 Wed Apr 21 14:59:06 2004
+++ kaffe/libraries/javalib/java/util/zip/CheckedOutputStream.java Sat Oct 23 11:24:22 2004
@@ -35,11 +35,12 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.util.zip;
import java.io.FilterOutputStream;
-import java.io.OutputStream;
import java.io.IOException;
+import java.io.OutputStream;
/* Written using on-line Java Platform 1.2 API Specification
* and JCL book.
Index: kaffe/libraries/javalib/java/util/zip/GZIPInputStream.java
diff -u kaffe/libraries/javalib/java/util/zip/GZIPInputStream.java:1.13 kaffe/libraries/javalib/java/util/zip/GZIPInputStream.java:1.14
--- kaffe/libraries/javalib/java/util/zip/GZIPInputStream.java:1.13 Thu Oct 14 19:42:57 2004
+++ kaffe/libraries/javalib/java/util/zip/GZIPInputStream.java Sat Oct 23 11:24:22 2004
@@ -35,11 +35,12 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.util.zip;
-import java.io.InputStream;
-import java.io.IOException;
import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
/**
* This filter stream is used to decompress a "GZIP" format stream.
@@ -197,14 +198,11 @@
eos = true;
return;
}
+ int magic2 = in.read();
+ if ((magic + (magic2 << 8)) != GZIP_MAGIC)
+ throw new IOException("Error in GZIP header, bad magic code");
headCRC.update(magic);
- if (magic != (GZIP_MAGIC & 0xff))
- throw new IOException("Error in GZIP header, second byte doesn't match");
-
- magic = in.read();
- if (magic != (GZIP_MAGIC >> 8))
- throw new IOException("Error in GZIP header, first byte doesn't match");
- headCRC.update(magic);
+ headCRC.update(magic2);
/* 2. Check the compression type (must be 8) */
int CM = in.read();
Index: kaffe/libraries/javalib/javax/crypto/Cipher.java
diff -u kaffe/libraries/javalib/javax/crypto/Cipher.java:1.1 kaffe/libraries/javalib/javax/crypto/Cipher.java:1.2
--- kaffe/libraries/javalib/javax/crypto/Cipher.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/Cipher.java Sat Oct 23 11:24:22 2004
@@ -1,25 +1,22 @@
/* Cipher.java -- Interface to a cryptographic cipher.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 of the License, or (at your
-option) any later version.
+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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; if not, write to the
-
- Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330,
- Boston, MA 02111-1307
- USA
+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.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
@@ -29,18 +26,20 @@
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under terms
-of your choice, provided that you also meet, for each linked independent
-module, the terms and conditions of the license of that module. An
-independent module is a module which is not derived from or based on
-this library. If you modify this library, you may extend this exception
-to your version of the library, but you are not obligated to do so. If
-you do not wish to do so, delete this exception statement from your
-version. */
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
package javax.crypto;
+import gnu.java.security.Engine;
+
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
@@ -53,8 +52,6 @@
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import java.security.spec.AlgorithmParameterSpec;
-
-import java.util.Enumeration;
import java.util.StringTokenizer;
/**
@@ -91,7 +88,7 @@
* e.g. <code>"AES/OFB8/NoPadding"</code>. If no such number is
* specified a provider-specific default value is used.</p>
*
- * @author Casey Marshall <rsdio at metastatic.org>
+ * @author Casey Marshall (csm at gnu.org)
* @see java.security.KeyGenerator
* @see javax.crypto.SecretKey
*/
Index: kaffe/libraries/javalib/javax/crypto/ExemptionMechanismException.java
diff -u kaffe/libraries/javalib/javax/crypto/ExemptionMechanismException.java:1.1 kaffe/libraries/javalib/javax/crypto/ExemptionMechanismException.java:1.2
--- kaffe/libraries/javalib/javax/crypto/ExemptionMechanismException.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/ExemptionMechanismException.java Sat Oct 23 11:24:22 2004
@@ -1,23 +1,22 @@
/* ExemptionMechanismException -- An error in an exemption mechanism.
- Copyright (C) 2003 Casey Marshall <rsdio at metastatic.org>
+ Copyright (C) 2004 Free Software Foundation, Inc.
-This program 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 of the License, or (at your
-option) any later version.
+This file is part of GNU Classpath.
-This program is distributed in the hope that it will be useful, but
+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 this program; if not, write to the
-
- Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330,
- Boston, MA 02111-1307
- USA
+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.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
@@ -27,14 +26,14 @@
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under terms
-of your choice, provided that you also meet, for each linked independent
-module, the terms and conditions of the license of that module. An
-independent module is a module which is not derived from or based on
-this library. If you modify this library, you may extend this exception
-to your version of the library, but you are not obligated to do so. If
-you do not wish to do so, delete this exception statement from your
-version. */
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
package javax.crypto;
@@ -44,7 +43,7 @@
/**
* Signals a general exception in an {@link ExemptionMechanism}.
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
* @since 1.4
*/
public class ExemptionMechanismException extends GeneralSecurityException
Index: kaffe/libraries/javalib/javax/crypto/SecretKey.java
diff -u kaffe/libraries/javalib/javax/crypto/SecretKey.java:1.1 kaffe/libraries/javalib/javax/crypto/SecretKey.java:1.2
--- kaffe/libraries/javalib/javax/crypto/SecretKey.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/SecretKey.java Sat Oct 23 11:24:22 2004
@@ -1,25 +1,22 @@
/* SecretKey.java -- A key for symmetric cryptography.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 of the License, or (at your
-option) any later version.
+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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; if not, write to the
-
- Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330,
- Boston, MA 02111-1307
- USA
+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.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
@@ -29,14 +26,14 @@
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under terms
-of your choice, provided that you also meet, for each linked independent
-module, the terms and conditions of the license of that module. An
-independent module is a module which is not derived from or based on
-this library. If you modify this library, you may extend this exception
-to your version of the library, but you are not obligated to do so. If
-you do not wish to do so, delete this exception statement from your
-version. */
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
package javax.crypto;
@@ -58,7 +55,7 @@
* methods of {@link java.lang.Object} to use the actual key data rather
* than the identity-based default methods.</p>
*
- * @author Casey Marshall <rsdio at metastatic.org>
+ * @author Casey Marshall (csm at gnu.org)
* @see javax.crypto.SecretKeyFactory
* @see javax.crypto.Cipher
*/
Index: kaffe/libraries/javalib/javax/crypto/SecretKeyFactory.java
diff -u kaffe/libraries/javalib/javax/crypto/SecretKeyFactory.java:1.1 kaffe/libraries/javalib/javax/crypto/SecretKeyFactory.java:1.2
--- kaffe/libraries/javalib/javax/crypto/SecretKeyFactory.java:1.1 Wed Jul 21 01:42:10 2004
+++ kaffe/libraries/javalib/javax/crypto/SecretKeyFactory.java Sat Oct 23 11:24:22 2004
@@ -1,25 +1,22 @@
/* SecretKeyFactory.java -- Factory for creating secret keys.
Copyright (C) 2004 Free Software Foundation, Inc.
-This file is a part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto 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 of the License, or (at your
-option) any later version.
+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 Crypto is distributed in the hope that it will be useful, but
+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 Crypto; if not, write to the
-
- Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330,
- Boston, MA 02111-1307
- USA
+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.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
@@ -29,28 +26,28 @@
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under terms
-of your choice, provided that you also meet, for each linked independent
-module, the terms and conditions of the license of that module. An
-independent module is a module which is not derived from or based on
-this library. If you modify this library, you may extend this exception
-to your version of the library, but you are not obligated to do so. If
-you do not wish to do so, delete this exception statement from your
-version. */
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
package javax.crypto;
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
+import java.lang.reflect.InvocationTargetException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.Provider;
-import java.security.SecureRandom;
import java.security.Security;
-import java.security.spec.KeySpec;
import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
/**
* A secret key factory translates {@link SecretKey} objects to and from
@@ -58,7 +55,7 @@
* different vendors' representations of {@link SecretKey} objects (for
* security or semantics; whichever applies).
*
- * @author Casey Marshall (rsdio at metastatic.org)
+ * @author Casey Marshall (csm at gnu.org)
* @since 1.4
* @see SecretKey
*/
Index: kaffe/libraries/javalib/javax/naming/directory/ModificationItem.java
diff -u kaffe/libraries/javalib/javax/naming/directory/ModificationItem.java:1.1 kaffe/libraries/javalib/javax/naming/directory/ModificationItem.java:1.2
--- kaffe/libraries/javalib/javax/naming/directory/ModificationItem.java:1.1 Thu Nov 28 10:23:18 2002
+++ kaffe/libraries/javalib/javax/naming/directory/ModificationItem.java Sat Oct 23 11:24:22 2004
@@ -37,6 +37,7 @@
package javax.naming.directory;
+
import java.io.Serializable;
/**
Index: kaffe/libraries/javalib/javax/naming/directory/SearchControls.java
diff -u kaffe/libraries/javalib/javax/naming/directory/SearchControls.java:1.2 kaffe/libraries/javalib/javax/naming/directory/SearchControls.java:1.3
--- kaffe/libraries/javalib/javax/naming/directory/SearchControls.java:1.2 Mon Apr 19 14:16:04 2004
+++ kaffe/libraries/javalib/javax/naming/directory/SearchControls.java Sat Oct 23 11:24:22 2004
@@ -37,6 +37,7 @@
package javax.naming.directory;
+
import java.io.Serializable;
/**
Index: kaffe/libraries/javalib/javax/naming/event/NamingListener.java
diff -u kaffe/libraries/javalib/javax/naming/event/NamingListener.java:1.2 kaffe/libraries/javalib/javax/naming/event/NamingListener.java:1.3
--- kaffe/libraries/javalib/javax/naming/event/NamingListener.java:1.2 Wed Oct 22 10:35:02 2003
+++ kaffe/libraries/javalib/javax/naming/event/NamingListener.java Sat Oct 23 11:24:23 2004
@@ -37,6 +37,7 @@
package javax.naming.event;
+
import java.util.EventListener;
/**
Index: kaffe/libraries/javalib/javax/naming/ldap/Control.java
diff -u kaffe/libraries/javalib/javax/naming/ldap/Control.java:1.2 kaffe/libraries/javalib/javax/naming/ldap/Control.java:1.3
--- kaffe/libraries/javalib/javax/naming/ldap/Control.java:1.2 Wed Oct 22 10:35:02 2003
+++ kaffe/libraries/javalib/javax/naming/ldap/Control.java Sat Oct 23 11:24:23 2004
@@ -37,6 +37,7 @@
package javax.naming.ldap;
+
import java.io.Serializable;
/**
Index: kaffe/libraries/javalib/javax/naming/ldap/ExtendedResponse.java
diff -u kaffe/libraries/javalib/javax/naming/ldap/ExtendedResponse.java:1.2 kaffe/libraries/javalib/javax/naming/ldap/ExtendedResponse.java:1.3
--- kaffe/libraries/javalib/javax/naming/ldap/ExtendedResponse.java:1.2 Wed Oct 22 10:35:02 2003
+++ kaffe/libraries/javalib/javax/naming/ldap/ExtendedResponse.java Sat Oct 23 11:24:23 2004
@@ -37,6 +37,7 @@
package javax.naming.ldap;
+
import java.io.Serializable;
/**
Index: kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.6 kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.7
--- kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java:1.6 Tue Sep 21 13:08:17 2004
+++ kaffe/libraries/javalib/javax/net/ssl/SSLSocketFactory.java Sat Oct 23 11:24:24 2004
@@ -40,10 +40,9 @@
import java.io.IOException;
import java.net.Socket;
-import java.security.AccessController;
import java.security.KeyStore;
-import java.security.PrivilegedAction;
import java.security.Security;
+
import javax.net.SocketFactory;
/**
@@ -52,7 +51,6 @@
*/
public abstract class SSLSocketFactory extends SocketFactory
{
-
// Constants.
// -------------------------------------------------------------------------
More information about the kaffe
mailing list