[kaffe] CVS kaffe (robilad): THIRDPARTY: Removed license information for components that are

Kaffe CVS cvs-commits at kaffe.org
Sun Jan 7 14:15:49 PST 2007


PatchSet 7464 
Date: 2007/01/07 22:14:39
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath up to 2006-12-07

2007-01-07  Dalibor Topic  <robilad at kaffe.org>

        * THIRDPARTY: Removed license information for components that are
        part of GNU Classpath, and added a pointer to its license information
        file instead.

        Replaced kaffe's copy of rmic from GNU Classpath tools project with
        the merged in version from GNU Classpath.

        * configure.ac (AC_CONFIG_FILES): Removed kaffe/scripts/rmic and added
        kaffe/scripts/compat/rmic.

        * kaffe/scripts/Makefile.am (SCRIPTFILES_SUN): Removed rmic.

        * kaffe/scripts/bat/Makefile.am (EXTRA_DIST): Removed rmic.

        * kaffe/scripts/compat/Makefile.am (bin_SCRIPTS): Added rmic.

        * libraries/javalib/external/classpath/ : Resynced up to 2006-12-07.

        * libraries/javalib/external/classpath/tools/Makefile.am: Fixed to work for jikes.

        * tools/javatools/Makefile.am  (dist_tools_JAVA): Removed
        gnu/classpath/tools/rmi/rmic/RMIC.java,
        gnu/classpath/tools/rmi/rmic/RMICException.java,
        gnu/classpath/tools/rmi/rmic/Variables.java,
        org/objectweb/asm153/Attribute.java,
        org/objectweb/asm153/ByteVector.java,
        org/objectweb/asm153/ClassReader.java,
        org/objectweb/asm153/ClassVisitor.java,
        org/objectweb/asm153/ClassWriter.java,
        org/objectweb/asm153/CodeVisitor.java,
        org/objectweb/asm153/CodeWriter.java,
        org/objectweb/asm153/Constants.java,
        org/objectweb/asm153/Edge.java,
        org/objectweb/asm153/Item.java,
        org/objectweb/asm153/Label.java,
        and org/objectweb/asm153/Type.java.

        * kaffe/scripts/rmic.in,
        kaffe/scripts/bat/rmic,
        tools/javatools/gnu/classpath/tools/rmi/rmic/RMIC.java,
        tools/javatools/gnu/classpath/tools/rmi/rmic/RMICException.java,
        tools/javatools/gnu/classpath/tools/rmi/rmic/Variables.java,
        tools/javatools/org/objectweb/asm153/Attribute.java,
        tools/javatools/org/objectweb/asm153/ByteVector.java,
        tools/javatools/org/objectweb/asm153/ClassReader.java,
        tools/javatools/org/objectweb/asm153/ClassVisitor.java,
        tools/javatools/org/objectweb/asm153/ClassWriter.java,
        tools/javatools/org/objectweb/asm153/CodeVisitor.java,
        tools/javatools/org/objectweb/asm153/CodeWriter.java,
        tools/javatools/org/objectweb/asm153/Constants.java,
        tools/javatools/org/objectweb/asm153/Edge.java,
        tools/javatools/org/objectweb/asm153/Item.java,
        tools/javatools/org/objectweb/asm153/Label.java,
        tools/javatools/org/objectweb/asm153/Type.java:
        Removed.

        * kaffe/scripts/compat/rmic.in: New file.

