From: <cr...@us...> - 2009-09-09 15:36:02
|
Revision: 5668 http://jnode.svn.sourceforge.net/jnode/?rev=5668&view=rev Author: crawley Date: 2009-09-09 15:35:38 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Merge changes from 'trunk' at r5663 (net) Modified Paths: -------------- branches/jikesRVM/net/.classpath branches/jikesRVM/net/.project branches/jikesRVM/net/.settings/org.eclipse.jdt.core.prefs branches/jikesRVM/net/build.xml branches/jikesRVM/net/descriptors/com.jcraft.jsch.xml branches/jikesRVM/net/descriptors/org.jnode.driver.net.3c90x.xml branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.config.xml branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.xml branches/jikesRVM/net/descriptors/org.jnode.test.net.xml branches/jikesRVM/net/descriptors/org.xbill.dns.xml branches/jikesRVM/net/net.iml branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceAPI.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceListener.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetworkException.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/WirelessNetDeviceAPI.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xConstants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xFlags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xRxRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xTxBuffer.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xConstants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/bcm570x/BCM570xFlags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Constants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Driver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Flags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Registers.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100RxFD.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Stats.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Utils.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ethernet/spi/AbstractEthernetDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ethernet/spi/BasicEthernetDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ethernet/spi/Flags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/event/LinkStatusEvent.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/BufferManager.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/DWordIOAccess.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/Descriptor.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/DescriptorRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/IOAccess.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/InitializationBlock32Bit.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/LanceConstants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/LanceCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/LanceDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/LanceFlags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/RxDescriptor.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/RxDescriptorRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/TxDescriptor.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/TxDescriptorRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/lance/WordIOAccess.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/loopback/LoopbackDevice.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/loopback/LoopbackDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/loopback/LoopbackFinder.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/Ne2000Constants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/Ne2000Core.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/Ne2000Driver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/Ne2000Flags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/Ne2000PacketHeader.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/pci/Ne2000PCI.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/ne2000/pci/Ne2000PCIDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2CommFrame.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2CommandResponse.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2Constants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2Driver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2Flags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2IO.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2InfoFrame.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/prism2/Prism2Record.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139Constants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139Core.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139Driver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139Flags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139RxRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/rtl8139/RTL8139TxBuffer.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/spi/AbstractDeviceCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/spi/AbstractNetDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/spi/NetDeviceEventProcessor.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDevice.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDeviceToDriverMapper.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbNetConstant.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/wireless/spi/WirelessDeviceCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/wireless/spi/WirelessEthernetDriver.java branches/jikesRVM/net/src/net/org/jnode/net/HardwareAddress.java branches/jikesRVM/net/src/net/org/jnode/net/InvalidLayerException.java branches/jikesRVM/net/src/net/org/jnode/net/LayerAlreadyRegisteredException.java branches/jikesRVM/net/src/net/org/jnode/net/LayerHeader.java branches/jikesRVM/net/src/net/org/jnode/net/LinkLayer.java branches/jikesRVM/net/src/net/org/jnode/net/LinkLayerHeader.java branches/jikesRVM/net/src/net/org/jnode/net/NetPermission.java branches/jikesRVM/net/src/net/org/jnode/net/NetworkLayer.java branches/jikesRVM/net/src/net/org/jnode/net/NetworkLayerHeader.java branches/jikesRVM/net/src/net/org/jnode/net/NetworkLayerManager.java branches/jikesRVM/net/src/net/org/jnode/net/NoSuchProtocolException.java branches/jikesRVM/net/src/net/org/jnode/net/ProtocolAddress.java branches/jikesRVM/net/src/net/org/jnode/net/ProtocolAddressInfo.java branches/jikesRVM/net/src/net/org/jnode/net/Resolver.java branches/jikesRVM/net/src/net/org/jnode/net/SocketBuffer.java branches/jikesRVM/net/src/net/org/jnode/net/TransportLayer.java branches/jikesRVM/net/src/net/org/jnode/net/TransportLayerHeader.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPCache.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPCacheEntry.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPConstants.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPHeader.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPNetworkLayer.java branches/jikesRVM/net/src/net/org/jnode/net/arp/ARPStatistics.java branches/jikesRVM/net/src/net/org/jnode/net/arp/RARPNetworkLayer.java branches/jikesRVM/net/src/net/org/jnode/net/ethernet/EthernetAddress.java branches/jikesRVM/net/src/net/org/jnode/net/ethernet/EthernetConstants.java branches/jikesRVM/net/src/net/org/jnode/net/ethernet/EthernetHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ethernet/EthernetUtils.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Address.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4AddressAndMask.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Constants.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4ControlBlock.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4ControlBlockList.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4FragmentList.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Header.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4IfAddress.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Protocol.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4ProtocolAddressInfo.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Route.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4RoutingTable.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Service.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/IPv4Utils.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/bootp/AbstractBOOTPClient.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/bootp/BOOTPClient.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/bootp/BOOTPHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/bootp/BOOTPMessage.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/IPv4ConfigurationService.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/ConfigurationProcessor.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/ConfigurationQueueEntry.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/ConfigurationServiceImpl.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/IPv4ConfigurationPlugin.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/Ifconfig.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetBootpDeviceConfig.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetConfigurationData.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetDeviceConfig.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetDeviceMonitor.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetDhcpConfig.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/NetStaticDeviceConfig.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/config/impl/Route.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/dhcp/AbstractDHCPClient.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/dhcp/DHCPClient.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/dhcp/DHCPMessage.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPAddressMaskHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPConstants.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPEchoHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPExHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPListener.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPListenerCriteria.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPProtocol.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPStatistics.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPTimestampHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPUnreachableHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/icmp/ICMPUtils.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/layer/IPv4NetworkLayer.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/layer/IPv4Sender.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/layer/IPv4Statistics.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/raw/RAWProtocol.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/raw/RAWStatistics.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPConstants.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPControlBlock.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPControlBlockList.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPDataBuffer.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPInChannel.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPInSegment.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPInputStream.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPOutChannel.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPOutSegment.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPOutputStream.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPProtocol.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPSegment.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPSocketImpl.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPSocketImplFactory.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPStatistics.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPTimer.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tcp/TCPUtils.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tftp/TFTPClient.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/tftp/TFTPServer.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPConstants.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPControlBlock.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImpl.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPDatagramSocketImplFactory.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPHeader.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/UDPStatistics.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/util/ResolverImpl.java branches/jikesRVM/net/src/net/org/jnode/net/service/DefaultNetworkLayerManager.java branches/jikesRVM/net/src/net/org/jnode/net/service/NetAPIImpl.java branches/jikesRVM/net/src/net/org/jnode/net/service/NetDeviceImpl.java branches/jikesRVM/net/src/net/org/jnode/net/service/NetPlugin.java branches/jikesRVM/net/src/net/org/jnode/net/util/AbstractDatagramSocketImpl.java branches/jikesRVM/net/src/net/org/jnode/net/util/NetUtils.java branches/jikesRVM/net/src/net/org/jnode/net/wireless/AuthenticationMode.java branches/jikesRVM/net/src/net/org/jnode/net/wireless/WirelessConstants.java branches/jikesRVM/net/src/net/org/jnode/net/wireless/p80211Header.java branches/jikesRVM/net/src/net/org/jnode/protocol/ftp/FTPURLConnection.java branches/jikesRVM/net/src/net/org/jnode/protocol/ftp/Handler.java branches/jikesRVM/net/src/net/org/jnode/protocol/tftp/Handler.java branches/jikesRVM/net/src/net/org/jnode/protocol/tftp/TFTPURLConnection.java branches/jikesRVM/net/src/test/org/jnode/test/net/ARPTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/ChecksumTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/CvsTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/DnsTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/NetTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/TCPTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/UDPSendTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/UDPTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/URLTest.java branches/jikesRVM/net/src/test/org/jnode/test/net/ethernet/EthernetAddressTest.java Added Paths: ----------- branches/jikesRVM/net/.checkstyle branches/jikesRVM/net/descriptors/org.acplt.oncrpc.xml branches/jikesRVM/net/descriptors/org.jnode.driver.net.via_rhine.xml branches/jikesRVM/net/descriptors/org.jnode.net.nfs.xml branches/jikesRVM/net/descriptors/org.jnode.protocol.nfs.xml branches/jikesRVM/net/lib/dnsjava-1.6.6-src.zip branches/jikesRVM/net/lib/dnsjava-1.6.6.jar branches/jikesRVM/net/lib/oncrpc.jar branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/UsbNetConstant.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/UsbNetDeviceToDriverMapper.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineConstants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineDesc.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineFlags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRxRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineTxRing.java branches/jikesRVM/net/src/net/org/jnode/net/ipv4/udp/PlainUDPDatagramSocketImpl.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/ branches/jikesRVM/net/src/net/org/jnode/net/nfs/Protocol.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/CreateDirectoryResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/CreateFileResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/Entry.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/FileAttribute.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/FileSystemAttribute.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ListDirectoryResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/LookupResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/NFS2Client.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/NFS2Exception.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ReadFileResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ResultCode.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/Time.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/ branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/ExportEntry.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/Mount1Client.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/MountException.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/MountResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/RemoteMountFileSystem.java branches/jikesRVM/net/src/net/org/jnode/net/syntax/ branches/jikesRVM/net/src/net/org/jnode/net/syntax/IPv4AddressArgument.java branches/jikesRVM/net/src/net/org/jnode/net/syntax/IPv4HostArgument.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/ branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/Handler.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/ branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2InputStream.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2URLConnection.java Removed Paths: ------------- branches/jikesRVM/net/descriptors/org.jnode.net.command.xml branches/jikesRVM/net/lib/dnsjava-1.5.0.jar branches/jikesRVM/net/lib/dnsjava-2.0.1a.jar branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineConstants.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineDesc.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineDriver.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineFlags.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineRxRing.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineTxRing.java branches/jikesRVM/net/src/net/org/jnode/net/command/ArpCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/BootpCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/DhcpCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/HostArgument.java branches/jikesRVM/net/src/net/org/jnode/net/command/HostNameArgument.java branches/jikesRVM/net/src/net/org/jnode/net/command/IfconfigCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/NetCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/NetstatCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/NetworkArgument.java branches/jikesRVM/net/src/net/org/jnode/net/command/PingCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/ResolverCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/RouteCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/TftpCommand.java branches/jikesRVM/net/src/net/org/jnode/net/command/WLanCtlCommand.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/Protocol.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/CreateDirectoryResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/CreateFileResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/Entry.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/FileAttribute.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/FileSystemAttribute.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ListDirectoryResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/LookupResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/NFS2Client.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/NFS2Exception.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ReadFileResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/ResultCode.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/Time.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/ branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/ExportEntry.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/Mount1Client.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/MountException.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/MountResult.java branches/jikesRVM/net/src/net/org/jnode/net/nfs/nfs2/mount/RemoteMountFileSystem.java branches/jikesRVM/net/src/net/org/jnode/net/syntax/IPv4AddressArgument.java branches/jikesRVM/net/src/net/org/jnode/net/syntax/IPv4HostArgument.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/Handler.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/ branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2InputStream.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java branches/jikesRVM/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2URLConnection.java Property Changed: ---------------- branches/jikesRVM/net/ branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/ branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDeviceToDriverMapper.java branches/jikesRVM/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbNetConstant.java Property changes on: branches/jikesRVM/net ___________________________________________________________________ Modified: svn:ignore - build + build reports Copied: branches/jikesRVM/net/.checkstyle (from rev 5663, trunk/net/.checkstyle) =================================================================== --- branches/jikesRVM/net/.checkstyle (rev 0) +++ branches/jikesRVM/net/.checkstyle 2009-09-09 15:35:38 UTC (rev 5668) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <local-check-config name="JNode checkstyle" location="/all/jnode_checks.xml" type="project" description=""> + <additional-data name="protect-config-file" value="true"/> + </local-check-config> + <fileset name="tous" enabled="true" check-config-name="JNode checkstyle" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> + <filter name="NonSrcDirs" enabled="true"/> +</fileset-config> Modified: branches/jikesRVM/net/.classpath =================================================================== --- branches/jikesRVM/net/.classpath 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/.classpath 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/net"/> - <classpathentry kind="src" path="src/driver"/> - <classpathentry kind="src" path="src/test"/> - <classpathentry kind="src" path="/JNode-Core"/> - <classpathentry kind="lib" path="/JNode-Core/lib/log4j-1.2.8.jar"/> - <classpathentry kind="src" path="/JNode-Shell"/> - <classpathentry kind="lib" path="/JNode-Core/lib/gnu-crypto.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/javax-crypto.jar"/> - <classpathentry kind="lib" path="lib/dnsjava-2.0.1a.jar"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/net"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/driver"/> + <classpathentry excluding="**/.svn/**" kind="src" path="src/test"/> + <classpathentry kind="src" path="/core"/> + <classpathentry exported="true" kind="lib" path="lib/oncrpc.jar"/> + <classpathentry kind="src" path="/shell"/> <classpathentry kind="lib" path="lib/jsch-0.1.24.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/commons-net-1.1.0.jar"/> - <classpathentry kind="lib" path="/JNode-Core/lib/junit.jar"/> + <classpathentry kind="lib" path="lib/dnsjava-1.6.6.jar" sourcepath="lib/dnsjava-1.6.6-src.zip"/> + <classpathentry kind="lib" path="/core/lib/commons-net-1.1.0.jar"/> + <classpathentry kind="lib" path="/core/lib/log4j-1.2.8.jar"/> + <classpathentry kind="lib" path="/core/lib/junit-4.5.jar"/> + <classpathentry kind="lib" path="/all/lib/classlib.jar" sourcepath="/all/lib/classlib-src.jar"/> <classpathentry kind="output" path="build/classes"/> </classpath> Modified: branches/jikesRVM/net/.project =================================================================== --- branches/jikesRVM/net/.project 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/.project 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>JNode-Net</name> + <name>net</name> <comment></comment> <projects> + <project>all</project> <project>JNode-Core</project> <project>JNode-Shell</project> </projects> @@ -12,8 +13,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: branches/jikesRVM/net/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/jikesRVM/net/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/.settings/org.eclipse.jdt.core.prefs 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,12 +1,12 @@ -#Tue Apr 12 20:12:58 CEST 2005 +#Mon Jul 14 11:33:46 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: branches/jikesRVM/net/build.xml =================================================================== --- branches/jikesRVM/net/build.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/build.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,4 +1,4 @@ -<project name="JNode-Builder" default="all" basedir="."> +<project name="JNode-Net" default="all" basedir="."> <typedef file="${basedir}/../all/lib/jnode.xml"/> @@ -14,6 +14,7 @@ <pathelement location="${commons-net.jar}"/> <pathelement location="${dnsjava.jar}"/> <pathelement location="${jsch.jar}"/> + <pathelement location="${oncrpc.jar}"/> <path refid="cp"/> </path> Modified: branches/jikesRVM/net/descriptors/com.jcraft.jsch.xml =================================================================== --- branches/jikesRVM/net/descriptors/com.jcraft.jsch.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/com.jcraft.jsch.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -10,7 +10,7 @@ license-url="http://www.jcraft.com/jsch/LICENSE.txt"> <requires> - <import plugin="crypto-security"/> + <import plugin="org.classpath.ext.security"/> </requires> Copied: branches/jikesRVM/net/descriptors/org.acplt.oncrpc.xml (from rev 5663, trunk/net/descriptors/org.acplt.oncrpc.xml) =================================================================== --- branches/jikesRVM/net/descriptors/org.acplt.oncrpc.xml (rev 0) +++ branches/jikesRVM/net/descriptors/org.acplt.oncrpc.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.acplt.oncrpc" + name="OncRpc" + version="1.0.6" + provider-name="Remote tea" + provider-url="http://remotetea.sourceforge.net/" + license-name="LGPL" + license-url="http://remotetea.sourceforge.net/"> + + + <runtime> + <library name="oncrpc.jar"> + <export name="org.acplt.oncrpc.*"/> + </library> + </runtime> + + <extension point="org.jnode.security.permissions"> + <permission class="java.net.SocketPermission" name="*" actions="connect,resolve"/> + </extension> + +</plugin> \ No newline at end of file Modified: branches/jikesRVM/net/descriptors/org.jnode.driver.net.3c90x.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.driver.net.3c90x.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.jnode.driver.net.3c90x.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -20,6 +20,7 @@ </runtime> <extension point="org.jnode.driver.mappers"> + <mapper id="10b7:9055" name="3C905B 100BaseTX [Cyclone] (rev 30)" driver-class="org.jnode.driver.net._3c90x._3c90xDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> <mapper id="10b7:9200" name="3C905C_TXM" driver-class="org.jnode.driver.net._3c90x._3c90xDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> </extension> @@ -28,4 +29,4 @@ <permission class="org.jnode.system.ResourcePermission" name="irq"/> </extension> -</plugin> \ No newline at end of file +</plugin> Copied: branches/jikesRVM/net/descriptors/org.jnode.driver.net.via_rhine.xml (from rev 5663, trunk/net/descriptors/org.jnode.driver.net.via_rhine.xml) =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.driver.net.via_rhine.xml (rev 0) +++ branches/jikesRVM/net/descriptors/org.jnode.driver.net.via_rhine.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.driver.net.via_rhine" + name="JNode VIA Rhine driver" + version="@VERSION@" + license-name="lgpl" + provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.driver.bus.pci"/> + <import plugin="org.jnode.driver.net.ethernet"/> + <import plugin="org.jnode.net"/> + </requires> + + <runtime> + <library name="jnode-net.jar"> + <export name="org.jnode.driver.net.via_rhine.*"/> + </library> + </runtime> + + <extension point="org.jnode.driver.mappers"> + <mapper id="1106:3065" name="VT6102" driver-class="org.jnode.driver.net.via_rhine.ViaRhineDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="org.jnode.system.ResourcePermission" name="ioports"/> + <permission class="org.jnode.system.ResourcePermission" name="irq"/> + </extension> + +</plugin> \ No newline at end of file Deleted: branches/jikesRVM/net/descriptors/org.jnode.net.command.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.net.command.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.jnode.net.command.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plugin SYSTEM "jnode.dtd"> - -<plugin id="org.jnode.net.command" - name="JNode Network Shell Commands" - version="@VERSION@" - license-name="lgpl" - provider-name="JNode.org"> - - <requires> - <import plugin="org.jnode.net"/> - <import plugin="org.jnode.net.arp"/> - <import plugin="org.jnode.net.ipv4"/> - <import plugin="org.jnode.net.ipv4.config"/> - <import plugin="org.jnode.shell.help"/> - </requires> - - <runtime> - <library name="jnode-net.jar"> - <export name="org.jnode.net.command.*"/> - </library> - </runtime> - - <extension point="org.jnode.shell.aliases"> - <alias name="arp" class="org.jnode.net.command.ArpCommand"/> - <alias name="bootp" class="org.jnode.net.command.BootpCommand"/> - <alias name="dhcp" class="org.jnode.net.command.DhcpCommand"/> - <alias name="ifconfig" class="org.jnode.net.command.IfconfigCommand"/> - <alias name="netstat" class="org.jnode.net.command.NetstatCommand"/> - <alias name="ping" class="org.jnode.net.command.PingCommand"/> - <alias name="route" class="org.jnode.net.command.RouteCommand"/> - <alias name="resolver" class="org.jnode.net.command.ResolverCommand"/> - <alias name="tftp" class="org.jnode.net.command.TftpCommand"/> - <alias name="wlanctl" class="org.jnode.net.command.WLanCtlCommand"/> - <alias name="net" class="org.jnode.net.command.NetCommand"/> - </extension> - - <extension point="org.jnode.security.permissions"> - <permission class="java.net.SocketPermission" name="*" actions="connect,resolve"/> - <permission class="java.net.SocketPermission" name="*:1024-" actions="listen,accept"/> - <permission class="java.net.SocketPermission" name="*:53" actions="resolve,listen,connect"/> - <permission class="java.net.SocketPermission" name="*:80" actions="resolve,listen,connect"/> - <permission class="java.util.PropertyPermission" name="dns.server" actions="read"/> - <permission class="java.util.PropertyPermission" name="dns.search" actions="read"/> - <permission class="org.jnode.net.NetPermission" name="bootpClient"/> - <permission class="org.jnode.net.NetPermission" name="dhcpClient"/> - <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> - </extension> -</plugin> Modified: branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.config.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.config.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.config.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -10,6 +10,13 @@ <requires> <import plugin="org.jnode.net.ipv4"/> + <!-- + Hack to handle the prefrences problem: + the org.jnode.fs.ramfs.def plugin sets up a partition + used by system prefrences and org.jnode.net.ipv4.config + uses the system prefrences so that needs to be setup beforhand + --> + <import plugin="org.jnode.fs.ramfs.def"/> </requires> <runtime> Modified: branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.jnode.net.ipv4.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -32,6 +32,8 @@ <extension point="org.jnode.security.permissions"> <permission class="java.lang.RuntimePermission" name="setFactory"/> + + <permission class="java.io.FilePermission" name="/etc/resolv.conf" actions="read"/> <!-- Bootp --> <permission class="java.net.SocketPermission" name="*:67" actions="connect,resolve"/> <permission class="java.net.SocketPermission" name="localhost:68" actions="listen"/> @@ -46,6 +48,12 @@ <permission class="java.net.SocketPermission" name="*:53" actions="connect,resolve,listen"/> <permission class="java.util.PropertyPermission" name="dns.server" actions="read,write"/> <permission class="java.util.PropertyPermission" name="dns.search" actions="read,write"/> + + <!-- TFTP !?! --> + <permission class="java.io.FilePermission" name="<<ALL FILES>>" actions="read,write"/> + <permission class="java.util.PropertyPermission" name="user.dir" actions="read"/> + <permission class="java.net.SocketPermission" name="*:69" actions="connect,resolve"/> + </extension> <extension point="org.jnode.net.networkLayers"> Copied: branches/jikesRVM/net/descriptors/org.jnode.net.nfs.xml (from rev 5663, trunk/net/descriptors/org.jnode.net.nfs.xml) =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.net.nfs.xml (rev 0) +++ branches/jikesRVM/net/descriptors/org.jnode.net.nfs.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.net.nfs" name="NFS" version="@VERSION@" + license-name="lgpl" provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.net" /> + <import plugin="org.acplt.oncrpc" /> + </requires> + + <runtime> + <library name="jnode-net.jar"> + <export name="org.jnode.net.nfs.*" /> + <export name="org.jnode.net.nfs.nfs2.*" /> + <export name="org.jnode.net.nfs.nfs2.mount.*" /> + </library> + </runtime> + + + <extension point="org.jnode.security.permissions"> + <permission class="java.net.SocketPermission" name="*" + actions="connect,resolve" /> + </extension> + +</plugin> Copied: branches/jikesRVM/net/descriptors/org.jnode.protocol.nfs.xml (from rev 5663, trunk/net/descriptors/org.jnode.protocol.nfs.xml) =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.protocol.nfs.xml (rev 0) +++ branches/jikesRVM/net/descriptors/org.jnode.protocol.nfs.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plugin SYSTEM "jnode.dtd"> + +<plugin id="org.jnode.protocol.nfs" name="JNode NFS protocol handler" + version="@VERSION@" license-name="lgpl" provider-name="JNode.org"> + + <requires> + <import plugin="org.jnode.net.ipv4" /> + <import plugin="org.jnode.net.nfs" /> + <import plugin="org.jnode.protocol" /> + </requires> + + <runtime> + <library name="jnode-net.jar"> + <export name="org.jnode.protocol.nfs.*" /> + <export name="org.jnode.protocol.nfs.nfs2.*" /> + </library> + </runtime> + + <extension point="org.jnode.protocol.handlers"> + <handler protocol="nfs" class="org.jnode.protocol.nfs.Handler" /> + </extension> + + <extension point="org.jnode.security.permissions"> + <permission class="java.net.SocketPermission" name="*" + actions="connect,resolve" /> + </extension> + +</plugin> Modified: branches/jikesRVM/net/descriptors/org.jnode.test.net.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.jnode.test.net.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.jnode.test.net.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -8,7 +8,6 @@ provider-name="JNode.org"> <requires> - <import plugin="crypto-security"/> <import plugin="com.jcraft.jsch"/> </requires> Modified: branches/jikesRVM/net/descriptors/org.xbill.dns.xml =================================================================== --- branches/jikesRVM/net/descriptors/org.xbill.dns.xml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/descriptors/org.xbill.dns.xml 2009-09-09 15:35:38 UTC (rev 5668) @@ -3,7 +3,7 @@ <plugin id="org.xbill.dns" name="DNSJava" - version="1.5.0" + version="1.6.6" provider-name="XBill.org" provider-url="http://www.dnsjava.org" license-name="BSD like" @@ -11,17 +11,28 @@ <runtime> - <library name="dnsjava-1.5.0.jar"> + <library name="dnsjava-1.6.6.jar"> <export name="*"/> </library> </runtime> + <extension point="org.jnode.shell.aliases"> + <alias name="dig" class="dig"/> + <!-- todo: add jnamed.conf + <alias name="jnamed" class="jnamed"/> + --> + <alias name="lookup" class="lookup"/> + <!-- todo: console hangs on exit from update + <alias name="update" class="update"/> + --> + </extension> + <extension point="org.jnode.security.permissions"> + <permission class="java.io.FilePermission" name="/etc/resolv.conf" actions="read"/> <permission class="java.lang.RuntimePermission" name="selectorProvider"/> <permission class="java.util.PropertyPermission" name="dns.server" actions="read"/> <permission class="java.util.PropertyPermission" name="dns.search" actions="read"/> <permission class="java.net.SocketPermission" name="*" actions="resolve"/> <permission class="java.net.SocketPermission" name="*:53" actions="resolve,accept,connect,listen"/> </extension> - </plugin> \ No newline at end of file Deleted: branches/jikesRVM/net/lib/dnsjava-1.5.0.jar =================================================================== (Binary files differ) Copied: branches/jikesRVM/net/lib/dnsjava-1.6.6-src.zip (from rev 5663, trunk/net/lib/dnsjava-1.6.6-src.zip) =================================================================== (Binary files differ) Copied: branches/jikesRVM/net/lib/dnsjava-1.6.6.jar (from rev 5663, trunk/net/lib/dnsjava-1.6.6.jar) =================================================================== (Binary files differ) Deleted: branches/jikesRVM/net/lib/dnsjava-2.0.1a.jar =================================================================== (Binary files differ) Copied: branches/jikesRVM/net/lib/oncrpc.jar (from rev 5663, trunk/net/lib/oncrpc.jar) =================================================================== (Binary files differ) Modified: branches/jikesRVM/net/net.iml =================================================================== --- branches/jikesRVM/net/net.iml 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/net.iml 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> - <output url="file://$MODULE_DIR$/classes" /> +<module relativePaths="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <exclude-exploded /> <content url="file://$MODULE_DIR$"> @@ -14,34 +13,26 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="core" level="project" /> <orderEntry type="module" module-name="core" /> + <orderEntry type="module" module-name="shell" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/dnsjava-1.5.0.jar!/" /> + <root url="file://$MODULE_DIR$/lib" /> </CLASSES> <JAVADOC /> <SOURCES /> + <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" /> </library> </orderEntry> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jsch-0.1.24.jar!/" /> + <root url="jar://$MODULE_DIR$/../core/lib/commons-net-1.1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/commons-net-1.1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntryProperties /> </component> </module> Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceAPI.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceAPI.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceAPI.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -28,71 +27,74 @@ /** * Generic API for network devices. - * + * <p/> * <h3>Transmission</h3> - * To transmit data, each network device should has a queue of Frame's. + * To transmit data, each network device should has a queue of Frame's. * The transmit method is called to add a frame to this queue. The device * should start a worker thread to process this queue. * Once a frame has been transmitted, the notifyTransmission method of that * frame must be called. - * + * <p/> * <h3>Reception</h3> * On reception of a frame, a network device must call the receive * method of the NetworkLayerManager. - * + * + * @author epr * @see org.jnode.net.NetworkLayerManager - * - * @author epr */ public interface NetDeviceAPI extends DeviceAPI { - /** - * Gets the hardware address of this device - */ - public HardwareAddress getAddress(); + /** + * Gets the hardware address of this device + */ + public HardwareAddress getAddress(); - /** - * Gets the maximum transfer unit, the number of bytes this device can - * transmit at a time. - */ - public int getMTU(); + /** + * Gets the maximum transfer unit, the number of bytes this device can + * transmit at a time. + */ + public int getMTU(); - /** - * Add the given frame to the transmit queue of this device. - * A client to this interface should use methods in Frame to checks for - * errors and wait for the actual transmission. - * After the frame has actually been transmitted by the device, the - * Frame.notifyTransmission method must be called. - * - * @param packet The network packet to transmit. No linklayer header has - * been added yet. - * @param destination The destination address, or null for a broadcast. - * @throws NetworkException - */ - public void transmit(SocketBuffer packet, HardwareAddress destination) - throws NetworkException; + /** + * Add the given frame to the transmit queue of this device. + * A client to this interface should use methods in Frame to checks for + * errors and wait for the actual transmission. + * After the frame has actually been transmitted by the device, the + * Frame.notifyTransmission method must be called. + * + * @param packet The network packet to transmit. No linklayer header has + * been added yet. + * @param destination The destination address, or null for a broadcast. + * @throws NetworkException + */ + public void transmit(SocketBuffer packet, HardwareAddress destination) + throws NetworkException; - /** - * Gets the protocol address information for a given protocol. - * @param protocolID - * @return The protocol address information, or null if not found. - */ - public ProtocolAddressInfo getProtocolAddressInfo(int protocolID); + /** + * Gets the protocol address information for a given protocol. + * + * @param protocolID + * @return The protocol address information, or null if not found. + */ + public ProtocolAddressInfo getProtocolAddressInfo(int protocolID); - /** - * Sets the protocol address information for a given protocol. - * @param protocolID - */ - public void setProtocolAddressInfo(int protocolID, ProtocolAddressInfo addressInfo); - /** - * Add a net device listener to this device. + * Sets the protocol address information for a given protocol. + * + * @param protocolID + */ + public void setProtocolAddressInfo(int protocolID, ProtocolAddressInfo addressInfo); + + /** + * Add a net device listener to this device. + * * @param listener */ public void addEventListener(NetDeviceListener listener); - + /** - * Add a net device listener to this device. + * Add a net device listener to this device. + * * @param listener */ public void removeEventListener(NetDeviceListener listener); Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceEvent.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -27,14 +26,18 @@ /** * Base class for all net device events. - * + * * @author Ewout Prangsma (ep...@us...) */ public abstract class NetDeviceEvent extends EventObject { - /** Identification of the event */ + private static final long serialVersionUID = 1L; + + /** + * Identification of the event + */ private final int id; - + /** * @param source */ @@ -45,14 +48,16 @@ /** * Gets the device that it the source of this event. - * @return + * + * @return the Device */ public final Device getDevice() { - return (Device)getSource(); + return (Device) getSource(); } - + /** * Gets the event ID. + * * @return Returns the id. */ public final int getId() { Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceListener.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceListener.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetDeviceListener.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -30,6 +29,7 @@ /** * A net device has fired the given event. + * * @param event */ public void processEvent(NetDeviceEvent event); Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetworkException.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetworkException.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/NetworkException.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -28,34 +27,36 @@ */ public class NetworkException extends SocketException { - /** - * - */ - public NetworkException() { - super(); - } + private static final long serialVersionUID = 1L; - /** - * @param message - * @param cause - */ - public NetworkException(String message, Throwable cause) { - super(message); - initCause(cause); - } + /** + * + */ + public NetworkException() { + super(); + } - /** - * @param cause - */ - public NetworkException(Throwable cause) { - super(); - initCause(cause); - } + /** + * @param message + * @param cause + */ + public NetworkException(String message, Throwable cause) { + super(message); + initCause(cause); + } - /** - * @param s - */ - public NetworkException(String s) { - super(s); - } + /** + * @param cause + */ + public NetworkException(Throwable cause) { + super(); + initCause(cause); + } + + /** + * @param s + */ + public NetworkException(String s) { + super(s); + } } Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/WirelessNetDeviceAPI.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/WirelessNetDeviceAPI.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/WirelessNetDeviceAPI.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -25,35 +24,39 @@ /** * Device API for wireless network devices. - * + * * @author Ewout Prangsma (ep...@us...) */ public interface WirelessNetDeviceAPI extends NetDeviceAPI { /** * Gets the current authentication mode. - * @return + * + * @return the authentication mode */ public AuthenticationMode getAuthenticationMode(); - + /** * Sets the current authentication mode. + * * @param mode */ public void setAuthenticationMode(AuthenticationMode mode) - throws NetworkException; - + throws NetworkException; + /** * Gets the current ESS ID. + * * @return A valid ESSID, or null if not ESSID is present. */ public String getESSID(); /** * Sets the current ESS ID. + * * @param essid A valid ESSID, or null for any ESS. */ public void setESSID(String essid) - throws NetworkException; - + throws NetworkException; + } Modified: branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xConstants.java =================================================================== --- branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xConstants.java 2009-09-09 15:23:20 UTC (rev 5667) +++ branches/jikesRVM/net/src/driver/org/jnode/driver/net/_3c90x/_3c90xConstants.java 2009-09-09 15:35:38 UTC (rev 5668) @@ -1,8 +1,7 @@ /* * $Id$ * - * JNode.org - * Copyright (C) 2003-2006 JNode.org + * Copyright (C) 2003-2009 JNode.org * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -26,95 +25,291 @@ */ public interface _3c90xConstants { - /* Register definitions for the 3c905 ***/ - public static final int regPowerMgmtCtrl_w = 0x7c; /** 905B Revision Only **/ - public static final int regUpMaxBurst_w = 0x7a; /** 905B Revision Only **/ - public static final int regDnMaxBurst_w = 0x78; /** 905B Revision Only **/ - public static final int regDebugControl_w = 0x74; /** 905B Revision Only **/ - public static final int regDebugData_l = 0x70; /** 905B Revision Only **/ - public static final int regRealTimeCnt_l = 0x40; /** Universal **/ - public static final int regUpBurstThresh_b = 0x3e; /** 905B Revision Only **/ - public static final int regUpPoll_b = 0x3d; /** 905B Revision Only **/ - public static final int regUpPriorityThresh_b = 0x3c; /** 905B Revision Only **/ - public static final int regUpListPtr_l = 0x38; /** Universal **/ - public static final int regCountdown_w = 0x36; /** Universal **/ - public static final int regFreeTimer_w = 0x34; /** Universal **/ - public static final int regUpPktStatus_l = 0x30; /** Universal with Exception; pg 130 **/ - public static final int regTxFreeThresh_b = 0x2f; /** 90X Revision Only **/ - public static final int regDnPoll_b = 0x2d; /** 905B Revision Only **/ - public static final int regDnPriorityThresh_b = 0x2c; /** 905B Revision Only **/ - public static final int regDnBurstThresh_b = 0x2a; /** 905B Revision Only **/ - public static final int regDnListPtr_l = 0... [truncated message content] |