[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath
Kaffe CVS
cvs-commits at kaffe.org
Wed Oct 22 03:39:07 PDT 2003
PatchSet 4117
Date: 2003/10/22 10:34:42
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath
Members:
ChangeLog:1.1710->1.1711
libraries/javalib/Makefile.am:1.139->1.140
libraries/javalib/Makefile.in:1.187->1.188
libraries/javalib/essential.files:1.28->1.29
libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java:1.1->1.2
libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:1.1->1.2
libraries/javalib/gnu/java/beans/IntrospectionIncubator.java:1.1->1.2
libraries/javalib/gnu/java/beans/editors/ColorEditor.java:1.1->1.2
libraries/javalib/gnu/java/beans/editors/FontEditor.java:1.1->1.2
libraries/javalib/gnu/java/beans/editors/NativeBooleanEditor.java:1.1->1.2
libraries/javalib/gnu/java/beans/editors/NativeByteEditor.java:1.1->1.2
libraries/javalib/gnu/java/beans/editors/NativeDoubleEditor.java:1.1->1.2
libraries/javalib/gnu/java/beans/editors/NativeFloatEditor.java:1.1->1.2
libraries/javalib/gnu/java/beans/editors/NativeIntEditor.java:1.1->1.2
libraries/javalib/gnu/java/beans/editors/NativeLongEditor.java:1.1->1.2
libraries/javalib/gnu/java/beans/editors/NativeShortEditor.java:1.1->1.2
libraries/javalib/gnu/java/beans/editors/StringEditor.java:1.1->1.2
libraries/javalib/gnu/java/io/ClassLoaderObjectInputStream.java:1.1->1.2
libraries/javalib/gnu/java/lang/ClassHelper.java:1.1->1.2
libraries/javalib/gnu/java/nio/NIOServerSocket.java:INITIAL->1.1
libraries/javalib/gnu/java/nio/NIOSocket.java:1.1->1.2
libraries/javalib/gnu/java/nio/SelectorImpl.java:1.3->1.4
libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.3->1.4
libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.6->1.7
libraries/javalib/gnu/java/rmi/server/ProtocolConstants.java:1.1->1.2
libraries/javalib/gnu/java/security/der/DER.java:1.1->1.2
libraries/javalib/java/awt/ActiveEvent.java:1.2->1.3
libraries/javalib/java/awt/datatransfer/ClipboardOwner.java:1.3->1.4
libraries/javalib/java/awt/datatransfer/FlavorMap.java:1.2->1.3
libraries/javalib/java/awt/datatransfer/Transferable.java:1.3->1.4
libraries/javalib/java/awt/dnd/Autoscroll.java:1.1->1.2
libraries/javalib/java/awt/dnd/peer/DragSourceContextPeer.java:1.2->1.3
libraries/javalib/java/awt/dnd/peer/DropTargetContextPeer.java:1.2->1.3
libraries/javalib/java/awt/dnd/peer/DropTargetPeer.java:1.1->1.2
libraries/javalib/java/awt/font/FontRenderContext.java:1.1->1.2
libraries/javalib/java/awt/font/MultipleMaster.java:1.1->1.2
libraries/javalib/java/awt/font/OpenType.java:1.1->1.2
libraries/javalib/java/awt/geom/AffineTransform.java:1.1->1.2
libraries/javalib/java/awt/geom/Arc2D.java:1.2->1.3
libraries/javalib/java/awt/geom/PathIterator.java:1.3->1.4
libraries/javalib/java/awt/geom/Rectangle2D.java:1.2->1.3
libraries/javalib/java/awt/geom/RoundRectangle2D.java:1.1->1.2
libraries/javalib/java/awt/image/BufferedImage.java:1.3->1.4
libraries/javalib/java/awt/image/Raster.java:1.2->1.3
libraries/javalib/java/awt/image/RasterOp.java:1.1->1.2
libraries/javalib/java/awt/image/SinglePixelPackedSampleModel.java:1.1->1.2
libraries/javalib/java/awt/image/WritableRaster.java:1.2->1.3
libraries/javalib/java/awt/image/renderable/RenderableImage.java:1.1->1.2
libraries/javalib/java/awt/peer/ButtonPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/CheckboxMenuItemPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/CheckboxPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/ChoicePeer.java:1.1->1.2
libraries/javalib/java/awt/peer/ContainerPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/DialogPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/FileDialogPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/FramePeer.java:1.1->1.2
libraries/javalib/java/awt/peer/LabelPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/ListPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/MenuBarPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/MenuItemPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/MenuPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/PopupMenuPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/RobotPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/ScrollPanePeer.java:1.1->1.2
libraries/javalib/java/awt/peer/ScrollbarPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/TextAreaPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/TextComponentPeer.java:1.1->1.2
libraries/javalib/java/awt/peer/TextFieldPeer.java:1.1->1.2
libraries/javalib/java/awt/print/Pageable.java:1.1->1.2
libraries/javalib/java/awt/print/Printable.java:1.1->1.2
libraries/javalib/java/awt/print/PrinterGraphics.java:1.1->1.2
libraries/javalib/java/beans/AppletInitializer.java:1.1->1.2
libraries/javalib/java/beans/BeanDescriptor.java:1.3->1.4
libraries/javalib/java/beans/BeanInfo.java:1.3->1.4
libraries/javalib/java/beans/Beans.java:1.7->1.8
libraries/javalib/java/beans/Customizer.java:1.3->1.4
libraries/javalib/java/beans/DesignMode.java:1.1->1.2
libraries/javalib/java/beans/EventSetDescriptor.java:1.4->1.5
libraries/javalib/java/beans/FeatureDescriptor.java:1.4->1.5
libraries/javalib/java/beans/IndexedPropertyDescriptor.java:1.5->1.6
libraries/javalib/java/beans/MethodDescriptor.java:1.4->1.5
libraries/javalib/java/beans/ParameterDescriptor.java:1.2->1.3
libraries/javalib/java/beans/PropertyChangeEvent.java:1.5->1.6
libraries/javalib/java/beans/PropertyChangeSupport.java:1.8->1.9
libraries/javalib/java/beans/PropertyDescriptor.java:1.5->1.6
libraries/javalib/java/beans/PropertyEditor.java:1.3->1.4
libraries/javalib/java/beans/PropertyEditorManager.java:1.3->1.4
libraries/javalib/java/beans/PropertyEditorSupport.java:1.2->1.3
libraries/javalib/java/beans/SimpleBeanInfo.java:1.4->1.5
libraries/javalib/java/beans/VetoableChangeSupport.java:1.4->1.5
libraries/javalib/java/beans/Visibility.java:1.3->1.4
libraries/javalib/java/beans/beancontext/BeanContext.java:1.1->1.2
libraries/javalib/java/beans/beancontext/BeanContextChild.java:1.2->1.3
libraries/javalib/java/beans/beancontext/BeanContextChildComponentProxy.java:1.1->1.2
libraries/javalib/java/beans/beancontext/BeanContextChildSupport.java:1.2->1.3
libraries/javalib/java/beans/beancontext/BeanContextContainerProxy.java:1.1->1.2
libraries/javalib/java/beans/beancontext/BeanContextMembershipListener.java:1.1->1.2
libraries/javalib/java/beans/beancontext/BeanContextProxy.java:1.1->1.2
libraries/javalib/java/beans/beancontext/BeanContextServiceProvider.java:1.1->1.2
libraries/javalib/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java:1.1->1.2
libraries/javalib/java/beans/beancontext/BeanContextServiceRevokedListener.java:1.1->1.2
libraries/javalib/java/beans/beancontext/BeanContextServices.java:1.2->1.3
libraries/javalib/java/beans/beancontext/BeanContextServicesListener.java:1.1->1.2
libraries/javalib/java/io/Externalizable.java:1.4->1.5
libraries/javalib/java/io/FilePermission.java:1.4->1.5
libraries/javalib/java/io/ObjectInput.java:1.4->1.5
libraries/javalib/java/io/ObjectInputValidation.java:1.4->1.5
libraries/javalib/java/io/ObjectOutput.java:1.5->1.6
libraries/javalib/java/io/ObjectStreamConstants.java:1.6->1.7
libraries/javalib/java/io/Serializable.java:1.4->1.5
libraries/javalib/java/lang/StrictMath.java:1.3->1.4
libraries/javalib/java/lang/StringBuffer.java:1.22->1.23
libraries/javalib/java/net/DatagramSocketImplFactory.java:1.3->1.4
libraries/javalib/java/net/ServerSocket.java:1.17->1.18
libraries/javalib/java/net/SocketImplFactory.java:1.4->1.5
libraries/javalib/java/net/SocketOptions.java:1.12->1.13
libraries/javalib/java/nio/Buffer.java:1.5->1.6
libraries/javalib/java/nio/ByteBufferHelper.java:1.1->1.2
libraries/javalib/java/nio/MappedByteBuffer.java:1.5->1.6
libraries/javalib/java/nio/channels/Channel.java:1.1->1.2
libraries/javalib/java/nio/channels/GatheringByteChannel.java:1.1->1.2
libraries/javalib/java/nio/channels/ReadableByteChannel.java:1.1->1.2
libraries/javalib/java/nio/channels/ScatteringByteChannel.java:1.1->1.2
libraries/javalib/java/nio/channels/WritableByteChannel.java:1.1->1.2
libraries/javalib/java/nio/channels/spi/AbstractSelectableChannel.java:1.2->1.3
libraries/javalib/java/nio/channels/spi/AbstractSelectionKey.java:1.1->1.2
libraries/javalib/java/nio/channels/spi/AbstractSelector.java:1.2->1.3
libraries/javalib/java/nio/channels/spi/SelectorProvider.java:1.3->1.4
libraries/javalib/java/rmi/activation/ActivationInstantiator.java:1.2->1.3
libraries/javalib/java/rmi/activation/ActivationMonitor.java:1.2->1.3
libraries/javalib/java/rmi/activation/ActivationSystem.java:1.2->1.3
libraries/javalib/java/rmi/activation/Activator.java:1.2->1.3
libraries/javalib/java/rmi/dgc/DGC.java:1.2->1.3
libraries/javalib/java/rmi/registry/Registry.java:1.2->1.3
libraries/javalib/java/rmi/registry/RegistryHandler.java:1.2->1.3
libraries/javalib/java/rmi/server/LoaderHandler.java:1.2->1.3
libraries/javalib/java/rmi/server/RMIClassLoader.java:1.3->1.4
libraries/javalib/java/rmi/server/RMIClientSocketFactory.java:1.2->1.3
libraries/javalib/java/rmi/server/RMIFailureHandler.java:1.2->1.3
libraries/javalib/java/rmi/server/RMIServerSocketFactory.java:1.2->1.3
libraries/javalib/java/rmi/server/RemoteCall.java:1.2->1.3
libraries/javalib/java/rmi/server/RemoteRef.java:1.2->1.3
libraries/javalib/java/rmi/server/ServerRef.java:1.2->1.3
libraries/javalib/java/rmi/server/Skeleton.java:1.2->1.3
libraries/javalib/java/rmi/server/Unreferenced.java:1.2->1.3
libraries/javalib/java/security/acl/Acl.java:1.4->1.5
libraries/javalib/java/security/acl/AclEntry.java:1.2->1.3
libraries/javalib/java/security/acl/Group.java:1.2->1.3
libraries/javalib/java/security/acl/Owner.java:1.2->1.3
libraries/javalib/java/security/acl/Permission.java:1.2->1.3
libraries/javalib/java/security/interfaces/DSAKey.java:1.2->1.3
libraries/javalib/java/security/interfaces/DSAKeyPairGenerator.java:1.2->1.3
libraries/javalib/java/security/interfaces/DSAParams.java:1.2->1.3
libraries/javalib/java/security/interfaces/DSAPrivateKey.java:1.3->1.4
libraries/javalib/java/security/interfaces/DSAPublicKey.java:1.3->1.4
libraries/javalib/java/security/interfaces/RSAKey.java:1.2->1.3
libraries/javalib/java/security/interfaces/RSAPrivateCrtKey.java:1.2->1.3
libraries/javalib/java/security/interfaces/RSAPrivateKey.java:1.2->1.3
libraries/javalib/java/security/interfaces/RSAPublicKey.java:1.2->1.3
libraries/javalib/java/sql/Array.java:1.2->1.3
libraries/javalib/java/sql/Blob.java:1.2->1.3
libraries/javalib/java/sql/CallableStatement.java:1.3->1.4
libraries/javalib/java/sql/Clob.java:1.2->1.3
libraries/javalib/java/sql/Connection.java:1.3->1.4
libraries/javalib/java/sql/DatabaseMetaData.java:1.3->1.4
libraries/javalib/java/sql/Driver.java:1.3->1.4
libraries/javalib/java/sql/ParameterMetaData.java:1.1->1.2
libraries/javalib/java/sql/PreparedStatement.java:1.3->1.4
libraries/javalib/java/sql/Ref.java:1.1->1.2
libraries/javalib/java/sql/ResultSet.java:1.3->1.4
libraries/javalib/java/sql/ResultSetMetaData.java:1.3->1.4
libraries/javalib/java/sql/SQLData.java:1.1->1.2
libraries/javalib/java/sql/SQLInput.java:1.1->1.2
libraries/javalib/java/sql/SQLOutput.java:1.1->1.2
libraries/javalib/java/sql/Savepoint.java:1.1->1.2
libraries/javalib/java/sql/Statement.java:1.3->1.4
libraries/javalib/java/sql/Struct.java:1.1->1.2
libraries/javalib/java/text/CharacterIterator.java:1.8->1.9
libraries/javalib/java/text/CollationKey.java:1.12->1.13
libraries/javalib/java/text/DateFormatSymbols.java:1.9->1.10
libraries/javalib/java/util/Arrays.java:1.9->1.10
libraries/javalib/java/util/Calendar.java:1.15->1.16
libraries/javalib/java/util/GregorianCalendar.java:1.20->1.21
libraries/javalib/java/util/Map.java:1.6->1.7
libraries/javalib/java/util/Observer.java:1.3->1.4
libraries/javalib/java/util/prefs/Preferences.java:1.2->1.3
libraries/javalib/javax/naming/Context.java:1.1->1.2
libraries/javalib/javax/naming/InitialContext.java:1.3->1.4
libraries/javalib/javax/naming/Name.java:1.1->1.2
libraries/javalib/javax/naming/NameParser.java:1.1->1.2
libraries/javalib/javax/naming/NamingEnumeration.java:1.1->1.2
libraries/javalib/javax/naming/Referenceable.java:1.1->1.2
libraries/javalib/javax/naming/directory/Attribute.java:1.2->1.3
libraries/javalib/javax/naming/directory/Attributes.java:1.1->1.2
libraries/javalib/javax/naming/directory/DirContext.java:1.1->1.2
libraries/javalib/javax/naming/event/EventContext.java:1.1->1.2
libraries/javalib/javax/naming/event/EventDirContext.java:1.1->1.2
libraries/javalib/javax/naming/event/NamespaceChangeListener.java:1.1->1.2
libraries/javalib/javax/naming/event/NamingListener.java:1.1->1.2
libraries/javalib/javax/naming/event/ObjectChangeListener.java:1.1->1.2
libraries/javalib/javax/naming/ldap/Control.java:1.1->1.2
libraries/javalib/javax/naming/ldap/ExtendedRequest.java:1.1->1.2
libraries/javalib/javax/naming/ldap/ExtendedResponse.java:1.1->1.2
libraries/javalib/javax/naming/ldap/HasControls.java:1.1->1.2
libraries/javalib/javax/naming/ldap/LdapContext.java:1.1->1.2
libraries/javalib/javax/naming/ldap/UnsolicitedNotification.java:1.1->1.2
libraries/javalib/javax/naming/ldap/UnsolicitedNotificationListener.java:1.1->1.2
libraries/javalib/javax/naming/spi/DirObjectFactory.java:1.1->1.2
libraries/javalib/javax/naming/spi/DirStateFactory.java:1.1->1.2
libraries/javalib/javax/naming/spi/InitialContextFactory.java:1.1->1.2
libraries/javalib/javax/naming/spi/InitialContextFactoryBuilder.java:1.1->1.2
libraries/javalib/javax/naming/spi/ObjectFactory.java:1.1->1.2
libraries/javalib/javax/naming/spi/ObjectFactoryBuilder.java:1.1->1.2
libraries/javalib/javax/naming/spi/Resolver.java:1.1->1.2
libraries/javalib/javax/naming/spi/StateFactory.java:1.1->1.2
libraries/javalib/javax/sql/ConnectionEventListener.java:1.1->1.2
libraries/javalib/javax/sql/ConnectionPoolDataSource.java:1.1->1.2
libraries/javalib/javax/sql/DataSource.java:1.1->1.2
libraries/javalib/javax/sql/PooledConnection.java:1.1->1.2
libraries/javalib/javax/sql/RowSet.java:1.1->1.2
libraries/javalib/javax/sql/RowSetInternal.java:1.1->1.2
libraries/javalib/javax/sql/RowSetListener.java:1.1->1.2
libraries/javalib/javax/sql/RowSetMetaData.java:1.1->1.2
libraries/javalib/javax/sql/RowSetReader.java:1.1->1.2
libraries/javalib/javax/sql/RowSetWriter.java:1.1->1.2
libraries/javalib/javax/sql/XAConnection.java:1.1->1.2
libraries/javalib/javax/sql/XADataSource.java:1.1->1.2
libraries/javalib/javax/transaction/Status.java:1.1->1.2
libraries/javalib/javax/transaction/Synchronization.java:1.1->1.2
libraries/javalib/javax/transaction/Transaction.java:1.1->1.2
libraries/javalib/javax/transaction/TransactionManager.java:1.1->1.2
libraries/javalib/javax/transaction/UserTransaction.java:1.1->1.2
libraries/javalib/javax/transaction/xa/XAResource.java:1.1->1.2
libraries/javalib/javax/transaction/xa/Xid.java:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1710 kaffe/ChangeLog:1.1711
--- kaffe/ChangeLog:1.1710 Tue Oct 21 19:43:06 2003
+++ kaffe/ChangeLog Wed Oct 22 10:34:42 2003
@@ -1,3 +1,247 @@
+2003-10-22 Dalibor Topic <robilad at kaffe.org>
+
+ * Makefile.am,
+ Makefile.in:
+ Regenerated.
+
+ * gnu/java/nio/NIOServerSocket.java,
+ gnu/java/nio/ServerSocketChannelSelectionKey.java:
+ New files from GNU Classpath.
+
+ * essential.files:
+ Added new files from GNU Classpath.
+
+ * gnu/java/beans/BeanInfoEmbryo.java,
+ gnu/java/beans/ExplicitBeanInfo.java,
+ gnu/java/beans/IntrospectionIncubator.java,
+ gnu/java/beans/editors/ColorEditor.java,
+ gnu/java/beans/editors/FontEditor.java,
+ gnu/java/beans/editors/NativeBooleanEditor.java,
+ gnu/java/beans/editors/NativeByteEditor.java,
+ gnu/java/beans/editors/NativeDoubleEditor.java,
+ gnu/java/beans/editors/NativeFloatEditor.java,
+ gnu/java/beans/editors/NativeIntEditor.java,
+ gnu/java/beans/editors/NativeLongEditor.java,
+ gnu/java/beans/editors/NativeShortEditor.java,
+ gnu/java/beans/editors/StringEditor.java,
+ gnu/java/io/ClassLoaderObjectInputStream.java,
+ gnu/java/lang/ClassHelper.java,
+ gnu/java/nio/NIOSocket.java,
+ gnu/java/nio/SelectorImpl.java,
+ gnu/java/nio/ServerSocketChannelImpl.java,
+ gnu/java/nio/SocketChannelImpl.java,
+ gnu/java/rmi/server/ProtocolConstants.java,
+ gnu/java/security/der/DER.java,
+ java/awt/ActiveEvent.java,
+ java/awt/datatransfer/ClipboardOwner.java,
+ java/awt/datatransfer/FlavorMap.java,
+ java/awt/datatransfer/Transferable.java,
+ java/awt/dnd/Autoscroll.java,
+ java/awt/dnd/peer/DragSourceContextPeer.java,
+ java/awt/dnd/peer/DropTargetContextPeer.java,
+ java/awt/dnd/peer/DropTargetPeer.java,
+ java/awt/font/FontRenderContext.java,
+ java/awt/font/MultipleMaster.java,
+ java/awt/font/OpenType.java,
+ java/awt/geom/AffineTransform.java,
+ java/awt/geom/Arc2D.java,
+ java/awt/geom/PathIterator.java,
+ java/awt/geom/Rectangle2D.java,
+ java/awt/geom/RoundRectangle2D.java,
+ java/awt/image/BufferedImage.java,
+ java/awt/image/Raster.java,
+ java/awt/image/RasterOp.java,
+ java/awt/image/SinglePixelPackedSampleModel.java,
+ java/awt/image/WritableRaster.java,
+ java/awt/image/renderable/RenderableImage.java,
+ java/awt/peer/ButtonPeer.java,
+ java/awt/peer/CheckboxMenuItemPeer.java,
+ java/awt/peer/CheckboxPeer.java,
+ java/awt/peer/ChoicePeer.java,
+ java/awt/peer/ContainerPeer.java,
+ java/awt/peer/DialogPeer.java,
+ java/awt/peer/FileDialogPeer.java,
+ java/awt/peer/FramePeer.java,
+ java/awt/peer/LabelPeer.java,
+ java/awt/peer/ListPeer.java,
+ java/awt/peer/MenuBarPeer.java,
+ java/awt/peer/MenuItemPeer.java,
+ java/awt/peer/MenuPeer.java,
+ java/awt/peer/PopupMenuPeer.java,
+ java/awt/peer/RobotPeer.java,
+ java/awt/peer/ScrollPanePeer.java,
+ java/awt/peer/ScrollbarPeer.java,
+ java/awt/peer/TextAreaPeer.java,
+ java/awt/peer/TextComponentPeer.java,
+ java/awt/peer/TextFieldPeer.java,
+ java/awt/print/Pageable.java,
+ java/awt/print/Printable.java,
+ java/awt/print/PrinterGraphics.java,
+ java/beans/AppletInitializer.java,
+ java/beans/BeanDescriptor.java,
+ java/beans/BeanInfo.java,
+ java/beans/Beans.java,
+ java/beans/Customizer.java,
+ java/beans/DesignMode.java,
+ java/beans/EventSetDescriptor.java,
+ java/beans/FeatureDescriptor.java,
+ java/beans/IndexedPropertyDescriptor.java,
+ java/beans/MethodDescriptor.java,
+ java/beans/ParameterDescriptor.java,
+ java/beans/PropertyChangeEvent.java,
+ java/beans/PropertyChangeSupport.java,
+ java/beans/PropertyDescriptor.java,
+ java/beans/PropertyEditor.java,
+ java/beans/PropertyEditorManager.java,
+ java/beans/PropertyEditorSupport.java,
+ java/beans/SimpleBeanInfo.java,
+ java/beans/VetoableChangeSupport.java,
+ java/beans/Visibility.java,
+ java/beans/beancontext/BeanContext.java,
+ java/beans/beancontext/BeanContextChild.java,
+ java/beans/beancontext/BeanContextChildComponentProxy.java,
+ java/beans/beancontext/BeanContextChildSupport.java,
+ java/beans/beancontext/BeanContextContainerProxy.java,
+ java/beans/beancontext/BeanContextMembershipListener.java,
+ java/beans/beancontext/BeanContextProxy.java,
+ java/beans/beancontext/BeanContextServiceProvider.java,
+ java/beans/beancontext/BeanContextServiceProviderBeanInfo.java,
+ java/beans/beancontext/BeanContextServiceRevokedListener.java,
+ java/beans/beancontext/BeanContextServices.java,
+ java/beans/beancontext/BeanContextServicesListener.java,
+ java/io/Externalizable.java,
+ java/io/FilePermission.java,
+ java/io/ObjectInput.java,
+ java/io/ObjectInputValidation.java,
+ java/io/ObjectOutput.java,
+ java/io/ObjectStreamConstants.java,
+ java/io/Serializable.java,
+ java/lang/StrictMath.java,
+ java/lang/StringBuffer.java,
+ java/net/DatagramSocketImplFactory.java,
+ java/net/ServerSocket.java,
+ java/net/SocketImplFactory.java,
+ java/net/SocketOptions.java,
+ java/nio/Buffer.java,
+ java/nio/ByteBufferHelper.java,
+ java/nio/MappedByteBuffer.java,
+ java/nio/channels/Channel.java,
+ java/nio/channels/GatheringByteChannel.java,
+ java/nio/channels/ReadableByteChannel.java,
+ java/nio/channels/ScatteringByteChannel.java,
+ java/nio/channels/WritableByteChannel.java,
+ java/nio/channels/spi/AbstractSelectableChannel.java,
+ java/nio/channels/spi/AbstractSelectionKey.java,
+ java/nio/channels/spi/AbstractSelector.java,
+ java/nio/channels/spi/SelectorProvider.java,
+ java/rmi/activation/ActivationInstantiator.java,
+ java/rmi/activation/ActivationMonitor.java,
+ java/rmi/activation/ActivationSystem.java,
+ java/rmi/activation/Activator.java,
+ java/rmi/dgc/DGC.java,
+ java/rmi/registry/Registry.java,
+ java/rmi/registry/RegistryHandler.java,
+ java/rmi/server/LoaderHandler.java,
+ java/rmi/server/RMIClassLoader.java,
+ java/rmi/server/RMIClientSocketFactory.java,
+ java/rmi/server/RMIFailureHandler.java,
+ java/rmi/server/RMIServerSocketFactory.java,
+ java/rmi/server/RemoteCall.java,
+ java/rmi/server/RemoteRef.java,
+ java/rmi/server/ServerRef.java,
+ java/rmi/server/Skeleton.java,
+ java/rmi/server/Unreferenced.java,
+ java/security/acl/Acl.java,
+ java/security/acl/AclEntry.java,
+ java/security/acl/Group.java,
+ java/security/acl/Owner.java,
+ java/security/acl/Permission.java,
+ java/security/interfaces/DSAKey.java,
+ java/security/interfaces/DSAKeyPairGenerator.java,
+ java/security/interfaces/DSAParams.java,
+ java/security/interfaces/DSAPrivateKey.java,
+ java/security/interfaces/DSAPublicKey.java,
+ java/security/interfaces/RSAKey.java,
+ java/security/interfaces/RSAPrivateCrtKey.java,
+ java/security/interfaces/RSAPrivateKey.java,
+ java/security/interfaces/RSAPublicKey.java,
+ java/sql/Array.java,
+ java/sql/Blob.java,
+ java/sql/CallableStatement.java,
+ java/sql/Clob.java,
+ java/sql/Connection.java,
+ java/sql/DatabaseMetaData.java,
+ java/sql/Driver.java,
+ java/sql/ParameterMetaData.java,
+ java/sql/PreparedStatement.java,
+ java/sql/Ref.java,
+ java/sql/ResultSet.java,
+ java/sql/ResultSetMetaData.java,
+ java/sql/SQLData.java,
+ java/sql/SQLInput.java,
+ java/sql/SQLOutput.java,
+ java/sql/Savepoint.java,
+ java/sql/Statement.java,
+ java/sql/Struct.java,
+ java/text/CharacterIterator.java,
+ java/text/CollationKey.java,
+ java/text/DateFormatSymbols.java,
+ java/util/Arrays.java,
+ java/util/Calendar.java,
+ java/util/GregorianCalendar.java,
+ java/util/Map.java,
+ java/util/Observer.java,
+ java/util/prefs/Preferences.java,
+ javax/naming/Context.java,
+ javax/naming/InitialContext.java,
+ javax/naming/Name.java,
+ javax/naming/NameParser.java,
+ javax/naming/NamingEnumeration.java,
+ javax/naming/Referenceable.java,
+ javax/naming/directory/Attribute.java,
+ javax/naming/directory/Attributes.java,
+ javax/naming/directory/DirContext.java,
+ javax/naming/event/EventContext.java,
+ javax/naming/event/EventDirContext.java,
+ javax/naming/event/NamespaceChangeListener.java,
+ javax/naming/event/NamingListener.java,
+ javax/naming/event/ObjectChangeListener.java,
+ javax/naming/ldap/Control.java,
+ javax/naming/ldap/ExtendedRequest.java,
+ javax/naming/ldap/ExtendedResponse.java,
+ javax/naming/ldap/HasControls.java,
+ javax/naming/ldap/LdapContext.java,
+ javax/naming/ldap/UnsolicitedNotification.java,
+ javax/naming/ldap/UnsolicitedNotificationListener.java,
+ javax/naming/spi/DirObjectFactory.java,
+ javax/naming/spi/DirStateFactory.java,
+ javax/naming/spi/InitialContextFactory.java,
+ javax/naming/spi/InitialContextFactoryBuilder.java,
+ javax/naming/spi/ObjectFactory.java,
+ javax/naming/spi/ObjectFactoryBuilder.java,
+ javax/naming/spi/Resolver.java,
+ javax/naming/spi/StateFactory.java,
+ javax/sql/ConnectionEventListener.java,
+ javax/sql/ConnectionPoolDataSource.java,
+ javax/sql/DataSource.java,
+ javax/sql/PooledConnection.java,
+ javax/sql/RowSet.java,
+ javax/sql/RowSetInternal.java,
+ javax/sql/RowSetListener.java,
+ javax/sql/RowSetMetaData.java,
+ javax/sql/RowSetReader.java,
+ javax/sql/RowSetWriter.java,
+ javax/sql/XAConnection.java,
+ javax/sql/XADataSource.java,
+ javax/transaction/Status.java,
+ javax/transaction/Synchronization.java,
+ javax/transaction/Transaction.java,
+ javax/transaction/TransactionManager.java,
+ javax/transaction/UserTransaction.java,
+ javax/transaction/xa/XAResource.java,
+ javax/transaction/xa/Xid.java:
+ Resynced with GNU Classpath.
+
2003-10-21 Timothy S. Stack <stack at cs.utah.edu>
* libraries/javalib/java/security/Security.java:
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.139 kaffe/libraries/javalib/Makefile.am:1.140
--- kaffe/libraries/javalib/Makefile.am:1.139 Thu Oct 16 17:10:00 2003
+++ kaffe/libraries/javalib/Makefile.am Wed Oct 22 10:34:43 2003
@@ -397,12 +397,14 @@
gnu/java/nio/FileLockImpl.java \
gnu/java/nio/NIOConstants.java \
gnu/java/nio/NIODatagramSocket.java \
+ gnu/java/nio/NIOServerSocket.java \
gnu/java/nio/NIOSocket.java \
gnu/java/nio/PipeImpl.java \
gnu/java/nio/SelectionKeyImpl.java \
gnu/java/nio/SelectorImpl.java \
gnu/java/nio/SelectorProviderImpl.java \
gnu/java/nio/ServerSocketChannelImpl.java \
+ gnu/java/nio/ServerSocketChannelSelectionKey.java \
gnu/java/nio/SocketChannelImpl.java \
gnu/java/nio/SocketChannelSelectionKey.java
gnu_java_nio_charset_SRCS = \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.187 kaffe/libraries/javalib/Makefile.in:1.188
--- kaffe/libraries/javalib/Makefile.in:1.187 Thu Oct 16 17:10:00 2003
+++ kaffe/libraries/javalib/Makefile.in Wed Oct 22 10:34:45 2003
@@ -645,12 +645,14 @@
gnu/java/nio/FileLockImpl.java \
gnu/java/nio/NIOConstants.java \
gnu/java/nio/NIODatagramSocket.java \
+ gnu/java/nio/NIOServerSocket.java \
gnu/java/nio/NIOSocket.java \
gnu/java/nio/PipeImpl.java \
gnu/java/nio/SelectionKeyImpl.java \
gnu/java/nio/SelectorImpl.java \
gnu/java/nio/SelectorProviderImpl.java \
gnu/java/nio/ServerSocketChannelImpl.java \
+ gnu/java/nio/ServerSocketChannelSelectionKey.java \
gnu/java/nio/SocketChannelImpl.java \
gnu/java/nio/SocketChannelSelectionKey.java
Index: kaffe/libraries/javalib/essential.files
diff -u kaffe/libraries/javalib/essential.files:1.28 kaffe/libraries/javalib/essential.files:1.29
--- kaffe/libraries/javalib/essential.files:1.28 Sun Sep 28 19:53:58 2003
+++ kaffe/libraries/javalib/essential.files Wed Oct 22 10:34:45 2003
@@ -22,12 +22,14 @@
gnu/java/nio/FileLockImpl.java
gnu/java/nio/NIOConstants.java
gnu/java/nio/NIODatagramSocket.java
+gnu/java/nio/NIOServerSocket.java
gnu/java/nio/NIOSocket.java
gnu/java/nio/PipeImpl.java
gnu/java/nio/SelectionKeyImpl.java
gnu/java/nio/SelectorImpl.java
gnu/java/nio/SelectorProviderImpl.java
gnu/java/nio/ServerSocketChannelImpl.java
+gnu/java/nio/ServerSocketChannelSelectionKey.java
gnu/java/nio/SocketChannelImpl.java
gnu/java/nio/SocketChannelSelectionKey.java
gnu/regexp/CharIndexed.java
Index: kaffe/libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java
diff -u kaffe/libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java:1.1 kaffe/libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java:1.1 Wed Oct 15 00:13:06 2003
+++ kaffe/libraries/javalib/gnu/java/beans/BeanInfoEmbryo.java Wed Oct 22 10:34:45 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.BeanInfoEmbryo
Copyright (C) 1998, 2002 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java
diff -u kaffe/libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:1.1 kaffe/libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java:1.1 Wed Oct 15 00:13:06 2003
+++ kaffe/libraries/javalib/gnu/java/beans/ExplicitBeanInfo.java Wed Oct 22 10:34:45 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.ExplicitBeanInfo
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/IntrospectionIncubator.java
diff -u kaffe/libraries/javalib/gnu/java/beans/IntrospectionIncubator.java:1.1 kaffe/libraries/javalib/gnu/java/beans/IntrospectionIncubator.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/IntrospectionIncubator.java:1.1 Wed Oct 15 00:13:06 2003
+++ kaffe/libraries/javalib/gnu/java/beans/IntrospectionIncubator.java Wed Oct 22 10:34:45 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.IntrospectionIncubator
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/editors/ColorEditor.java
diff -u kaffe/libraries/javalib/gnu/java/beans/editors/ColorEditor.java:1.1 kaffe/libraries/javalib/gnu/java/beans/editors/ColorEditor.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/editors/ColorEditor.java:1.1 Wed Oct 15 00:13:07 2003
+++ kaffe/libraries/javalib/gnu/java/beans/editors/ColorEditor.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.editors.ColorEditor
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/editors/FontEditor.java
diff -u kaffe/libraries/javalib/gnu/java/beans/editors/FontEditor.java:1.1 kaffe/libraries/javalib/gnu/java/beans/editors/FontEditor.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/editors/FontEditor.java:1.1 Wed Oct 15 00:13:07 2003
+++ kaffe/libraries/javalib/gnu/java/beans/editors/FontEditor.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.editors.FontEditor
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/editors/NativeBooleanEditor.java
diff -u kaffe/libraries/javalib/gnu/java/beans/editors/NativeBooleanEditor.java:1.1 kaffe/libraries/javalib/gnu/java/beans/editors/NativeBooleanEditor.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/editors/NativeBooleanEditor.java:1.1 Wed Oct 15 00:13:07 2003
+++ kaffe/libraries/javalib/gnu/java/beans/editors/NativeBooleanEditor.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.editors.NativeBooleanEditor
Copyright (C) 1998, 2002 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/editors/NativeByteEditor.java
diff -u kaffe/libraries/javalib/gnu/java/beans/editors/NativeByteEditor.java:1.1 kaffe/libraries/javalib/gnu/java/beans/editors/NativeByteEditor.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/editors/NativeByteEditor.java:1.1 Wed Oct 15 00:13:07 2003
+++ kaffe/libraries/javalib/gnu/java/beans/editors/NativeByteEditor.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.editors.NativeByteEditor
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/editors/NativeDoubleEditor.java
diff -u kaffe/libraries/javalib/gnu/java/beans/editors/NativeDoubleEditor.java:1.1 kaffe/libraries/javalib/gnu/java/beans/editors/NativeDoubleEditor.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/editors/NativeDoubleEditor.java:1.1 Wed Oct 15 00:13:07 2003
+++ kaffe/libraries/javalib/gnu/java/beans/editors/NativeDoubleEditor.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.editors.NativeDoubleEditor
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/editors/NativeFloatEditor.java
diff -u kaffe/libraries/javalib/gnu/java/beans/editors/NativeFloatEditor.java:1.1 kaffe/libraries/javalib/gnu/java/beans/editors/NativeFloatEditor.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/editors/NativeFloatEditor.java:1.1 Wed Oct 15 00:13:07 2003
+++ kaffe/libraries/javalib/gnu/java/beans/editors/NativeFloatEditor.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.editors.NativeFloatEditor
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/editors/NativeIntEditor.java
diff -u kaffe/libraries/javalib/gnu/java/beans/editors/NativeIntEditor.java:1.1 kaffe/libraries/javalib/gnu/java/beans/editors/NativeIntEditor.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/editors/NativeIntEditor.java:1.1 Wed Oct 15 00:13:07 2003
+++ kaffe/libraries/javalib/gnu/java/beans/editors/NativeIntEditor.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.editors.NativeIntEditor
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/editors/NativeLongEditor.java
diff -u kaffe/libraries/javalib/gnu/java/beans/editors/NativeLongEditor.java:1.1 kaffe/libraries/javalib/gnu/java/beans/editors/NativeLongEditor.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/editors/NativeLongEditor.java:1.1 Wed Oct 15 00:13:07 2003
+++ kaffe/libraries/javalib/gnu/java/beans/editors/NativeLongEditor.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.editors.NativeLongEditor
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/editors/NativeShortEditor.java
diff -u kaffe/libraries/javalib/gnu/java/beans/editors/NativeShortEditor.java:1.1 kaffe/libraries/javalib/gnu/java/beans/editors/NativeShortEditor.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/editors/NativeShortEditor.java:1.1 Wed Oct 15 00:13:07 2003
+++ kaffe/libraries/javalib/gnu/java/beans/editors/NativeShortEditor.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.editors.NativeShortEditor
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/beans/editors/StringEditor.java
diff -u kaffe/libraries/javalib/gnu/java/beans/editors/StringEditor.java:1.1 kaffe/libraries/javalib/gnu/java/beans/editors/StringEditor.java:1.2
--- kaffe/libraries/javalib/gnu/java/beans/editors/StringEditor.java:1.1 Wed Oct 15 00:13:07 2003
+++ kaffe/libraries/javalib/gnu/java/beans/editors/StringEditor.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.beans.editors.StringEditor
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/io/ClassLoaderObjectInputStream.java
diff -u kaffe/libraries/javalib/gnu/java/io/ClassLoaderObjectInputStream.java:1.1 kaffe/libraries/javalib/gnu/java/io/ClassLoaderObjectInputStream.java:1.2
--- kaffe/libraries/javalib/gnu/java/io/ClassLoaderObjectInputStream.java:1.1 Thu Oct 9 20:25:20 2003
+++ kaffe/libraries/javalib/gnu/java/io/ClassLoaderObjectInputStream.java Wed Oct 22 10:34:46 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* gnu.java.io.ClassLoaderObjectInputStream
Copyright (C) 1998 Free Software Foundation, Inc.
Index: kaffe/libraries/javalib/gnu/java/lang/ClassHelper.java
diff -u kaffe/libraries/javalib/gnu/java/lang/ClassHelper.java:1.1 kaffe/libraries/javalib/gnu/java/lang/ClassHelper.java:1.2
--- kaffe/libraries/javalib/gnu/java/lang/ClassHelper.java:1.1 Thu Oct 9 20:25:21 2003
+++ kaffe/libraries/javalib/gnu/java/lang/ClassHelper.java Wed Oct 22 10:34:47 2003
@@ -1,10 +1,3 @@
-/*
- *
- * Imported from GNU Classpath by M.Negovanovic
- *
- */
-
-
/* ClassHelper.java -- Utility methods to augment java.lang.Class
Copyright (C) 1998, 2002 Free Software Foundation, Inc.
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/nio/NIOServerSocket.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/nio/NIOServerSocket.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/nio/NIOServerSocket.java Wed Oct 22 10:37:10 2003
@@ -0,0 +1,80 @@
+/* NIOServerSocket.java --
+ Copyright (C) 2003 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.
+
+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. */
+
+
+package gnu.java.nio;
+
+import gnu.java.net.PlainSocketImpl;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+
+/**
+ * @author Michael Koch
+ */
+public final class NIOServerSocket extends ServerSocket
+{
+ private PlainSocketImpl impl;
+ private ServerSocketChannelImpl channel;
+
+ protected NIOServerSocket (ServerSocketChannelImpl channel)
+ throws IOException
+ {
+ super();
+ this.channel = channel;
+ }
+
+ public native PlainSocketImpl getPlainSocketImpl();
+
+ public ServerSocketChannel getChannel()
+ {
+ return channel;
+ }
+
+ public Socket accept() throws IOException
+ {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkListen (getLocalPort());
+
+ SocketChannel socketChannel = channel.provider().openSocketChannel();
+ implAccept (socketChannel.socket());
+ return socketChannel.socket();
+ }
+}
Index: kaffe/libraries/javalib/gnu/java/nio/NIOSocket.java
diff -u kaffe/libraries/javalib/gnu/java/nio/NIOSocket.java:1.1 kaffe/libraries/javalib/gnu/java/nio/NIOSocket.java:1.2
--- kaffe/libraries/javalib/gnu/java/nio/NIOSocket.java:1.1 Sun Sep 28 19:54:10 2003
+++ kaffe/libraries/javalib/gnu/java/nio/NIOSocket.java Wed Oct 22 10:34:47 2003
@@ -66,6 +66,7 @@
final void setChannel (SocketChannelImpl channel)
{
+ this.impl = channel.getImpl();
this.channel = channel;
}
Index: kaffe/libraries/javalib/gnu/java/nio/SelectorImpl.java
diff -u kaffe/libraries/javalib/gnu/java/nio/SelectorImpl.java:1.3 kaffe/libraries/javalib/gnu/java/nio/SelectorImpl.java:1.4
--- kaffe/libraries/javalib/gnu/java/nio/SelectorImpl.java:1.3 Sun Sep 28 19:54:10 2003
+++ kaffe/libraries/javalib/gnu/java/nio/SelectorImpl.java Wed Oct 22 10:34:47 2003
@@ -253,17 +253,17 @@
if (ch instanceof SocketChannelImpl)
{
SocketChannelImpl sc = (SocketChannelImpl) ch;
- result = new SocketChannelSelectionKey (ch, this); // FIXME: last argument
+ result = new SocketChannelSelectionKey (ch, this);
}
else if (ch instanceof DatagramChannelImpl)
{
DatagramChannelImpl dc = (DatagramChannelImpl) ch;
- result = new DatagramChannelSelectionKey (ch, this); // FIXME: last argument
+ result = new DatagramChannelSelectionKey (ch, this);
}
else if (ch instanceof ServerSocketChannelImpl)
{
ServerSocketChannelImpl ssc = (ServerSocketChannelImpl) ch;
- result = new SocketChannelSelectionKey (ch, this); // FIXME: last argument
+ result = new ServerSocketChannelSelectionKey (ch, this);
}
else
{
Index: kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java
diff -u kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.3 kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.4
--- kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java:1.3 Sun Aug 10 18:47:47 2003
+++ kaffe/libraries/javalib/gnu/java/nio/ServerSocketChannelImpl.java Wed Oct 22 10:34:47 2003
@@ -1,5 +1,5 @@
/* ServerSocketChannelImpl.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,18 +38,23 @@
package gnu.java.nio;
+import gnu.java.net.PlainSocketImpl;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketAddress;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.NotYetBoundException;
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
import java.nio.channels.spi.SelectorProvider;
-class ServerSocketChannelImpl extends ServerSocketChannel
+public final class ServerSocketChannelImpl extends ServerSocketChannel
{
- ServerSocket serverSocket;
+ NIOServerSocket serverSocket;
boolean blocking = true;
boolean connected = false;
@@ -57,7 +62,12 @@
throws IOException
{
super (provider);
- serverSocket = new ServerSocket ();
+ serverSocket = new NIOServerSocket (this);
+ }
+
+ public int getNativeFD()
+ {
+ return serverSocket.getPlainSocketImpl().getNativeFD();
}
public void finalizer()
@@ -82,15 +92,34 @@
protected void implConfigureBlocking (boolean blocking) throws IOException
{
- this.blocking = blocking; // FIXME
+ serverSocket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT);
+ this.blocking = blocking;
}
public SocketChannel accept () throws IOException
{
- SocketChannelImpl result = new SocketChannelImpl (provider ());
- Socket socket = serverSocket.accept();
- //socket.setChannel (result); // FIXME
- return result;
+ if (!isOpen())
+ throw new ClosedChannelException();
+
+ if (!serverSocket.isBound())
+ throw new NotYetBoundException();
+
+ boolean completed = false;
+
+ try
+ {
+ NIOSocket socket = (NIOSocket) serverSocket.accept();
+ completed = true;
+ return socket.getChannel();
+ }
+ catch (SocketTimeoutException e)
+ {
+ return null;
+ }
+ finally
+ {
+ end (completed);
+ }
}
public ServerSocket socket ()
Index: kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java
diff -u kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.6 kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.7
--- kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java:1.6 Sun Sep 28 19:54:10 2003
+++ kaffe/libraries/javalib/gnu/java/nio/SocketChannelImpl.java Wed Oct 22 10:34:47 2003
@@ -63,6 +63,7 @@
*** Patch too long, truncated ***
More information about the kaffe
mailing list