[kaffe] CVS kaffe (robilad): Merged in serialver from GNU Classpath tools project

Kaffe CVS cvs-commits at kaffe.org
Tue Mar 8 12:32:14 PST 2005


PatchSet 5497 
Date: 2005/03/08 20:27:56
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Merged in serialver from GNU Classpath tools project

2005-03-08  Dalibor Topic  <robilad at kaffe.org>

        * kaffe/scripts/serialver.in:
        Use gnu.classpath.tools.serialver.SerialVer.

        * libraries/javalib/Makefile.am,
        libraries/javalib/Makefile.in,
        libraries/javalib/all.files:
        Regenerated.

        * libraries/javalib/gnu/classpath/tools/serialver/SerialVer.java:
        New file, taken from GNU Classpath tools project.

        * libraries/javalib/kaffe/tools/serialver/SerialVer.java:
        Removed.

Members: 
	ChangeLog:1.3671->1.3672 
	kaffe/scripts/serialver.in:1.5->1.6 
	libraries/javalib/Makefile.am:1.318->1.319 
	libraries/javalib/Makefile.in:1.404->1.405 
	libraries/javalib/all.files:1.98->1.99 
	libraries/javalib/gnu/classpath/tools/serialver/SerialVer.java:INITIAL->1.1 
	libraries/javalib/kaffe/tools/serialver/SerialVer.java:1.1->1.2(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3671 kaffe/ChangeLog:1.3672
--- kaffe/ChangeLog:1.3671	Tue Mar  8 16:33:19 2005
+++ kaffe/ChangeLog	Tue Mar  8 20:27:56 2005
@@ -1,5 +1,21 @@
 2005-03-08  Dalibor Topic  <robilad at kaffe.org>
 
+        * kaffe/scripts/serialver.in:
+	Use gnu.classpath.tools.serialver.SerialVer.
+
+        * libraries/javalib/Makefile.am,
+        libraries/javalib/Makefile.in,
+        libraries/javalib/all.files:
+	Regenerated.
+
+        * libraries/javalib/gnu/classpath/tools/serialver/SerialVer.java:
+	New file, taken from GNU Classpath tools project.
+
+        * libraries/javalib/kaffe/tools/serialver/SerialVer.java:
+	Removed.
+
+2005-03-08  Dalibor Topic  <robilad at kaffe.org>
+
         * kaffe/scripts/rmic.in:
 	Use gnu.classpath.tools.rmi.rmic.RMIC.
 
Index: kaffe/kaffe/scripts/serialver.in
diff -u kaffe/kaffe/scripts/serialver.in:1.5 kaffe/kaffe/scripts/serialver.in:1.6
--- kaffe/kaffe/scripts/serialver.in:1.5	Fri May 21 14:39:33 2004
+++ kaffe/kaffe/scripts/serialver.in	Tue Mar  8 20:27:59 2005
@@ -1,6 +1,6 @@
 #! /bin/sh
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS kaffe.tools.serialver.SerialVer ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS gnu.classpath.tools.serialver.SerialVer ${1+"$@"}
 exit $?
 
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.318 kaffe/libraries/javalib/Makefile.am:1.319
--- kaffe/libraries/javalib/Makefile.am:1.318	Tue Mar  8 16:33:23 2005
+++ kaffe/libraries/javalib/Makefile.am	Tue Mar  8 20:27:59 2005
@@ -57,6 +57,7 @@
 	$(gnu_classpath_tools_javap_SRCS) \
 	$(gnu_classpath_tools_native2ascii_SRCS) \
 	$(gnu_classpath_tools_rmi_rmic_SRCS) \
+	$(gnu_classpath_tools_serialver_SRCS) \
 	$(gnu_crypto_SRCS) \
 	$(gnu_crypto_assembly_SRCS) \
 	$(gnu_crypto_auth_SRCS) \
@@ -282,7 +283,6 @@
 	$(kaffe_security_SRCS) \
 	$(kaffe_security_provider_SRCS) \
 	$(kaffe_tools_jar_SRCS) \
-	$(kaffe_tools_serialver_SRCS) \
 	$(kaffe_util_SRCS) \
 	$(kaffe_util_locale_SRCS) \
 	$(kaffe_util_log_SRCS) \
@@ -412,6 +412,8 @@
 	gnu/classpath/tools/rmi/rmic/RMIC.java \
 	gnu/classpath/tools/rmi/rmic/RMICException.java \
 	gnu/classpath/tools/rmi/rmic/TabbedWriter.java
+gnu_classpath_tools_serialver_SRCS = \
+	gnu/classpath/tools/serialver/SerialVer.java
 gnu_crypto_SRCS = \
 	gnu/crypto/Properties.java \
 	gnu/crypto/Registry.java
@@ -4099,8 +4101,6 @@
 	kaffe/tools/jar/XPFileOutputStream.java \
 	kaffe/tools/jar/XPFileReader.java \
 	kaffe/tools/jar/XPFileWriter.java
-kaffe_tools_serialver_SRCS = \
-	kaffe/tools/serialver/SerialVer.java
 kaffe_util_SRCS = \
 	kaffe/util/Assert.java \
 	kaffe/util/Base64.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.404 kaffe/libraries/javalib/Makefile.in:1.405
--- kaffe/libraries/javalib/Makefile.in:1.404	Tue Mar  8 16:33:24 2005
+++ kaffe/libraries/javalib/Makefile.in	Tue Mar  8 20:28:02 2005
@@ -409,6 +409,7 @@
 	$(gnu_classpath_tools_javap_SRCS) \
 	$(gnu_classpath_tools_native2ascii_SRCS) \
 	$(gnu_classpath_tools_rmi_rmic_SRCS) \
+	$(gnu_classpath_tools_serialver_SRCS) \
 	$(gnu_crypto_SRCS) \
 	$(gnu_crypto_assembly_SRCS) \
 	$(gnu_crypto_auth_SRCS) \
@@ -634,7 +635,6 @@
 	$(kaffe_security_SRCS) \
 	$(kaffe_security_provider_SRCS) \
 	$(kaffe_tools_jar_SRCS) \
-	$(kaffe_tools_serialver_SRCS) \
 	$(kaffe_util_SRCS) \
 	$(kaffe_util_locale_SRCS) \
 	$(kaffe_util_log_SRCS) \
@@ -772,6 +772,9 @@
 	gnu/classpath/tools/rmi/rmic/RMICException.java \
 	gnu/classpath/tools/rmi/rmic/TabbedWriter.java
 
+gnu_classpath_tools_serialver_SRCS = \
+	gnu/classpath/tools/serialver/SerialVer.java
+
 gnu_crypto_SRCS = \
 	gnu/crypto/Properties.java \
 	gnu/crypto/Registry.java
@@ -4683,9 +4686,6 @@
 	kaffe/tools/jar/XPFileOutputStream.java \
 	kaffe/tools/jar/XPFileReader.java \
 	kaffe/tools/jar/XPFileWriter.java
-
-kaffe_tools_serialver_SRCS = \
-	kaffe/tools/serialver/SerialVer.java
 
 kaffe_util_SRCS = \
 	kaffe/util/Assert.java \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.98 kaffe/libraries/javalib/all.files:1.99
--- kaffe/libraries/javalib/all.files:1.98	Tue Mar  8 16:33:25 2005
+++ kaffe/libraries/javalib/all.files	Tue Mar  8 20:28:03 2005
@@ -75,6 +75,7 @@
 gnu/classpath/tools/rmi/rmic/RMIC.java
 gnu/classpath/tools/rmi/rmic/RMICException.java
 gnu/classpath/tools/rmi/rmic/TabbedWriter.java
+gnu/classpath/tools/serialver/SerialVer.java
 gnu/crypto/Properties.java
 gnu/crypto/Registry.java
 gnu/crypto/assembly/Assembly.java
@@ -3537,7 +3538,6 @@
 kaffe/tools/jar/XPFileOutputStream.java
 kaffe/tools/jar/XPFileReader.java
 kaffe/tools/jar/XPFileWriter.java
-kaffe/tools/serialver/SerialVer.java
 kaffe/util/Assert.java
 kaffe/util/Base64.java
 kaffe/util/DateParser.java
===================================================================
Checking out kaffe/libraries/javalib/gnu/classpath/tools/serialver/SerialVer.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/classpath/tools/serialver/SerialVer.java,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/classpath/tools/serialver/SerialVer.java	Tue Mar  8 20:32:14 2005
@@ -0,0 +1,60 @@
+/* gnu.classpath.tools.SerialVer
+ Copyright (C) 1998, 1999, 2000, 2001 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. */
+package gnu.classpath.tools.serialver;
+
+import java.io.ObjectStreamClass;
+
+/**
+ * This class is an implementation of the `serialver' program. Any number of
+ * class names can be passed as arguments, and the serial version unique
+ * identitfier for each class will be printed in a manner suitable for cuting
+ * and pasting into a Java source file.
+ */
+public class SerialVer
+{
+  public static void main(String[] args)
+  {
+    if (args.length == 0)
+      {
+        System.out.println("Usage: serialver [CLASS]...");
+        return;
+      }
+    Class clazz;
+    ObjectStreamClass osc;
+    for (int i = 0; i < args.length; i++)
+      {
+        try
+          {
+            clazz = Class.forName(args[i]);
+            osc = ObjectStreamClass.lookup(clazz);
+            if (osc != null)
+              System.out.println(clazz.getName() + ": "
+                                 + "static final long serialVersionUID = "
+                                 + osc.getSerialVersionUID() + "L;");
+            else
+              System.err.println("Class " + args[i] + " is not serializable");
+          }
+        catch (ClassNotFoundException e)
+          {
+            System.err.println("Class for " + args[i] + " not found");
+          }
+      }
+  }
+}
\ No newline at end of file
===================================================================
Checking out kaffe/libraries/javalib/kaffe/tools/serialver/SerialVer.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/kaffe/tools/serialver/Attic/SerialVer.java,v
VERS: 1.1
***************
--- kaffe/libraries/javalib/kaffe/tools/serialver/SerialVer.java	Tue Mar  8 20:32:14 2005
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,39 +0,0 @@
-/*
- * Java core library component.
- *
- * Copyright (c) 1997, 1998, 1999
- *      Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- */
-
-package kaffe.tools.serialver;
-
-import java.io.ObjectStreamClass;
-
-public class SerialVer {
-
-public static void main(String[] args) {
-	if (args.length == 0) {
-		System.err.println("Usage: serialver [classname ...]");
-		System.exit(1);
-	}
-	for (int i = 0; i < args.length; i++) {
-		try {
-			Class clz = Class.forName(args[i]);
-			ObjectStreamClass stream = ObjectStreamClass.lookup(clz);
-			if (stream != null) {
-				System.out.println(args[i] + ": static final long serialVersionUID = " + stream.getSerialVersionUID() + "L;");
-			}
-			else {
-				System.out.println("Class " + args[i] + " is not Serializable.");
-			}
-		}
-		catch (ClassNotFoundException _) {
-			System.out.println("Class " + args[i] + " not found.");
-		}
-	}
-}
-
-}




More information about the kaffe mailing list