Members: 
	ChangeLog:1.4964->1.4965 
	THIRDPARTY:1.48->1.49 
	configure:1.581->1.582 
	configure.ac:1.259->1.260 
	kaffe/scripts/Makefile.am:1.17->1.18 
	kaffe/scripts/Makefile.in:1.215->1.216 
	kaffe/scripts/rmic.in:1.11->1.12(DEAD) 
	kaffe/scripts/bat/Makefile.am:1.2->1.3 
	kaffe/scripts/bat/Makefile.in:1.166->1.167 
	kaffe/scripts/bat/rmic:1.1->1.2(DEAD) 
	kaffe/scripts/compat/Makefile.am:1.6->1.7 
	kaffe/scripts/compat/Makefile.in:1.193->1.194 
	kaffe/scripts/compat/rmic.in:INITIAL->1.1 
	libraries/javalib/external/classpath/ChangeLog:1.44->1.45 
	libraries/javalib/external/classpath/INSTALL:1.10->1.11 
	libraries/javalib/external/classpath/Makefile.in:1.29->1.30 
	libraries/javalib/external/classpath/NEWS:1.22->1.23 
	libraries/javalib/external/classpath/aclocal.m4:1.22->1.23 
	libraries/javalib/external/classpath/compile:1.2->1.3 
	libraries/javalib/external/classpath/config.guess:1.37->1.38 
	libraries/javalib/external/classpath/config.sub:1.44->1.45 
	libraries/javalib/external/classpath/configure:1.38->1.39 
	libraries/javalib/external/classpath/configure.ac:1.24->1.25 
	libraries/javalib/external/classpath/depcomp:1.5->1.6 
	libraries/javalib/external/classpath/install-sh:1.5->1.6 
	libraries/javalib/external/classpath/missing:1.5->1.6 
	libraries/javalib/external/classpath/mkinstalldirs:1.5->1.6 
	libraries/javalib/external/classpath/doc/Makefile.in:1.26->1.27 
	libraries/javalib/external/classpath/doc/hacking.info:1.11->1.12 
	libraries/javalib/external/classpath/doc/texinfo.tex:1.5->1.6 
	libraries/javalib/external/classpath/doc/tools.info:1.9->1.10 
	libraries/javalib/external/classpath/doc/vmintegration.info:1.21->1.22 
	libraries/javalib/external/classpath/doc/api/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/examples/Makefile.in:1.32->1.33 
	libraries/javalib/external/classpath/examples/gnu/classpath/examples/swing/BrowserEditorKit.java:INITIAL->1.1 
	libraries/javalib/external/classpath/examples/gnu/classpath/examples/swing/HtmlDemo.java:1.5->1.6 
	libraries/javalib/external/classpath/examples/gnu/classpath/examples/swing/forms.html:1.1->1.2 
	libraries/javalib/external/classpath/examples/gnu/classpath/examples/swing/welcome.html:1.2->1.3 
	libraries/javalib/external/classpath/external/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/external/relaxngDatatype/Makefile.in:1.15->1.16 
	libraries/javalib/external/classpath/external/sax/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.44->1.45 
	libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.44->1.45 
	libraries/javalib/external/classpath/external/w3c_dom/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/include/Makefile.in:1.31->1.32 
	libraries/javalib/external/classpath/java/net/URL.java:1.8->1.9 
	libraries/javalib/external/classpath/javax/swing/JEditorPane.java:1.10->1.11 
	libraries/javalib/external/classpath/javax/swing/text/DefaultCaret.java:1.12->1.13 
	libraries/javalib/external/classpath/javax/swing/text/html/FormView.java:1.4->1.5 
	libraries/javalib/external/classpath/javax/swing/text/html/HTMLDocument.java:1.17->1.18 
	libraries/javalib/external/classpath/javax/swing/text/html/Option.java:1.1->1.2 
	libraries/javalib/external/classpath/javax/swing/text/html/ResetableModel.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/swing/text/html/ResetablePlainDocument.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/swing/text/html/ResetableToggleButtonModel.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/swing/text/html/SelectComboBoxModel.java:INITIAL->1.1 
	libraries/javalib/external/classpath/javax/swing/text/html/SelectListModel.java:INITIAL->1.1 
	libraries/javalib/external/classpath/lib/Makefile.in:1.34->1.35 
	libraries/javalib/external/classpath/native/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/native/fdlibm/Makefile.in:1.30->1.31 
	libraries/javalib/external/classpath/native/jawt/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/native/jni/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/native/jni/classpath/Makefile.in:1.29->1.30 
	libraries/javalib/external/classpath/native/jni/gconf-peer/Makefile.in:1.8->1.9 
	libraries/javalib/external/classpath/native/jni/gtk-peer/Makefile.in:1.31->1.32 
	libraries/javalib/external/classpath/native/jni/java-io/Makefile.in:1.29->1.30 
	libraries/javalib/external/classpath/native/jni/java-lang/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/native/jni/java-net/Makefile.in:1.29->1.30 
	libraries/javalib/external/classpath/native/jni/java-nio/Makefile.in:1.30->1.31 
	libraries/javalib/external/classpath/native/jni/java-util/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/native/jni/midi-dssi/Makefile.in:1.30->1.31 
	libraries/javalib/external/classpath/native/jni/native-lib/Makefile.in:1.3->1.4 
	libraries/javalib/external/classpath/native/jni/qt-peer/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/native/jni/xmlj/Makefile.in:1.29->1.30 
	libraries/javalib/external/classpath/native/plugin/Makefile.in:1.10->1.11 
	libraries/javalib/external/classpath/resource/Makefile.in:1.29->1.30 
	libraries/javalib/external/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties:1.10->1.11 
	libraries/javalib/external/classpath/scripts/Makefile.in:1.28->1.29 
	libraries/javalib/external/classpath/scripts/classpath.spec.in:1.44->1.45 
	libraries/javalib/external/classpath/tools/Makefile.am:1.12->1.13 
	libraries/javalib/external/classpath/tools/Makefile.in:1.18->1.19 
	libraries/javalib/external/classpath/tools/gjavah.in:1.1->1.2 
	libraries/javalib/external/classpath/tools/grmic.in:1.1->1.2 
	libraries/javalib/external/classpath/tools/toolwrapper.c:1.4->1.5 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/AnnotationVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/AnnotationWriter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/Attribute.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/ByteVector.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/ClassAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/ClassReader.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/ClassVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/ClassWriter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/Edge.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/FieldVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/FieldWriter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/Handler.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/Item.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/Label.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/MethodAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/MethodVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/MethodWriter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/Opcodes.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/Type.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapAttribute.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapFrame.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapTableAttribute.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapType.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/commons/AdviceAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/commons/EmptyVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/commons/GeneratorAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/commons/LocalVariablesSorter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/commons/Method.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/commons/StaticInitMerger.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/commons/TableSwitchGenerator.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/ClassOptimizer.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/Constant.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/ConstantPool.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/JarOptimizer.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/MethodOptimizer.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/NameMapping.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/optimizer/Shrinker.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureReader.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureWriter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/AbstractInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/AnnotationNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/ClassNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/FieldInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/FieldNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/IincInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/InnerClassNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/InsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/IntInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/JumpInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/LabelNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/LdcInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/LineNumberNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/LocalVariableNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/MemberNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/MethodInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/MethodNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/TryCatchBlockNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/TypeInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/VarInsnNode.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Analyzer.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicValue.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowValue.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Frame.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/IntMap.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Interpreter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/SmallSet.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Subroutine.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Value.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierClassVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierFieldVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierMethodVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/AbstractVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/CheckClassAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/CheckFieldAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/CheckMethodAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/TraceAbstractVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/TraceClassVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/TraceFieldVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/TraceMethodVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/TraceSignatureVisitor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMifiable.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/util/attrs/Traceable.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/xml/Processor.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/xml/SAXAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/xml/SAXClassAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/xml/SAXCodeAdapter.java:INITIAL->1.1 
	libraries/javalib/external/classpath/tools/external/asm/org/objectweb/asm/xml/SAXFieldAdapter.java:INITIAL->1.1 
	tools/javatools/Makefile.am:1.3->1.4 
	tools/javatools/Makefile.in:1.35->1.36 
	tools/javatools/gnu/classpath/tools/rmi/rmic/RMIC.java:1.1->1.2(DEAD) 
	tools/javatools/gnu/classpath/tools/rmi/rmic/RMICException.java:1.1->1.2(DEAD) 
	tools/javatools/gnu/classpath/tools/rmi/rmic/Variables.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/Attribute.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/ByteVector.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/ClassReader.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/ClassVisitor.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/ClassWriter.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/CodeVisitor.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/CodeWriter.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/Constants.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/Edge.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/Item.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/Label.java:1.1->1.2(DEAD) 
	tools/javatools/org/objectweb/asm153/Type.java:1.1->1.2(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4964 kaffe/ChangeLog:1.4965
--- kaffe/ChangeLog:1.4964	Fri Jan  5 20:23:24 2007
+++ kaffe/ChangeLog	Sun Jan  7 22:14:39 2007
@@ -1,3 +1,63 @@
+2007-01-07  Dalibor Topic  <robilad at kaffe.org>
+
+	* THIRDPARTY: Removed license information for components that are
+	part of GNU Classpath, and added a pointer to its license information
+	file instead.
+
+	Replaced kaffe's copy of rmic from GNU Classpath tools project with 
+	the merged in version from GNU Classpath.
+
+	* configure.ac (AC_CONFIG_FILES): Removed kaffe/scripts/rmic and added
+	kaffe/scripts/compat/rmic.
+
+	* kaffe/scripts/Makefile.am (SCRIPTFILES_SUN): Removed rmic.
+
+	* kaffe/scripts/bat/Makefile.am (EXTRA_DIST): Removed rmic.
+
+	* kaffe/scripts/compat/Makefile.am (bin_SCRIPTS): Added rmic.
+
+	* libraries/javalib/external/classpath/ : Resynced up to 2006-12-07.
+
+	* libraries/javalib/external/classpath/tools/Makefile.am: Fixed to work for jikes.
+
+	* tools/javatools/Makefile.am  (dist_tools_JAVA): Removed 
+	gnu/classpath/tools/rmi/rmic/RMIC.java,
+	gnu/classpath/tools/rmi/rmic/RMICException.java,
+	gnu/classpath/tools/rmi/rmic/Variables.java,
+        org/objectweb/asm153/Attribute.java,
+        org/objectweb/asm153/ByteVector.java,
+        org/objectweb/asm153/ClassReader.java,
+        org/objectweb/asm153/ClassVisitor.java,
+        org/objectweb/asm153/ClassWriter.java,
+        org/objectweb/asm153/CodeVisitor.java,
+        org/objectweb/asm153/CodeWriter.java,
+        org/objectweb/asm153/Constants.java,
+        org/objectweb/asm153/Edge.java,
+        org/objectweb/asm153/Item.java,
+        org/objectweb/asm153/Label.java,
+        and org/objectweb/asm153/Type.java.
+
+	* kaffe/scripts/rmic.in,
+	kaffe/scripts/bat/rmic,
+	tools/javatools/gnu/classpath/tools/rmi/rmic/RMIC.java,
+	tools/javatools/gnu/classpath/tools/rmi/rmic/RMICException.java,
+	tools/javatools/gnu/classpath/tools/rmi/rmic/Variables.java,
+	tools/javatools/org/objectweb/asm153/Attribute.java,
+	tools/javatools/org/objectweb/asm153/ByteVector.java,
+	tools/javatools/org/objectweb/asm153/ClassReader.java,
+	tools/javatools/org/objectweb/asm153/ClassVisitor.java,
+	tools/javatools/org/objectweb/asm153/ClassWriter.java,
+	tools/javatools/org/objectweb/asm153/CodeVisitor.java,
+	tools/javatools/org/objectweb/asm153/CodeWriter.java,
+	tools/javatools/org/objectweb/asm153/Constants.java,
+	tools/javatools/org/objectweb/asm153/Edge.java,
+	tools/javatools/org/objectweb/asm153/Item.java,
+	tools/javatools/org/objectweb/asm153/Label.java,
+	tools/javatools/org/objectweb/asm153/Type.java:
+	Removed.
+
+	* kaffe/scripts/compat/rmic.in: New file.
+
 2007-01-05  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/external/classpath/ : Resynced with GNU Classpath 
Index: kaffe/THIRDPARTY
diff -u kaffe/THIRDPARTY:1.48 kaffe/THIRDPARTY:1.49
--- kaffe/THIRDPARTY:1.48	Fri Aug 11 02:38:06 2006
+++ kaffe/THIRDPARTY	Sun Jan  7 22:14:40 2007
@@ -1,7 +1,10 @@
 Kaffe uses code from other free software projects. Only code licensed
 under a GPL compatible license can be merged in. You can find the
 licenses of third party sources either in their respective sources, or
-in license*.terms files in the top directory, or here.
+in license*.terms files in the top directory, or here. 
+
+For additional licensing information of components included in GNU 
+Classpath, please see libraries/javalib/external/classpath/LICENSE.
 
 * external/gcc/zlib
 
@@ -68,7 +71,7 @@
 
 More information on tritonus is available from http://tritonus.org.
 
-* gjdoc, javap, gnu.classpath.tools
+* gjdoc, javap
 
 This code has been merged in from the GNU Classpath tools project.
 Kaffe is tracking this project's CVS HEAD.
@@ -118,36 +121,6 @@
 More information on Kawa can be found at
 http://www.gnu.org/software/kawa/.
 
-* gnu.crypto, javax.crypto, javax.security.auth, javax.security.sasl,
-  org.ietf.jgss
-
-This code has been merged in from GNU Crypto.  Kaffe tracks this
-projects' CVS HEAD.
-
-Licensed under the GNU General Public License with a special exception:
-
-  "Linking this library statically or dynamically with other modules is
-  making a combined work based on this library.  Thus, the terms and
-  conditions of the GNU General Public License cover the whole
-  combination.
-
-  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."
-
-See license.terms for details of the GNU GPL.
-
-More information on GNU Crypto is available from 
-http://www.gnu.org/software/gnu-crypto/.
-
 * org.ietf.jgss
 
 The documentation of some of the files in org/ietf/jgss/ is derived from
@@ -297,36 +270,6 @@
 More information on GNU Classpath is available from 
 http://www.gnu.org/software/classpath/classpath.html.
 
-* libraries/clib/fdlibm
-
-fdlimb contains general algorithms useful for runtimes and compilers to
-support strict double and float mathematical operations.
-
-fdlibm files carry the following notices:
-
-  Copyright (c) 1991 by AT&T.
-
-  Permission to use, copy, modify, and distribute this software for any
-  purpose without fee is hereby granted, provided that this entire notice
-  is included in all copies of any software which is or includes a copy
-  or modification of this software and in all copies of the supporting
-  documentation for such software.
-
-  THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
-  WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR AT&T MAKES ANY
-  REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
-  OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
-
-  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-
-  Developed at SunPro, a Sun Microsystems, Inc. business.
-  Permission to use, copy, modify, and distribute this
-  software is freely granted, provided that this notice
-  is preserved.
-
-The upstream for fdlibm is libgcj (http://gcc.gnu.org/java/), they sync
-again with the 'real' upstream (http://www.netlib.org/fdlibm/readme).
-
 * Replacement functions for getaddrinfo
 
 This code comes from Motoyuki Kasahara's <m-kasahr at sra.co.jp>
@@ -674,48 +617,6 @@
 
 More information on ANTLR is available from http://www.antlr.org
 
-* locale properties
-
-The files in libraries/javalib/gnu/java/locale were taken from GNU Classpath.
-They were generated by  gnu.localegen from the files distributed from date 
-provided by CLDR.
-
-All these files are distributed under the following terms:
-
-  Copyright (C) 1991-2005 Unicode, Inc. All rights reserved. Distributed
-  under the Terms of Use in http://www.unicode.org/copyright.html.
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of the Unicode data files and any associated documentation (the
-  "Data Files") or Unicode software and any associated documentation
-  (the "Software") to deal in the Data Files or Software without
-  restriction, including without limitation the rights to use, copy,
-  modify, merge, publish, distribute, and/or sell copies of the Data
-  Files or Software, and to permit persons to whom the Data Files or
-  Software are furnished to do so, provided that (a) the above copyright
-  notice(s) and this permission notice appear with all copies of the
-  Data Files or Software, (b) both the above copyright notice(s) and
-  this permission notice appear in associated documentation, and (c)
-  there is clear notice in each modified Data File or in the Software as
-  well as in the documentation associated with the Data File(s) or
-  Software that the data or software has been modified.
-
-  THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-  ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-  WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT
-  HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR
-  ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-  OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
-  SOFTWARE.
-
-  Except as contained in this notice, the name of a copyright holder
-  shall not be used in advertising or otherwise to promote the sale, use
-  or other dealings in these Data Files or Software without prior
-  written authorization of the copyright holder.
-
 * libraries/clib/native/VMRuntime.c
 
   This file comes from CACAO. More information on CACAO is available from
@@ -737,41 +638,3 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-* libraries/javalib/org/objectweb/asm153
-
-  These files were taken from the ObjectWeb ASM bytecode transformation
-  library, release 1.5.3. The asm package was renamed to reflect the version
-  used to avoid conflicts with asm library used in external programs.
-
-  The files are distributed under the following terms:
-
-   ASM: a very small and fast Java bytecode manipulation framework
-   Copyright (c) 2000,2002,2003 INRIA, France Telecom
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-   3. Neither the name of the copyright holders nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-   THE POSSIBILITY OF SUCH DAMAGE.
-
-  More information on the ASM project is available at 
-  http://asm.objectweb.org/
Index: kaffe/configure
diff -u kaffe/configure:1.581 kaffe/configure:1.582
--- kaffe/configure:1.581	Wed Jan  3 23:02:07 2007
+++ kaffe/configure	Sun Jan  7 22:14:40 2007
@@ -53317,8 +53317,6 @@
 
 ac_config_files="$ac_config_files kaffe/scripts/javadoc"
 
-ac_config_files="$ac_config_files kaffe/scripts/rmic"
-
 ac_config_files="$ac_config_files kaffe/scripts/rmiregistry"
 
 ac_config_files="$ac_config_files kaffe/scripts/serialver"
@@ -53329,6 +53327,8 @@
 
 ac_config_files="$ac_config_files kaffe/scripts/compat/javac"
 
+ac_config_files="$ac_config_files kaffe/scripts/compat/rmic"
+
 ac_config_files="$ac_config_files po/Makefile.in"
 
 ac_config_files="$ac_config_files tools/Makefile"
@@ -54332,12 +54332,12 @@
     "kaffe/scripts/javap") CONFIG_FILES="$CONFIG_FILES kaffe/scripts/javap" ;;
     "kaffe/scripts/jdb") CONFIG_FILES="$CONFIG_FILES kaffe/scripts/jdb" ;;
     "kaffe/scripts/javadoc") CONFIG_FILES="$CONFIG_FILES kaffe/scripts/javadoc" ;;
