Author: tellison Date: Tue Mar 7 03:39:10 2006 New Revision: 383849 URL: http://svn.apache.org/viewcvs?rev=383849&view=rev Log: Part Two of HARMONY-92 (Suggestion: Move com.ibm.platform from NIO to LUNI) Added: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AdapterManager.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/AdapterManager.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Endianness.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/FileDescriptorHandler.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/FileDescriptorHandler.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdaptable.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdaptable.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterFactory.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterFactory.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterManager.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterManager.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IFileSystem.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IMemorySystem.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/INetworkSystem.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ISystemComponent.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/ISystemComponent.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponent.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponent.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponentFactory.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponentFactory.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSFileSystem.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSMemory.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSNetworkSystem.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Platform.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/AbstractMemorySpy.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/AbstractMemorySpy.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/DebugMemorySpy.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/DebugMemorySpy.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/ICommonDataTypes.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/ICommonDataTypes.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IMemorySpy.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IMemorySpy.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IPlatformConstants.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IPlatformConstants.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/PlatformAddress.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/PlatformAddress.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/RuntimeMemorySpy.java - copied, changed from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/RuntimeMemorySpy.java Removed: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/AdapterManager.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Endianness.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/FileDescriptorHandler.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdaptable.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterFactory.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterManager.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IFileSystem.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IMemorySystem.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/INetworkSystem.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/ISystemComponent.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponent.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponentFactory.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSFileSystem.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSMemory.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSNetworkSystem.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Platform.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/AbstractMemorySpy.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/DebugMemorySpy.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/ICommonDataTypes.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IMemorySpy.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IPlatformConstants.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/PlatformAddress.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/RuntimeMemorySpy.java incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/helpers.c incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/helpers.h incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/nethelp.c incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/nethelp.h incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/socket.c incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/helpers.c incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/helpers.h incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/nethelp.c incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/nethelp.h incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/socket.c Modified: incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio.txt incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileInputStream.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileOutputStream.java incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/RandomAccessFile.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectBuffer.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FileChannelImpl.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/MappedByteBufferFactory.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyFileChannel.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteFileChannel.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteBuffer.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteOrder.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffer.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffers.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/HeapByteBuffer.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBuffer.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBufferAdapter.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/IFileSystem.h incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSFileSystemLinux32.c incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.c incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.h incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemoryLinux32.c incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystem.c incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/IMemorySystem.h incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSFileSystem.c incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSFileSystem.h incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/OSNetworkSystem.h incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/IFileSystem.h incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSFileSystemWin32.c incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSMemory.c incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSMemory.h incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSMemoryWin32.c incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSNetworkSystem.c incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/OSNetworkSystemWin32.c incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def Modified: incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio.txt URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio.txt?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio.txt (original) +++ incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio.txt Tue Mar 7 03:39:10 2006 @@ -17,5 +17,5 @@ java/nio/channels/spi/* com/ibm/io/nio/* -com/ibm/platform/* -com/ibm/platform/struct/* \ No newline at end of file +org/apache/harmony/luni/platform/* +org/apache/harmony/luni/platform/struct/* Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java Tue Mar 7 03:39:10 2006 @@ -21,7 +21,7 @@ import com.ibm.io.nio.ReadOnlyFileChannel; import com.ibm.io.nio.ReadWriteFileChannel; import com.ibm.io.nio.WriteOnlyFileChannel; -import com.ibm.platform.IFileSystem; +import org.apache.harmony.luni.platform.IFileSystem; /** * A simple factory to provide a generic way to create FileChannel Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileInputStream.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileInputStream.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileInputStream.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileInputStream.java Tue Mar 7 03:39:10 2006 @@ -18,8 +18,8 @@ import java.nio.channels.FileChannel; -import com.ibm.platform.IFileSystem; -import com.ibm.platform.Platform; +import org.apache.harmony.luni.platform.IFileSystem; +import org.apache.harmony.luni.platform.Platform; /** * FileInputStream is a class for reading bytes from a file. This class may also Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileOutputStream.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileOutputStream.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileOutputStream.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileOutputStream.java Tue Mar 7 03:39:10 2006 @@ -18,8 +18,8 @@ import java.nio.channels.FileChannel; -import com.ibm.platform.IFileSystem; -import com.ibm.platform.Platform; +import org.apache.harmony.luni.platform.IFileSystem; +import org.apache.harmony.luni.platform.Platform; /** * FileOutputStream is a class whose underlying stream is represented by a file Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/RandomAccessFile.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/RandomAccessFile.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/RandomAccessFile.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/RandomAccessFile.java Tue Mar 7 03:39:10 2006 @@ -18,8 +18,8 @@ import java.nio.channels.FileChannel; -import com.ibm.platform.IFileSystem; -import com.ibm.platform.Platform; +import org.apache.harmony.luni.platform.IFileSystem; +import org.apache.harmony.luni.platform.Platform; /** * RandomAccessFile is a class which allows positioning of the next read Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AdapterManager.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/AdapterManager.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AdapterManager.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AdapterManager.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/AdapterManager.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/AdapterManager.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/AdapterManager.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; import java.util.ArrayList; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Endianness.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Endianness.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Endianness.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Endianness.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/FileDescriptorHandler.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/FileDescriptorHandler.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/FileDescriptorHandler.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/FileDescriptorHandler.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/FileDescriptorHandler.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/FileDescriptorHandler.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/FileDescriptorHandler.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; import java.io.FileDescriptor; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdaptable.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdaptable.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdaptable.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdaptable.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdaptable.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdaptable.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdaptable.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterFactory.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterFactory.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterFactory.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterFactory.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterFactory.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterFactory.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterFactory.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterManager.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterManager.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterManager.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterManager.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterManager.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IAdapterManager.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IAdapterManager.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IFileSystem.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IFileSystem.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IFileSystem.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IFileSystem.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; import java.io.FileDescriptor; import java.io.FileNotFoundException; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IMemorySystem.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IMemorySystem.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/IMemorySystem.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/IMemorySystem.java Tue Mar 7 03:39:10 2006 @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; import java.io.IOException; -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.struct.PlatformAddress; /** * IMemorySystem Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/INetworkSystem.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/INetworkSystem.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/INetworkSystem.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; import java.io.FileDescriptor; import java.io.IOException; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ISystemComponent.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/ISystemComponent.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ISystemComponent.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ISystemComponent.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/ISystemComponent.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/ISystemComponent.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/ISystemComponent.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponent.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponent.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponent.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponent.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponent.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponent.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponent.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; import com.ibm.oti.vm.VM; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponentFactory.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponentFactory.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponentFactory.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponentFactory.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponentFactory.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSComponentFactory.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponentFactory.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSFileSystem.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSFileSystem.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSFileSystem.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSFileSystem.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; import java.io.FileDescriptor; import java.io.FileNotFoundException; @@ -190,7 +190,7 @@ /* * (non-Javadoc) * - * @see com.ibm.platform.IFileSystem#close(long) + * @see org.apache.harmony.luni.platform.IFileSystem#close(long) */ public void close(long fileDescriptor) throws IOException { int rc = closeImpl(fileDescriptor); Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSMemory.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSMemory.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSMemory.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSMemory.java Tue Mar 7 03:39:10 2006 @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; import java.io.IOException; import org.apache.harmony.luni.util.NotYetImplementedException; -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.struct.PlatformAddress; // import com.ibm.oti.vm.VM; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSNetworkSystem.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSNetworkSystem.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/OSNetworkSystem.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; import java.io.FileDescriptor; import java.io.IOException; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Platform.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Platform.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/Platform.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform; +package org.apache.harmony.luni.platform; import com.ibm.oti.vm.VM; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/AbstractMemorySpy.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/AbstractMemorySpy.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/AbstractMemorySpy.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/AbstractMemorySpy.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/AbstractMemorySpy.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/AbstractMemorySpy.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/AbstractMemorySpy.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform.struct; +package org.apache.harmony.luni.platform.struct; import java.lang.ref.ReferenceQueue; @@ -87,7 +87,7 @@ /* * (non-Javadoc) * - * @see com.ibm.platform.struct.IMemorySpy#autoFree(com.ibm.platform.struct.PlatformAddress) + * @see org.apache.harmony.luni.platform.struct.IMemorySpy#autoFree(org.apache.harmony.luni.platform.struct.PlatformAddress) */ public void autoFree(PlatformAddress address) { AddressWrapper wrapper; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/DebugMemorySpy.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/DebugMemorySpy.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/DebugMemorySpy.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/DebugMemorySpy.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/DebugMemorySpy.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/DebugMemorySpy.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/DebugMemorySpy.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform.struct; +package org.apache.harmony.luni.platform.struct; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/ICommonDataTypes.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/ICommonDataTypes.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/ICommonDataTypes.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/ICommonDataTypes.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/ICommonDataTypes.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/ICommonDataTypes.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/ICommonDataTypes.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform.struct; +package org.apache.harmony.luni.platform.struct; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IMemorySpy.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IMemorySpy.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IMemorySpy.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IMemorySpy.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IMemorySpy.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IMemorySpy.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IMemorySpy.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform.struct; +package org.apache.harmony.luni.platform.struct; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IPlatformConstants.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IPlatformConstants.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IPlatformConstants.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IPlatformConstants.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IPlatformConstants.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/IPlatformConstants.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/IPlatformConstants.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform.struct; +package org.apache.harmony.luni.platform.struct; public interface IPlatformConstants { Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/PlatformAddress.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/PlatformAddress.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/PlatformAddress.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/PlatformAddress.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/PlatformAddress.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/PlatformAddress.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/PlatformAddress.java Tue Mar 7 03:39:10 2006 @@ -13,11 +13,11 @@ * limitations under the License. */ -package com.ibm.platform.struct; +package org.apache.harmony.luni.platform.struct; -import com.ibm.platform.Endianness; -import com.ibm.platform.IMemorySystem; -import com.ibm.platform.Platform; +import org.apache.harmony.luni.platform.Endianness; +import org.apache.harmony.luni.platform.IMemorySystem; +import org.apache.harmony.luni.platform.Platform; /** * The platform address class is an unsafe virtualization of an OS memory block. Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/RuntimeMemorySpy.java (from r383845, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/RuntimeMemorySpy.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/RuntimeMemorySpy.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/RuntimeMemorySpy.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/RuntimeMemorySpy.java&r1=383845&r2=383849&rev=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/platform/struct/RuntimeMemorySpy.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/struct/RuntimeMemorySpy.java Tue Mar 7 03:39:10 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.platform.struct; +package org.apache.harmony.luni.platform.struct; import java.lang.ref.Reference; Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectBuffer.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectBuffer.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectBuffer.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/DirectBuffer.java Tue Mar 7 03:39:10 2006 @@ -14,7 +14,7 @@ */ package com.ibm.io.nio; -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.struct.PlatformAddress; public interface DirectBuffer { public PlatformAddress getEffectiveAddress(); Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FileChannelImpl.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FileChannelImpl.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FileChannelImpl.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/FileChannelImpl.java Tue Mar 7 03:39:10 2006 @@ -26,10 +26,10 @@ import java.nio.channels.FileLock; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; -import com.ibm.platform.IFileSystem; -import com.ibm.platform.IMemorySystem; -import com.ibm.platform.Platform; -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.IFileSystem; +import org.apache.harmony.luni.platform.IMemorySystem; +import org.apache.harmony.luni.platform.Platform; +import org.apache.harmony.luni.platform.struct.PlatformAddress; /* * The file channel impl class is the bridge between the logical channels Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/MappedByteBufferFactory.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/MappedByteBufferFactory.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/MappedByteBufferFactory.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/MappedByteBufferFactory.java Tue Mar 7 03:39:10 2006 @@ -20,7 +20,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.struct.PlatformAddress; class MappedByteBufferFactory { Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyFileChannel.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyFileChannel.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyFileChannel.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadOnlyFileChannel.java Tue Mar 7 03:39:10 2006 @@ -22,7 +22,7 @@ import java.nio.channels.NonWritableChannelException; import java.nio.channels.ReadableByteChannel; -import com.ibm.platform.IMemorySystem; +import org.apache.harmony.luni.platform.IMemorySystem; public final class ReadOnlyFileChannel extends FileChannelImpl { public ReadOnlyFileChannel(Object stream, long handle) { Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteFileChannel.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteFileChannel.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteFileChannel.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/ReadWriteFileChannel.java Tue Mar 7 03:39:10 2006 @@ -17,7 +17,7 @@ import java.io.IOException; import java.nio.MappedByteBuffer; -import com.ibm.platform.IMemorySystem; +import org.apache.harmony.luni.platform.IMemorySystem; public final class ReadWriteFileChannel extends FileChannelImpl { public ReadWriteFileChannel(Object stream, long handle) { Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteBuffer.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteBuffer.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteBuffer.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteBuffer.java Tue Mar 7 03:39:10 2006 @@ -16,7 +16,7 @@ package java.nio; -import com.ibm.platform.Endianness; +import org.apache.harmony.luni.platform.Endianness; /** * A buffer of bytes. Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteOrder.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteOrder.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteOrder.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ByteOrder.java Tue Mar 7 03:39:10 2006 @@ -16,7 +16,7 @@ package java.nio; -import com.ibm.platform.Platform; +import org.apache.harmony.luni.platform.Platform; /** * Holds byte order constants. Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffer.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffer.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffer.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffer.java Tue Mar 7 03:39:10 2006 @@ -18,7 +18,7 @@ import com.ibm.io.nio.DirectBuffer; -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.struct.PlatformAddress; /** * DirectByteBuffer, ReadWriteDirectByteBuffer and ReadOnlyDirectByteBuffer Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffers.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffers.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffers.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/DirectByteBuffers.java Tue Mar 7 03:39:10 2006 @@ -17,7 +17,7 @@ -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.struct.PlatformAddress; /** * Helper class for operations on direct ByteBuffer Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/HeapByteBuffer.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/HeapByteBuffer.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/HeapByteBuffer.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/HeapByteBuffer.java Tue Mar 7 03:39:10 2006 @@ -17,7 +17,7 @@ -import com.ibm.platform.Endianness; +import org.apache.harmony.luni.platform.Endianness; /** * HeapByteBuffer, ReadWriteHeapByteBuffer and ReadOnlyHeapByteBuffer compose Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBuffer.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBuffer.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBuffer.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBuffer.java Tue Mar 7 03:39:10 2006 @@ -16,8 +16,8 @@ package java.nio; import com.ibm.io.nio.DirectBuffer; -import com.ibm.platform.IMemorySystem; -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.IMemorySystem; +import org.apache.harmony.luni.platform.struct.PlatformAddress; /** * MappedByteBuffer is a special kind of direct byte buffer, Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBufferAdapter.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBufferAdapter.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBufferAdapter.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/MappedByteBufferAdapter.java Tue Mar 7 03:39:10 2006 @@ -16,7 +16,7 @@ package java.nio; import com.ibm.io.nio.DirectBuffer; -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.struct.PlatformAddress; class MappedByteBufferAdapter extends MappedByteBuffer implements DirectBuffer { Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java Tue Mar 7 03:39:10 2006 @@ -15,7 +15,7 @@ package java.nio; -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.struct.PlatformAddress; /** * DirectByteBuffer, ReadWriteDirectByteBuffer and ReadOnlyDirectByteBuffer Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java Tue Mar 7 03:39:10 2006 @@ -17,7 +17,7 @@ -import com.ibm.platform.struct.PlatformAddress; +import org.apache.harmony.luni.platform.struct.PlatformAddress; /** * DirectByteBuffer, ReadWriteDirectByteBuffer and ReadOnlyDirectByteBuffer Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/IFileSystem.h URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/IFileSystem.h?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/IFileSystem.h (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/IFileSystem.h Tue Mar 7 03:39:10 2006 @@ -14,42 +14,42 @@ */ #include -/* Header for class com_ibm_platform_IFileSystem */ +/* Header for class org_apache_harmony_luni_platform_IFileSystem */ -#ifndef _Included_com_ibm_platform_IFileSystem -#define _Included_com_ibm_platform_IFileSystem +#ifndef _Included_org_apache_harmony_luni_platform_IFileSystem +#define _Included_org_apache_harmony_luni_platform_IFileSystem #ifdef __cplusplus extern "C" { #endif -#undef com_ibm_platform_IFileSystem_SHARED_LOCK_TYPE -#define com_ibm_platform_IFileSystem_SHARED_LOCK_TYPE 1L -#undef com_ibm_platform_IFileSystem_EXCLUSIVE_LOCK_TYPE -#define com_ibm_platform_IFileSystem_EXCLUSIVE_LOCK_TYPE 2L -#undef com_ibm_platform_IFileSystem_SEEK_SET -#define com_ibm_platform_IFileSystem_SEEK_SET 1L -#undef com_ibm_platform_IFileSystem_SEEK_CUR -#define com_ibm_platform_IFileSystem_SEEK_CUR 2L -#undef com_ibm_platform_IFileSystem_SEEK_END -#define com_ibm_platform_IFileSystem_SEEK_END 4L -#undef com_ibm_platform_IFileSystem_O_RDONLY -#define com_ibm_platform_IFileSystem_O_RDONLY 0L -#undef com_ibm_platform_IFileSystem_O_WRONLY -#define com_ibm_platform_IFileSystem_O_WRONLY 1L -#undef com_ibm_platform_IFileSystem_O_RDWR -#define com_ibm_platform_IFileSystem_O_RDWR 16L -#undef com_ibm_platform_IFileSystem_O_APPEND -#define com_ibm_platform_IFileSystem_O_APPEND 256L -#undef com_ibm_platform_IFileSystem_O_CREAT -#define com_ibm_platform_IFileSystem_O_CREAT 4096L -#undef com_ibm_platform_IFileSystem_O_EXCL -#define com_ibm_platform_IFileSystem_O_EXCL 65536L -#undef com_ibm_platform_IFileSystem_O_NOCTTY -#define com_ibm_platform_IFileSystem_O_NOCTTY 1048576L -#undef com_ibm_platform_IFileSystem_O_NONBLOCK -#define com_ibm_platform_IFileSystem_O_NONBLOCK 16777216L -#undef com_ibm_platform_IFileSystem_O_TRUNC -#define com_ibm_platform_IFileSystem_O_TRUNC 268435456L +#undef org_apache_harmony_luni_platform_IFileSystem_SHARED_LOCK_TYPE +#define org_apache_harmony_luni_platform_IFileSystem_SHARED_LOCK_TYPE 1L +#undef org_apache_harmony_luni_platform_IFileSystem_EXCLUSIVE_LOCK_TYPE +#define org_apache_harmony_luni_platform_IFileSystem_EXCLUSIVE_LOCK_TYPE 2L +#undef org_apache_harmony_luni_platform_IFileSystem_SEEK_SET +#define org_apache_harmony_luni_platform_IFileSystem_SEEK_SET 1L +#undef org_apache_harmony_luni_platform_IFileSystem_SEEK_CUR +#define org_apache_harmony_luni_platform_IFileSystem_SEEK_CUR 2L +#undef org_apache_harmony_luni_platform_IFileSystem_SEEK_END +#define org_apache_harmony_luni_platform_IFileSystem_SEEK_END 4L +#undef org_apache_harmony_luni_platform_IFileSystem_O_RDONLY +#define org_apache_harmony_luni_platform_IFileSystem_O_RDONLY 0L +#undef org_apache_harmony_luni_platform_IFileSystem_O_WRONLY +#define org_apache_harmony_luni_platform_IFileSystem_O_WRONLY 1L +#undef org_apache_harmony_luni_platform_IFileSystem_O_RDWR +#define org_apache_harmony_luni_platform_IFileSystem_O_RDWR 16L +#undef org_apache_harmony_luni_platform_IFileSystem_O_APPEND +#define org_apache_harmony_luni_platform_IFileSystem_O_APPEND 256L +#undef org_apache_harmony_luni_platform_IFileSystem_O_CREAT +#define org_apache_harmony_luni_platform_IFileSystem_O_CREAT 4096L +#undef org_apache_harmony_luni_platform_IFileSystem_O_EXCL +#define org_apache_harmony_luni_platform_IFileSystem_O_EXCL 65536L +#undef org_apache_harmony_luni_platform_IFileSystem_O_NOCTTY +#define org_apache_harmony_luni_platform_IFileSystem_O_NOCTTY 1048576L +#undef org_apache_harmony_luni_platform_IFileSystem_O_NONBLOCK +#define org_apache_harmony_luni_platform_IFileSystem_O_NONBLOCK 16777216L +#undef org_apache_harmony_luni_platform_IFileSystem_O_TRUNC +#define org_apache_harmony_luni_platform_IFileSystem_O_TRUNC 268435456L #ifdef __cplusplus } #endif Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSFileSystemLinux32.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSFileSystemLinux32.c?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSFileSystemLinux32.c (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSFileSystemLinux32.c Tue Mar 7 03:39:10 2006 @@ -39,7 +39,7 @@ * Lock the file identified by the given handle. * The range and lock type are given. */ -JNIEXPORT jint JNICALL Java_com_ibm_platform_OSFileSystem_lockImpl +JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_lockImpl (JNIEnv * env, jobject thiz, jlong handle, jlong start, jlong length, jint typeFlag, jboolean waitFlag) { @@ -64,8 +64,8 @@ lock.l_start = start; lock.l_len = length; - if ((typeFlag & com_ibm_platform_IFileSystem_SHARED_LOCK_TYPE) == - com_ibm_platform_IFileSystem_SHARED_LOCK_TYPE) + if ((typeFlag & org_apache_harmony_luni_platform_IFileSystem_SHARED_LOCK_TYPE) == + org_apache_harmony_luni_platform_IFileSystem_SHARED_LOCK_TYPE) { lock.l_type = F_RDLCK; } @@ -86,7 +86,7 @@ /** * Unlocks the specified region of the file. */ -JNIEXPORT jint JNICALL Java_com_ibm_platform_OSFileSystem_unlockImpl +JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_unlockImpl (JNIEnv * env, jobject thiz, jlong handle, jlong start, jlong length) { int rc; @@ -120,7 +120,7 @@ } -JNIEXPORT jint JNICALL Java_com_ibm_platform_OSFileSystem_getPageSize +JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_getPageSize (JNIEnv * env, jobject thiz) { static int pageSize = 0; @@ -131,11 +131,11 @@ } /* - * Class: com_ibm_platform_OSFileSystem + * Class: org_apache_harmony_luni_platform_OSFileSystem * Method: readvImpl * Signature: (J[J[I[I)J */ -JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSFileSystem_readvImpl +JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_readvImpl (JNIEnv *env, jobject thiz, jlong fd, jlongArray jbuffers, jintArray joffsets, jintArray jlengths, jint size){ PORT_ACCESS_FROM_ENV (env); jboolean bufsCopied = JNI_FALSE; @@ -173,11 +173,11 @@ } /* - * Class: com_ibm_platform_OSFileSystem + * Class: org_apache_harmony_luni_platform_OSFileSystem * Method: writevImpl * Signature: (J[J[I[I)J */ -JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSFileSystem_writevImpl +JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_writevImpl (JNIEnv *env, jobject thiz, jlong fd, jlongArray jbuffers, jintArray joffsets, jintArray jlengths, jint size){ PORT_ACCESS_FROM_ENV (env); jboolean bufsCopied = JNI_FALSE; @@ -215,11 +215,11 @@ } /* - * Class: com_ibm_platform_OSFileSystem + * Class: org_apache_harmony_luni_platform_OSFileSystem * Method: transferImpl * Signature: (JLjava/io/FileDescriptor;JJ)J */ -JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSFileSystem_transferImpl +JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSFileSystem_transferImpl (JNIEnv *env, jobject thiz, jlong fd, jobject sd, jlong offset, jlong count) { PORT_ACCESS_FROM_ENV (env); Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.c?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.c (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.c Tue Mar 7 03:39:10 2006 @@ -22,7 +22,7 @@ #include "OSMemory.h" #include "IMemorySystem.h" -JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSMemory_malloc +JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSMemory_malloc (JNIEnv * env, jobject thiz, jlong size) { PORT_ACCESS_FROM_ENV (env); @@ -40,7 +40,7 @@ return (jlong) ((IDATA) address); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_free +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_free (JNIEnv * env, jobject thiz, jlong address) { PORT_ACCESS_FROM_ENV (env); @@ -48,7 +48,7 @@ hymem_free_memory ((void *) ((IDATA) address)); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_memmove +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_memmove (JNIEnv * env, jobject thiz, jlong destAddress, jlong srcAddress, jlong length) { @@ -56,13 +56,13 @@ (const void *) ((IDATA) srcAddress), (size_t) length); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_memset +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_memset (JNIEnv * env, jobject thiz, jlong address, jbyte value, jlong length) { memset ((void *) ((IDATA) address), (int) value, (size_t) length); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_getByteArray +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getByteArray (JNIEnv * env, jobject thiz, jlong address, jbyteArray byteArray, jint offset, jint length) { @@ -75,7 +75,7 @@ } } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setByteArray +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setByteArray (JNIEnv * env, jobject thiz, jlong address, jbyteArray byteArray, jint offset, jint length) { @@ -89,73 +89,73 @@ } } -JNIEXPORT jbyte JNICALL Java_com_ibm_platform_OSMemory_getByte +JNIEXPORT jbyte JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getByte (JNIEnv * env, jobject thiz, jlong address) { return *(jbyte *) ((IDATA) address); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setByte +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setByte (JNIEnv * env, jobject thiz, jlong address, jbyte value) { *(jbyte *) ((IDATA) address) = value; } -JNIEXPORT jshort JNICALL Java_com_ibm_platform_OSMemory_getShort +JNIEXPORT jshort JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getShort (JNIEnv * env, jobject thiz, jlong address) { return *(jshort *) ((IDATA) address); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setShort +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setShort (JNIEnv * env, jobject thiz, jlong address, jshort value) { *(jshort *) ((IDATA) address) = value; } -JNIEXPORT jint JNICALL Java_com_ibm_platform_OSMemory_getInt +JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getInt (JNIEnv * env, jobject thiz, jlong address) { return *(jint *) ((IDATA) address); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setInt +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setInt (JNIEnv * env, jobject thiz, jlong address, jint value) { *(jint *) ((IDATA) address) = value; } -JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSMemory_getLong +JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getLong (JNIEnv * env, jobject thiz, jlong address) { return *(jlong *) ((IDATA) address); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setLong +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setLong (JNIEnv * env, jobject thiz, jlong address, jlong value) { *(jlong *) ((IDATA) address) = value; } -JNIEXPORT jfloat JNICALL Java_com_ibm_platform_OSMemory_getFloat +JNIEXPORT jfloat JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getFloat (JNIEnv * env, jobject thiz, jlong address) { return *(jfloat *) ((IDATA) address); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setFloat +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setFloat (JNIEnv * env, jobject thiz, jlong address, jfloat value) { *(jfloat *) ((IDATA) address) = value; } -JNIEXPORT jdouble JNICALL Java_com_ibm_platform_OSMemory_getDouble +JNIEXPORT jdouble JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getDouble (JNIEnv * env, jobject thiz, jlong address) { return *(jdouble *) ((IDATA) address); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setDouble +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setDouble (JNIEnv * env, jobject thiz, jlong address, jdouble value) { *(jdouble *) ((IDATA) address) = value; @@ -163,11 +163,11 @@ /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: unmapImpl * Signature: (J)V */ -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_unmapImpl +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_unmapImpl (JNIEnv * env, jobject thiz, jlong fd) { PORT_ACCESS_FROM_ENV (env); @@ -175,11 +175,11 @@ } /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: mmapImpl * Signature: (JJJI)J */ -JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSMemory_mmapImpl +JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSMemory_mmapImpl (JNIEnv * env, jobject thiz, jlong fd, jlong alignment, jlong size, jint mmode) { PORT_ACCESS_FROM_ENV (env); @@ -189,15 +189,15 @@ // Convert from Java mapping mode to port library mapping mode. switch (mmode) { - case com_ibm_platform_IMemorySystem_MMAP_READ_ONLY: + case org_apache_harmony_luni_platform_IMemorySystem_MMAP_READ_ONLY: prot = PROT_READ; flags = MAP_SHARED; break; - case com_ibm_platform_IMemorySystem_MMAP_READ_WRITE: + case org_apache_harmony_luni_platform_IMemorySystem_MMAP_READ_WRITE: prot = PROT_READ|PROT_WRITE; flags = MAP_SHARED; break; - case com_ibm_platform_IMemorySystem_MMAP_WRITE_COPY: + case org_apache_harmony_luni_platform_IMemorySystem_MMAP_WRITE_COPY: prot = PROT_READ|PROT_WRITE; flags = MAP_PRIVATE; break; Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.h URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.h?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.h (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemory.h Tue Mar 7 03:39:10 2006 @@ -14,10 +14,10 @@ */ #include -/* Header for class com_ibm_platform_OSMemory */ +/* Header for class org_apache_harmony_luni_platform_OSMemory */ -#ifndef _Included_com_ibm_platform_OSMemory -#define _Included_com_ibm_platform_OSMemory +#ifndef _Included_org_apache_harmony_luni_platform_OSMemory +#define _Included_org_apache_harmony_luni_platform_OSMemory #ifdef __cplusplus extern "C" { @@ -26,207 +26,207 @@ /* Inaccessible static: NATIVE_ORDER */ /* Inaccessible static: singleton */ /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: isLittleEndianImpl * Signature: ()Z */ - JNIEXPORT jboolean JNICALL Java_com_ibm_platform_OSMemory_isLittleEndianImpl + JNIEXPORT jboolean JNICALL Java_org_apache_harmony_luni_platform_OSMemory_isLittleEndianImpl (JNIEnv *, jclass); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: getPointerSizeImpl * Signature: ()I */ - JNIEXPORT jint JNICALL Java_com_ibm_platform_OSMemory_getPointerSizeImpl + JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getPointerSizeImpl (JNIEnv *, jclass); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: malloc * Signature: (J)J */ - JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSMemory_malloc + JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSMemory_malloc (JNIEnv *, jobject, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: free * Signature: (J)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_free + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_free (JNIEnv *, jobject, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: memset * Signature: (JBJ)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_memset + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_memset (JNIEnv *, jobject, jlong, jbyte, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: memmove * Signature: (JJJ)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_memmove + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_memmove (JNIEnv *, jobject, jlong, jlong, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: getByteArray * Signature: (J[BII)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_getByteArray + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getByteArray (JNIEnv *, jobject, jlong, jbyteArray, jint, jint); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: setByteArray * Signature: (J[BII)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setByteArray + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setByteArray (JNIEnv *, jobject, jlong, jbyteArray, jint, jint); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: setCharArray * Signature: (J[CII)V */ -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setCharArray +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setCharArray (JNIEnv *, jobject, jlong, jcharArray, jint, jint); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: getByte * Signature: (J)B */ - JNIEXPORT jbyte JNICALL Java_com_ibm_platform_OSMemory_getByte + JNIEXPORT jbyte JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getByte (JNIEnv *, jobject, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: setByte * Signature: (JB)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setByte + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setByte (JNIEnv *, jobject, jlong, jbyte); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: getShort * Signature: (J)S */ - JNIEXPORT jshort JNICALL Java_com_ibm_platform_OSMemory_getShort + JNIEXPORT jshort JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getShort (JNIEnv *, jobject, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: setShort * Signature: (JS)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setShort + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setShort (JNIEnv *, jobject, jlong, jshort); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: getInt * Signature: (J)I */ - JNIEXPORT jint JNICALL Java_com_ibm_platform_OSMemory_getInt + JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getInt (JNIEnv *, jobject, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: setInt * Signature: (JI)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setInt + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setInt (JNIEnv *, jobject, jlong, jint); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: getLong * Signature: (J)J */ - JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSMemory_getLong + JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getLong (JNIEnv *, jobject, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: setLong * Signature: (JJ)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setLong + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setLong (JNIEnv *, jobject, jlong, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: getFloat * Signature: (J)F */ - JNIEXPORT jfloat JNICALL Java_com_ibm_platform_OSMemory_getFloat + JNIEXPORT jfloat JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getFloat (JNIEnv *, jobject, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: setFloat * Signature: (JF)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setFloat + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setFloat (JNIEnv *, jobject, jlong, jfloat); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: getDouble * Signature: (J)D */ - JNIEXPORT jdouble JNICALL Java_com_ibm_platform_OSMemory_getDouble + JNIEXPORT jdouble JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getDouble (JNIEnv *, jobject, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: setDouble * Signature: (JD)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setDouble + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setDouble (JNIEnv *, jobject, jlong, jdouble); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: getAddress * Signature: (J)J */ - JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSMemory_getAddress + JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getAddress (JNIEnv *, jobject, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: setAddress * Signature: (JJ)V */ - JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setAddress + JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setAddress (JNIEnv *, jobject, jlong, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: mmapImpl * Signature: (JJJI)J */ -JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSMemory_mmapImpl +JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSMemory_mmapImpl (JNIEnv *, jobject, jlong, jlong, jlong, jint); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: unmapImpl * Signature: (J)V */ -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_unmapImpl +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_unmapImpl (JNIEnv *, jobject, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: loadImpl * Signature: (JJ)I */ -JNIEXPORT jint JNICALL Java_com_ibm_platform_OSMemory_loadImpl +JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSMemory_loadImpl (JNIEnv *, jobject, jlong, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: isLoadedImpl * Signature: (JJ)Z */ -JNIEXPORT jboolean JNICALL Java_com_ibm_platform_OSMemory_isLoadedImpl +JNIEXPORT jboolean JNICALL Java_org_apache_harmony_luni_platform_OSMemory_isLoadedImpl (JNIEnv *, jobject, jlong, jlong); /* - * Class: com_ibm_platform_OSMemory + * Class: org_apache_harmony_luni_platform_OSMemory * Method: flushImpl * Signature: (JJ)I */ -JNIEXPORT jint JNICALL Java_com_ibm_platform_OSMemory_flushImpl +JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSMemory_flushImpl (JNIEnv *, jobject, jlong, jlong); #ifdef __cplusplus Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemoryLinux32.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemoryLinux32.c?rev=383849&r1=383848&r2=383849&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemoryLinux32.c (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSMemoryLinux32.c Tue Mar 7 03:39:10 2006 @@ -24,25 +24,25 @@ #include #include "OSMemory.h" -#define OS_JNI(func) JNICALL Java_com_ibm_platform_OSMemory_##func +#define OS_JNI(func) JNICALL Java_org_apache_harmony_luni_platform_OSMemory_##func -JNIEXPORT jboolean JNICALL Java_com_ibm_platform_OSMemory_isLittleEndianImpl(JNIEnv * env, jclass clazz) +JNIEXPORT jboolean JNICALL Java_org_apache_harmony_luni_platform_OSMemory_isLittleEndianImpl(JNIEnv * env, jclass clazz) { return JNI_TRUE; } -JNIEXPORT jint JNICALL Java_com_ibm_platform_OSMemory_getPointerSizeImpl (JNIEnv * env, jclass clazz) +JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getPointerSizeImpl (JNIEnv * env, jclass clazz) { return 4; } -JNIEXPORT jlong JNICALL Java_com_ibm_platform_OSMemory_getAddress +JNIEXPORT jlong JNICALL Java_org_apache_harmony_luni_platform_OSMemory_getAddress (JNIEnv * env, jobject thiz, jlong address) { return (jlong) * (long *) ((IDATA) address); } -JNIEXPORT void JNICALL Java_com_ibm_platform_OSMemory_setAddress +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSMemory_setAddress (JNIEnv * env, jobject thiz, jlong address, jlong value) { *(long *) ((IDATA) address) = (long) value; @@ -57,7 +57,7 @@ return PAGE_SIZE; } -JNIEXPORT jint JNICALL Java_com_ibm_platform_OSMemory_loadImpl +JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSMemory_loadImpl (JNIEnv * env, jobject thiz, jlong addr, jlong size){ if(mlock((void *)addr, size)!=-1) { @@ -71,7 +71,7 @@ return -1; } -JNIEXPORT jboolean JNICALL Java_com_ibm_platform_OSMemory_isLoadedImpl +JNIEXPORT jboolean JNICALL Java_org_apache_harmony_luni_platform_OSMemory_isLoadedImpl (JNIEnv * env, jobject thiz, jlong addr, jlong size){ PORT_ACCESS_FROM_ENV (env); jboolean result = 0; @@ -97,7 +97,7 @@ return result; } -JNIEXPORT jint JNICALL Java_com_ibm_platform_OSMemory_flushImpl +JNIEXPORT jint JNICALL Java_org_apache_harmony_luni_platform_OSMemory_flushImpl (JNIEnv * env, jobject thiz, jlong addr, jlong size){ return msync((void *)addr, size, MS_SYNC); };