harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r386038 - in /incubator/harmony/enhanced/classlib/trunk/modules/nio: META-INF/ src/main/java/com/ibm/io/nio/ src/main/java/java/nio/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/harmony/ src/main/java/org/apache/har...
Date Wed, 15 Mar 2006 10:38:42 GMT
Author: tellison
Date: Wed Mar 15 02:38:40 2006
New Revision: 386038

URL: http://svn.apache.org/viewcvs?rev=386038&view=rev
Log:
Rename com.ibm package to org.apache
(Temporarily export internal package name - requires further refactoring)

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/
      - copied from r386035, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/com/ibm/io/nio/
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/META-INF/MANIFEST.MF
    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/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/modules/nio/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/META-INF/MANIFEST.MF?rev=386038&r1=386037&r2=386038&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/META-INF/MANIFEST.MF Wed Mar 15
02:38:40 2006
@@ -13,7 +13,7 @@
  java.nio.charset,
  java.security,
  java.util
-Export-Package: com.ibm.io.nio;version="1.0.0";x-friends:="org.apache.harmony.luni",
- java.nio,
+Export-Package: java.nio,
  java.nio.channels,
- java.nio.channels.spi
+ java.nio.channels.spi,
+ org.apache.harmony.nio.internal;version="1.0.0";x-friends:="org.apache.harmony.luni"

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=386038&r1=386037&r2=386038&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
Wed Mar 15 02:38:40 2006
@@ -15,10 +15,9 @@
 
 package java.nio;
 
+import org.apache.harmony.luni.platform.PlatformAddress;
+import org.apache.harmony.nio.internal.DirectBuffer;
 
-
-import com.ibm.io.nio.DirectBuffer;
-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=386038&r1=386037&r2=386038&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
Wed Mar 15 02:38:40 2006
@@ -15,9 +15,7 @@
 
 package java.nio; 
 
-
-
-import org.apache.harmony.luni.platform.struct.PlatformAddress;
+import org.apache.harmony.luni.platform.PlatformAddress;
 
 /**
  * Helper class for operations on direct ByteBuffer

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=386038&r1=386037&r2=386038&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
Wed Mar 15 02:38:40 2006
@@ -15,9 +15,10 @@
 
 package java.nio;
 
-import com.ibm.io.nio.DirectBuffer;
 import org.apache.harmony.luni.platform.IMemorySystem;
-import org.apache.harmony.luni.platform.struct.PlatformAddress;
+import org.apache.harmony.luni.platform.PlatformAddress;
+import org.apache.harmony.nio.internal.DirectBuffer;
+
 
 /**
  * <code>MappedByteBuffer</code> 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=386038&r1=386037&r2=386038&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
Wed Mar 15 02:38:40 2006
@@ -15,8 +15,9 @@
 
 package java.nio;
 
-import com.ibm.io.nio.DirectBuffer;
-import org.apache.harmony.luni.platform.struct.PlatformAddress;
+import org.apache.harmony.luni.platform.PlatformAddress;
+import org.apache.harmony.nio.internal.DirectBuffer;
+
 
 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=386038&r1=386037&r2=386038&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
Wed Mar 15 02:38:40 2006
@@ -15,7 +15,7 @@
 
 package java.nio;
 
-import org.apache.harmony.luni.platform.struct.PlatformAddress;
+import org.apache.harmony.luni.platform.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=386038&r1=386037&r2=386038&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
Wed Mar 15 02:38:40 2006
@@ -15,9 +15,7 @@
 
 package java.nio;
 
-
-
-import org.apache.harmony.luni.platform.struct.PlatformAddress;
+import org.apache.harmony.luni.platform.PlatformAddress;
 
 /**
  * DirectByteBuffer, ReadWriteDirectByteBuffer and ReadOnlyDirectByteBuffer

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java?rev=386038&r1=386035&r2=386038&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
Wed Mar 15 02:38:40 2006
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ibm.io.nio;
+package org.apache.harmony.nio.internal;
 
-import org.apache.harmony.luni.platform.struct.PlatformAddress;
+import org.apache.harmony.luni.platform.PlatformAddress;
 
 public interface DirectBuffer {
 	public PlatformAddress getEffectiveAddress();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java?rev=386038&r1=386035&r2=386038&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
Wed Mar 15 02:38:40 2006
@@ -13,8 +13,7 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
-
+package org.apache.harmony.nio.internal;
 
 import java.io.Closeable;
 import java.io.FileDescriptor;
@@ -26,10 +25,11 @@
 import java.nio.channels.FileLock;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
+
 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;
+import org.apache.harmony.luni.platform.PlatformAddress;
 
 /*
  * The file channel impl class is the bridge between the logical channels

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java?rev=386038&r1=386035&r2=386038&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
Wed Mar 15 02:38:40 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package org.apache.harmony.nio.internal;
 
 
 import java.io.IOException;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java?rev=386038&r1=386035&r2=386038&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java
Wed Mar 15 02:38:40 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package org.apache.harmony.nio.internal;
 
 
 import java.nio.channels.FileLock;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java?rev=386038&r1=386035&r2=386038&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
Wed Mar 15 02:38:40 2006
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package com.ibm.io.nio;
+package org.apache.harmony.nio.internal;
 
 import java.lang.reflect.Constructor;
 import java.nio.MappedByteBuffer;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import org.apache.harmony.luni.platform.struct.PlatformAddress;
+import org.apache.harmony.luni.platform.PlatformAddress;
 
 class MappedByteBufferFactory {
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java?rev=386038&r1=386035&r2=386038&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
Wed Mar 15 02:38:40 2006
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ibm.io.nio;
+package org.apache.harmony.nio.internal;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java?rev=386038&r1=386035&r2=386038&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
Wed Mar 15 02:38:40 2006
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ibm.io.nio;
+package org.apache.harmony.nio.internal;
 
 import java.io.IOException;
 import java.nio.MappedByteBuffer;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java?rev=386038&r1=386035&r2=386038&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java
Wed Mar 15 02:38:40 2006
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ibm.io.nio;
+package org.apache.harmony.nio.internal;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -20,6 +20,7 @@
 import java.nio.channels.FileLock;
 import java.nio.channels.NonReadableChannelException;
 import java.nio.channels.WritableByteChannel;
+import java.nio.channels.FileChannel.MapMode;
 
 public final class WriteOnlyFileChannel extends FileChannelImpl {
 



Mime
View raw message