-    "kaffe/scripts/rmic") CONFIG_FILES="$CONFIG_FILES kaffe/scripts/rmic" ;;
     "kaffe/scripts/rmiregistry") CONFIG_FILES="$CONFIG_FILES kaffe/scripts/rmiregistry" ;;
     "kaffe/scripts/serialver") CONFIG_FILES="$CONFIG_FILES kaffe/scripts/serialver" ;;
     "kaffe/scripts/native2ascii") CONFIG_FILES="$CONFIG_FILES kaffe/scripts/native2ascii" ;;
     "kaffe/scripts/compat/java") CONFIG_FILES="$CONFIG_FILES kaffe/scripts/compat/java" ;;
     "kaffe/scripts/compat/javac") CONFIG_FILES="$CONFIG_FILES kaffe/scripts/compat/javac" ;;
+    "kaffe/scripts/compat/rmic") CONFIG_FILES="$CONFIG_FILES kaffe/scripts/compat/rmic" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tools/gjdoc/javalib/version.properties") CONFIG_FILES="$CONFIG_FILES tools/gjdoc/javalib/version.properties" ;;
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.259 kaffe/configure.ac:1.260
--- kaffe/configure.ac:1.259	Wed Jan  3 23:02:08 2007
+++ kaffe/configure.ac	Sun Jan  7 22:14:40 2007
@@ -2587,12 +2587,12 @@
 AC_CONFIG_FILES([kaffe/scripts/javap])
 AC_CONFIG_FILES([kaffe/scripts/jdb])
 AC_CONFIG_FILES([kaffe/scripts/javadoc])
