From 0947959a371305bff4a92fe250948ca684e130ed Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 22 Feb 2005 17:52:40 +0000 Subject: [PATCH] PolicyFile.java, [...]: Fixed copyright header. 2005-02-22 Michael Koch * gnu/java/security/PolicyFile.java, gnu/java/security/pkcs/PKCS7SignedData.java, gnu/java/security/pkcs/SignerInfo.java: Fixed copyright header. From-SVN: r95399 --- libjava/ChangeLog | 7 +++++++ libjava/gnu/java/security/PolicyFile.java | 16 +++++++++------- .../gnu/java/security/pkcs/PKCS7SignedData.java | 13 +++++++------ libjava/gnu/java/security/pkcs/SignerInfo.java | 13 +++++++------ 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8eb46e4eb93..b1fbc96ee24 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2005-02-22 Michael Koch + + * gnu/java/security/PolicyFile.java, + gnu/java/security/pkcs/PKCS7SignedData.java, + gnu/java/security/pkcs/SignerInfo.java: + Fixed copyright header. + 2005-02-22 Jeroen Frijters * java/beans/PropertyDescriptor.java diff --git a/libjava/gnu/java/security/PolicyFile.java b/libjava/gnu/java/security/PolicyFile.java index d5c14dc7a17..c939dda47c4 100644 --- a/libjava/gnu/java/security/PolicyFile.java +++ b/libjava/gnu/java/security/PolicyFile.java @@ -1,18 +1,20 @@ -/* PolicyFile.java -- policy file reader. - Copyright (C) 2004 Free Software Foundation, Inc. +/* PolicyFile.java -- policy file reader + Copyright (C) 2004, 2005 Free Software Foundation, Inc. -This program is free software; you can redistribute it and/or modify +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. -This program 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 this program; see the file COPYING. If not, write to the +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. @@ -33,7 +35,6 @@ 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 gnu.java.security; import java.io.File; @@ -143,7 +144,8 @@ public final class PolicyFile extends Policy // ------------------------------------------------------------------------- private static final boolean DEBUG = true; - private static void debug(String msg) + // Package-private to avoid a trampoline. + static void debug(String msg) { System.err.print(">> PolicyFile: "); System.err.println(msg); diff --git a/libjava/gnu/java/security/pkcs/PKCS7SignedData.java b/libjava/gnu/java/security/pkcs/PKCS7SignedData.java index 5c2a98a5cac..869febebd9c 100644 --- a/libjava/gnu/java/security/pkcs/PKCS7SignedData.java +++ b/libjava/gnu/java/security/pkcs/PKCS7SignedData.java @@ -1,18 +1,20 @@ -/* PKCS7SignedData.java -- reader for PKCS#7 signedData objects. - Copyright (C) 2004 Free Software Foundation, Inc. +/* PKCS7SignedData.java -- reader for PKCS#7 signedData objects + Copyright (C) 2004, 2005 Free Software Foundation, Inc. -This program is free software; you can redistribute it and/or modify +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. -This program 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 this program; see the file COPYING. If not, write to the +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. @@ -33,7 +35,6 @@ 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 gnu.java.security.pkcs; import gnu.java.security.OID; diff --git a/libjava/gnu/java/security/pkcs/SignerInfo.java b/libjava/gnu/java/security/pkcs/SignerInfo.java index 15fe9f9f860..d6b747dea6e 100644 --- a/libjava/gnu/java/security/pkcs/SignerInfo.java +++ b/libjava/gnu/java/security/pkcs/SignerInfo.java @@ -1,18 +1,20 @@ -/* SignerInfo.java -- a SignerInfo object, from PKCS #7. - Copyright (C) 2004 Free Software Foundation, Inc. +/* SignerInfo.java -- a SignerInfo object, from PKCS #7 + Copyright (C) 2004, 2005 Free Software Foundation, Inc. -This program is free software; you can redistribute it and/or modify +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. -This program 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 this program; see the file COPYING. If not, write to the +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. @@ -33,7 +35,6 @@ 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 gnu.java.security.pkcs; import gnu.java.security.OID; -- 2.30.2