This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: gcc/libjava java/security/PublicKey.java java/ ...
- From: Matt Kraai <kraai at alumni dot cmu dot edu>
- To: Tom Tromey <tromey at redhat dot com>, java-patches at gcc dot gnu dot org
- Cc: kraai at gcc dot gnu dot org, Java Hackers <java-project at redhat dot com>
- Date: Sun, 4 May 2003 15:34:40 -0700
- Subject: Re: gcc/libjava java/security/PublicKey.java java/ ...
- References: <20030503162048.12551.qmail@sources.redhat.com> <87wuh7rbhh.fsf@fleche.redhat.com>
On Sat, May 03, 2003 at 03:01:14PM -0600, Tom Tromey wrote:
> >>>>> ">" == kraai <kraai@gcc.gnu.org> writes:
>
> >> CVSROOT: /cvs/gcc
> >> Module name: gcc
> >> Changes by: kraai@gcc.gnu.org 2003-05-03 16:20:48
> >> Modified files:
> >> libjava/java/security: PublicKey.java Provider.java
> >> PrivateKey.java Key.java
> >> libjava/gnu/awt/gtk: GtkWindowPeer.java GtkToolkit.java
> >> GtkMainThread.java GtkLabelPeer.java
> >> GtkFramePeer.java GtkContainerPeer.java
> >> GtkComponentPeer.java GtkButtonPeer.java
>
> For every commit there must be a corresponding message to
> java-patches. Also, there must be a ChangeLog entry. Finally,
> changes to merged code must go in Classpath as well.
>
> This patch violates all of these.
>
> Mr. Kraai, please write and check in a ChangeLog entry.
Done.
> Also, please
> check in the corresponding change to Classpath (if you can't do that,
> send me the patch and I will do it).
I can't do that, so I've appended the patch below.
Matt
--
Matt Kraai <kraai@alumni.cmu.edu>
Debian GNU/Linux Peon
Index: libjava/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1871
retrieving revision 1.1872
diff -c -3 -p -r1.1871 -r1.1872
*** libjava/ChangeLog 2 May 2003 14:23:20 -0000 1.1871
--- libjava/ChangeLog 4 May 2003 22:26:43 -0000 1.1872
***************
*** 1,3 ****
--- 1,19 ----
+ 2003-05-03 Matt Kraai <kraai@alumni.cmu.edu>
+
+ * gnu/awt/gtk/GtkButtonPeer.java: Fix misspelling of
+ "version".
+ * gnu/awt/gtk/GtkComponentPeer.java: Likewise.
+ * gnu/awt/gtk/GtkContainerPeer.java: Likewise.
+ * gnu/awt/gtk/GtkFramePeer.java: Likewise.
+ * gnu/awt/gtk/GtkLabelPeer.java: Likewise.
+ * gnu/awt/gtk/GtkMainThread.java: Likewise.
+ * gnu/awt/gtk/GtkToolkit.java: Likewise.
+ * gnu/awt/gtk/GtkWindowPeer.java: Likewise.
+ * java/security/Key.java: Likewise.
+ * java/security/PrivateKey.java: Likewise.
+ * java/security/Provider.java: Likewise.
+ * java/security/PublicKey.java: Likewise.
+
2003-05-02 Michael Koch <konqueror@gmx.de>
* java/net/URI.java
Index: libjava/gnu/awt/gtk/GtkButtonPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/gtk/GtkButtonPeer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** libjava/gnu/awt/gtk/GtkButtonPeer.java 12 Jan 2001 23:08:23 -0000 1.1
--- libjava/gnu/awt/gtk/GtkButtonPeer.java 3 May 2003 16:20:48 -0000 1.2
*************** This file is part of the peer AWT librar
*** 6,12 ****
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later verion.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
--- 6,12 ----
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later version.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Index: libjava/gnu/awt/gtk/GtkContainerPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/gtk/GtkContainerPeer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** libjava/gnu/awt/gtk/GtkContainerPeer.java 2 Oct 2000 05:14:25 -0000 1.1
--- libjava/gnu/awt/gtk/GtkContainerPeer.java 3 May 2003 16:20:48 -0000 1.2
*************** This file is part of the peer AWT librar
*** 6,12 ****
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later verion.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
--- 6,12 ----
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later version.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Index: libjava/gnu/awt/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/gtk/GtkFramePeer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** libjava/gnu/awt/gtk/GtkFramePeer.java 2 Oct 2000 05:14:25 -0000 1.1
--- libjava/gnu/awt/gtk/GtkFramePeer.java 3 May 2003 16:20:48 -0000 1.2
*************** This file is part of the peer AWT librar
*** 6,12 ****
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later verion.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
--- 6,12 ----
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later version.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Index: libjava/gnu/awt/gtk/GtkLabelPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/gtk/GtkLabelPeer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** libjava/gnu/awt/gtk/GtkLabelPeer.java 12 Jan 2001 23:08:23 -0000 1.1
--- libjava/gnu/awt/gtk/GtkLabelPeer.java 3 May 2003 16:20:48 -0000 1.2
*************** This file is part of the peer AWT librar
*** 6,12 ****
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later verion.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
--- 6,12 ----
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later version.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Index: libjava/gnu/awt/gtk/GtkWindowPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/gtk/GtkWindowPeer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** libjava/gnu/awt/gtk/GtkWindowPeer.java 2 Oct 2000 05:14:25 -0000 1.1
--- libjava/gnu/awt/gtk/GtkWindowPeer.java 3 May 2003 16:20:48 -0000 1.2
*************** This file is part of the peer AWT librar
*** 6,12 ****
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later verion.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
--- 6,12 ----
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later version.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Index: libjava/gnu/awt/gtk/GtkMainThread.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/gtk/GtkMainThread.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** libjava/gnu/awt/gtk/GtkMainThread.java 2 Oct 2000 05:14:25 -0000 1.1
--- libjava/gnu/awt/gtk/GtkMainThread.java 3 May 2003 16:20:48 -0000 1.2
*************** This file is part of the peer AWT librar
*** 6,12 ****
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later verion.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
--- 6,12 ----
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later version.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Index: libjava/gnu/awt/gtk/GtkToolkit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/awt/gtk/GtkToolkit.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -3 -p -r1.1 -r1.2
*** libjava/gnu/awt/gtk/GtkToolkit.java 2 Oct 2000 05:14:25 -0000 1.1
--- libjava/gnu/awt/gtk/GtkToolkit.java 3 May 2003 16:20:48 -0000 1.2
*************** This file is part of the peer AWT librar
*** 6,12 ****
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later verion.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
--- 6,12 ----
This library is free software; you can redistribute it and/or modify
it under the terms of the GNU Library General Public License as published
by the Free Software Foundation, either version 2 of the License, or
! (at your option) any later version.
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Index: libjava/java/security/Key.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/Key.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -3 -p -r1.7 -r1.8
*** libjava/java/security/Key.java 24 May 2002 11:57:16 -0000 1.7
--- libjava/java/security/Key.java 3 May 2003 16:20:48 -0000 1.8
*************** import java.io.Serializable;
*** 62,68 ****
public interface Key extends Serializable
{
/**
! * The verion identifier used for serialization.
*/
long serialVersionUID = 6603384152749567654L;
--- 62,68 ----
public interface Key extends Serializable
{
/**
! * The version identifier used for serialization.
*/
long serialVersionUID = 6603384152749567654L;
Index: libjava/java/security/PrivateKey.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/PrivateKey.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -3 -p -r1.5 -r1.6
*** libjava/java/security/PrivateKey.java 24 May 2002 11:57:21 -0000 1.5
--- libjava/java/security/PrivateKey.java 3 May 2003 16:20:48 -0000 1.6
*************** package java.security;
*** 56,62 ****
public interface PrivateKey extends Key
{
/**
! * The verion identifier used for serialization.
*/
long serialVersionUID = 6034044314589513430L;
} // interface PrivateKey
--- 56,62 ----
public interface PrivateKey extends Key
{
/**
! * The version identifier used for serialization.
*/
long serialVersionUID = 6034044314589513430L;
} // interface PrivateKey
Index: libjava/java/security/PublicKey.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/PublicKey.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -3 -p -r1.5 -r1.6
*** libjava/java/security/PublicKey.java 24 May 2002 11:57:23 -0000 1.5
--- libjava/java/security/PublicKey.java 3 May 2003 16:20:48 -0000 1.6
*************** package java.security;
*** 54,60 ****
public interface PublicKey extends Key
{
/**
! * The verion identifier used for serialization.
*/
long serialVersionUID = 7187392471159151072L;
} // interface PublicKey
--- 54,60 ----
public interface PublicKey extends Key
{
/**
! * The version identifier used for serialization.
*/
long serialVersionUID = 7187392471159151072L;
} // interface PublicKey
Index: libjava/java/security/Provider.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/Provider.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -3 -p -r1.7 -r1.8
*** libjava/java/security/Provider.java 17 Nov 2002 00:10:24 -0000 1.7
--- libjava/java/security/Provider.java 3 May 2003 16:20:48 -0000 1.8
*************** import java.util.Properties;
*** 45,51 ****
* The services provided by a such a provider can range from security
* algorithms to key generation.
* <p>
! * Providers are installed by name and verion number. There is one
* standard provider supplied with the class library. This is the
* "GNU" provider, which can also be accessed by the alias "SUN" for
* compatibility with the JDK.
--- 45,51 ----
* The services provided by a such a provider can range from security
* algorithms to key generation.
* <p>
! * Providers are installed by name and version number. There is one
* standard provider supplied with the class library. This is the
* "GNU" provider, which can also be accessed by the alias "SUN" for
* compatibility with the JDK.