-AC_CONFIG_FILES([kaffe/scripts/rmic])
 AC_CONFIG_FILES([kaffe/scripts/rmiregistry])
 AC_CONFIG_FILES([kaffe/scripts/serialver])
 AC_CONFIG_FILES([kaffe/scripts/native2ascii])
 AC_CONFIG_FILES([kaffe/scripts/compat/java])
 AC_CONFIG_FILES([kaffe/scripts/compat/javac])
+AC_CONFIG_FILES([kaffe/scripts/compat/rmic])
 AC_CONFIG_FILES([po/Makefile.in])
 AC_CONFIG_FILES([tools/Makefile])
 AC_CONFIG_FILES([tools/gjdoc/javalib/version.properties])
Index: kaffe/kaffe/scripts/Makefile.am
diff -u kaffe/kaffe/scripts/Makefile.am:1.17 kaffe/kaffe/scripts/Makefile.am:1.18
--- kaffe/kaffe/scripts/Makefile.am:1.17	Tue Nov  7 03:37:39 2006
+++ kaffe/kaffe/scripts/Makefile.am	Sun Jan  7 22:14:41 2007
@@ -15,7 +15,7 @@
 
 SCRIPTFILES_SUN=\
 		jar javah javap \
-		native2ascii rmic serialver
+		native2ascii serialver
 
 if SUN_COMPAT
 SUBDIRS = compat
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.215 kaffe/kaffe/scripts/Makefile.in:1.216
--- kaffe/kaffe/scripts/Makefile.in:1.215	Wed Jan  3 23:02:13 2007
+++ kaffe/kaffe/scripts/Makefile.in	Sun Jan  7 22:14:41 2007
@@ -48,8 +48,8 @@
 	$(srcdir)/install-jar.in $(srcdir)/jar.in $(srcdir)/javadoc.in \
 	$(srcdir)/javah.in $(srcdir)/javap.in $(srcdir)/jdb.in \
 	$(srcdir)/kaffe.in $(srcdir)/kaffexprof.in \
-	$(srcdir)/native2ascii.in $(srcdir)/rmic.in \
-	$(srcdir)/rmiregistry.in $(srcdir)/serialver.in
+	$(srcdir)/native2ascii.in $(srcdir)/rmiregistry.in \
+	$(srcdir)/serialver.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
 	$(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \
@@ -76,7 +76,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config/config.h
 CONFIG_CLEAN_FILES = install-jar kaffe kaffexprof jar javah javap jdb \
-	javadoc rmic rmiregistry serialver native2ascii
+	javadoc rmiregistry serialver native2ascii
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(jrebindir)"
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 jrebinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -309,7 +309,7 @@
 EXTRA_DIST = nm2as.awk
 SCRIPTFILES_SUN = \
 		jar javah javap \
-		native2ascii rmic serialver
+		native2ascii serialver
 
 @SUN_COMPAT_TRUE at SUBDIRS = compat
 @COND_GJDOC_TRUE at KAFFE_JAVADOC = javadoc
@@ -376,8 +376,6 @@
 jdb: $(top_builddir)/config.status $(srcdir)/jdb.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 javadoc: $(top_builddir)/config.status $(srcdir)/javadoc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-rmic: $(top_builddir)/config.status $(srcdir)/rmic.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 rmiregistry: $(top_builddir)/config.status $(srcdir)/rmiregistry.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
===================================================================
Checking out kaffe/kaffe/scripts/rmic.in
RCS:  /home/cvs/kaffe/kaffe/kaffe/scripts/Attic/rmic.in,v
VERS: 1.11
***************
--- kaffe/kaffe/scripts/rmic.in	Sun Jan  7 22:15:49 2007
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,10 +0,0 @@
-#! /bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-
-PATH=${PATH}:@bindir@
-export PATH
-
-exec @bindir@/@kaffe_TRANSF@ -cp @toolslibdir@/kaffe-classpath-tools.jar -Dclasspath.compiler=jikes $JAVA_OPTS gnu.classpath.tools.rmi.rmic.RMIC ${1+"$@"}
-exit $?
-
Index: kaffe/kaffe/scripts/bat/Makefile.am
diff -u kaffe/kaffe/scripts/bat/Makefile.am:1.2 kaffe/kaffe/scripts/bat/Makefile.am:1.3
--- kaffe/kaffe/scripts/bat/Makefile.am:1.2	Tue Jun 22 21:16:45 1999
+++ kaffe/kaffe/scripts/bat/Makefile.am	Sun Jan  7 22:14:41 2007
@@ -7,4 +7,4 @@
 # of this file. 
 
 EXTRA_DIST = appletviewer jar javac javadoc javakey javap jdb native2ascii \
-	rmic rmiregistry serialver
+	rmiregistry serialver
Index: kaffe/kaffe/scripts/bat/Makefile.in
diff -u kaffe/kaffe/scripts/bat/Makefile.in:1.166 kaffe/kaffe/scripts/bat/Makefile.in:1.167
--- kaffe/kaffe/scripts/bat/Makefile.in:1.166	Wed Jan  3 23:02:13 2007
+++ kaffe/kaffe/scripts/bat/Makefile.in	Sun Jan  7 22:14:41 2007
@@ -281,7 +281,7 @@
 top_srcdir = @top_srcdir@
 with_engine = @with_engine@
 EXTRA_DIST = appletviewer jar javac javadoc javakey javap jdb native2ascii \
-	rmic rmiregistry serialver
+	rmiregistry serialver
 
 all: all-am
 
===================================================================
Checking out kaffe/kaffe/scripts/bat/rmic
RCS:  /home/cvs/kaffe/kaffe/kaffe/scripts/bat/Attic/rmic,v
VERS: 1.1
***************
--- kaffe/kaffe/scripts/bat/rmic	Sun Jan  7 22:15:49 2007
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,2 +0,0 @@
- at echo off
-kaffe sun.rmi.rmic.Main %1 %2 %3 %4 %5
Index: kaffe/kaffe/scripts/compat/Makefile.am
diff -u kaffe/kaffe/scripts/compat/Makefile.am:1.6 kaffe/kaffe/scripts/compat/Makefile.am:1.7
--- kaffe/kaffe/scripts/compat/Makefile.am:1.6	Tue Nov  7 03:37:39 2006
+++ kaffe/kaffe/scripts/compat/Makefile.am	Sun Jan  7 22:14:41 2007
@@ -8,7 +8,9 @@
 
 if SUN_COMPAT
 jrebin_SCRIPTS = java
-bin_SCRIPTS = javac
+bin_SCRIPTS = \
+	javac \
+	rmic
 endif
 
 install-exec-local:
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.193 kaffe/kaffe/scripts/compat/Makefile.in:1.194
--- kaffe/kaffe/scripts/compat/Makefile.in:1.193	Wed Jan  3 23:02:14 2007
+++ kaffe/kaffe/scripts/compat/Makefile.in	Sun Jan  7 22:14:41 2007
@@ -42,7 +42,7 @@
 host_triplet = @host@
 subdir = kaffe/scripts/compat
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/java.in $(srcdir)/javac.in
+	$(srcdir)/java.in $(srcdir)/javac.in $(srcdir)/rmic.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
 	$(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \
@@ -68,7 +68,7 @@
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config/config.h
-CONFIG_CLEAN_FILES = java javac
+CONFIG_CLEAN_FILES = java javac rmic
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(jrebindir)"
 binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 jrebinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -287,7 +287,10 @@
 top_srcdir = @top_srcdir@
 with_engine = @with_engine@
 @SUN_COMPAT_TRUE at jrebin_SCRIPTS = java
- at SUN_COMPAT_TRUE@bin_SCRIPTS = javac
+ at SUN_COMPAT_TRUE@bin_SCRIPTS = \
+ at SUN_COMPAT_TRUE@	javac \
+ at SUN_COMPAT_TRUE@	rmic
+
 all: all-am
 
 .SUFFIXES:
@@ -323,6 +326,8 @@
 java: $(top_builddir)/config.status $(srcdir)/java.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 javac: $(top_builddir)/config.status $(srcdir)/javac.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+rmic: $(top_builddir)/config.status $(srcdir)/rmic.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
===================================================================
Checking out kaffe/kaffe/scripts/compat/rmic.in
RCS:  /home/cvs/kaffe/kaffe/kaffe/scripts/compat/rmic.in,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/kaffe/scripts/compat/rmic.in	Sun Jan  7 22:15:49 2007
@@ -0,0 +1,6 @@
+#! /bin/sh
+# delegate rmic to grmic
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+exec @bindir@/grmic ${1+"$@"}
+exit $?
Index: kaffe/libraries/javalib/external/classpath/ChangeLog
diff -u kaffe/libraries/javalib/external/classpath/ChangeLog:1.44 kaffe/libraries/javalib/external/classpath/ChangeLog:1.45
--- kaffe/libraries/javalib/external/classpath/ChangeLog:1.44	Fri Jan  5 20:23:24 2007
+++ kaffe/libraries/javalib/external/classpath/ChangeLog	Sun Jan  7 22:14:41 2007
@@ -1,3 +1,108 @@
+2006-12-07  Mark Wielaard  <mark at klomp.org>
+
+	* javax/swing/JEditorPane.java (createEditorKitForContentType):
+	Always load from system class loader.
+
+2006-12-07  Mark Wielaard  <mark at klomp.org>
+
+	* java/net/URL.java (URL(URL,String,URLStreamHandler,boolean)): New
+	private constructor.
+	(URL(URL,String,URLStreamHandler)): Call new constructor.
+	(URL(URL,String)): Likewise.
+	(URL(String)): Likewise.
+
+2006-12-07  Tom Tromey  <tromey at redhat.com>
+
+	* NEWS: Mention ASM.
+	* INSTALL: Don't mention --with-asm.
+	* tools/external/README: New file.
+	* tools/toolwrapper.c (main): Don't use ASM_JAR.
+	* tools/gjavah.in: Don't use PATH_TO_ASM.
+	* tools/grmic.in: Likewise.
+	* tools/Makefile.am (GLIBJ_CLASSPATH): Removed PATH_TO_ASM, added
+	'asm'.
+	(javah, rmic): Removed variables.
+	(bin_PROGRAMS): Updated.
+	(gappletviewer_CFLAGS): Don't define ASM_JAR.
+	(gjarsigner_CFLAGS): Likewise.
+	(gkeytool_CFLAGS): Likewise.
+	(gjar_CFLAGS): Likewise.
+	(gnative2ascii_CFLAGS): Likewise.
+	(gserialver_CFLAGS): Likewise.
+	(grmiregistry_CFLAGS): Likewise.
+	(gtnameserv_CFLAGS): Likewise.
+	(gorbd_CFLAGS): Likewise.
+	(grmid_CFLAGS): Likewise.
+	(gjavah_CFLAGS): Likewise.
+	(grmic_CFLAGS): Likewise.
+	(bin_SCRIPTS): Updated.
+	(TOOLS_JAVA_FILES): Updated.
+	($(TOOLS_ZIP)): Compile ASM sources.  Copy resource files.
+	* configure.ac: Removed --with-asm.  Always build gjavah.
+
+2006-12-06  Roman Kennke  <kennke at aicas.com>
+
+	* examples/gnu/classpath/examples/swing/BrowserEditorKit.java:
+	New class.
+	* examples/gnu/classpath/examples/swing/HtmlDemo.java
+	(LoadActionListener): Call setPage() helper method.
+	(createContent): Register tweaked editor kit. For FormSubmitEvents
+	call submitForm(), otherwise setPage().
+	(postData): Helper method for posting form data.
+	(setPage): Helper method for navigating to a new URL.
+	(submitForm): Helper method for submitting a form.
+	* examples/gnu/classpath/examples/swing/forms.html:
+	Added text/password fields and select boxes.
+	* examples/gnu/classpath/examples/swing/welcome.html: Fixed typo.
+
+2006-12-06  Roman Kennke  <kennke at aicas.com>
+
+	* javax/swing/text/html/FormView.java
+	(SubmitThread.postData): Implemented.
+	(SubmitThread.run): Pass data to postData().
+	(actionPerformed): Reset form when reset button is activated.
+	(createComponent): Add support for select lists and comboboxes.
+	Don't set value of text and password fields here, this is done
+	now in HTMLDocument for consistency.
+	(getElementFormData): Add support for fetching form data from
+	select lists and comboboxes as well as textareas.
+	(getSelectData): New helper method. Fetches form data from
+	select boxes.
+	(getTextAreaData): New helper method. Fetches form data from
+	textareas.
+	(resetForm): New helper method. Resets the entire form.
+	* javax/swing/text/html/HTMLDocument.java
+	(HTMLReader.FormAction.end): Handle SELECT and OPTION tags.
+	(HTMLReader.FormAction.start): Handle SELECT and OPTION tags.
+	(HTMLReader.FormAction.setModel): Initialize text and password
+	values here. Also, use the resetable special models.
+	Group radio buttons into ButtonGroup for exclusive selection.
+	(HTMLReader.FormTagAction): New class. Handles FORM tags.
+	(HTMLReader.buttonGroups): New field.
+	(HTMLReader.numOptions): New field.
+	(HTMLReader.option): New field.
+	(HTMLReader.selectModel): New field.
+	(HTMLReader.textAreaDocument): Make ResetablePlainDocument.
+	(HTMLReader.handleText): Handle OPTION text.
+	(HTMLReader.initTags): Map FORM tags to FormTagAction.
+	(HTMLReader.textAreaContent): Set initial content.
+	* javax/swing/text/html/Option.java
+	(Option): Make copy of attribute set. Initialize selected state.
+	(getValue): Fetch value from attribute set.
+	* javax/swing/text/html/ResetableModel.java: New interface.
+	* javax/swing/text/html/ResetablePlainDocument.java: New class.
+	Supports resetting the state.
+	* javax/swing/text/html/ResetableToggleButtonModel.java: Likewise.
+	* javax/swing/text/html/SelectComboBoxModel.java: Likewise.
+	* javax/swing/text/html/SelectListModel.java: Likewise.
+
+2006-12-06  Roman Kennke  <kennke at aicas.com>
+
+	* javax/swing/text/DefaultCaret.java
+	(appear): Adjust visibility here.
+	(setDotImpl): Don't adjust visibility here.
+	(moveDotImpl): Don't adjust visibility here.
+
 2006-12-06  Roman Kennke  <kennke at aicas.com>
 
 	* gnu/java/awt/peer/gtk/AsyncImage.java
Index: kaffe/libraries/javalib/external/classpath/INSTALL
diff -u kaffe/libraries/javalib/external/classpath/INSTALL:1.10 kaffe/libraries/javalib/external/classpath/INSTALL:1.11
--- kaffe/libraries/javalib/external/classpath/INSTALL:1.10	Fri Jan  5 18:17:20 2007
+++ kaffe/libraries/javalib/external/classpath/INSTALL	Sun Jan  7 22:14:41 2007
@@ -1,224 +1,234 @@
-Installing GNU Classpath - Last updated: June 19, 2006
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for

*** Patch too long, truncated ***




More information about the kaffe mailing list