You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/03/30 18:22:55 UTC
svn commit: r390171 - in /incubator/harmony/enhanced/classlib/trunk:
make/patternsets/ modules/luni/META-INF/
modules/luni/src/main/java/java/io/ modules/nio/META-INF/
modules/nio/src/main/java/org/apache/harmony/nio/
Author: tellison
Date: Thu Mar 30 08:22:51 2006
New Revision: 390171
URL: http://svn.apache.org/viewcvs?rev=390171&view=rev
Log:
Apply patch HARMONY-275 (o.a.h.nio.internal should not be exported)
Added:
incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
- copied, changed from r389571, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java
Removed:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java
Modified:
incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio.txt
incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF
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/META-INF/MANIFEST.MF
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=390171&r1=390170&r2=390171&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio.txt Thu Mar 30 08:22:51 2006
@@ -16,5 +16,6 @@
java/nio/channels/*
java/nio/channels/spi/*
+org/apache/harmony/nio/*
org/apache/harmony/nio/internal/*
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF?rev=390171&r1=390170&r2=390171&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF Thu Mar 30 08:22:51 2006
@@ -6,17 +6,17 @@
Bundle-ClassPath: .
Eclipse-JREBundle: true
Eclipse-ExtensibleAPI: true
-Import-Package: org.apache.harmony.nio.internal,
- java.math,
+Import-Package: java.math,
java.nio,
java.nio.channels,
java.nio.charset,
+ java.security,
+ java.security.cert,
+ java.text,
java.util.jar,
java.util.regex,
java.util.zip,
- java.security,
- java.security.cert,
- java.text
+ org.apache.harmony.nio
Export-Package: com.ibm.oti.util,
com.ibm.oti.vm,
java.io,
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=390171&r1=390170&r2=390171&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 Thu Mar 30 08:22:51 2006
@@ -20,6 +20,7 @@
import org.apache.harmony.luni.platform.IFileSystem;
import org.apache.harmony.luni.platform.Platform;
+import org.apache.harmony.nio.FileChannelFactory;
/**
* 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=390171&r1=390170&r2=390171&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 Thu Mar 30 08:22:51 2006
@@ -20,6 +20,7 @@
import org.apache.harmony.luni.platform.IFileSystem;
import org.apache.harmony.luni.platform.Platform;
+import org.apache.harmony.nio.FileChannelFactory;
/**
* 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=390171&r1=390170&r2=390171&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 Thu Mar 30 08:22:51 2006
@@ -20,6 +20,7 @@
import org.apache.harmony.luni.platform.IFileSystem;
import org.apache.harmony.luni.platform.Platform;
+import org.apache.harmony.nio.FileChannelFactory;
/**
* RandomAccessFile is a class which allows positioning of the next read
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=390171&r1=390170&r2=390171&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 Thu Mar 30 08:22:51 2006
@@ -19,4 +19,4 @@
Export-Package: java.nio,
java.nio.channels,
java.nio.channels.spi,
- org.apache.harmony.nio.internal;version="1.0.0";x-friends:="org.apache.harmony.luni"
+ org.apache.harmony.nio
Copied: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/FileChannelFactory.java (from r389571, 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/nio/src/main/java/org/apache/harmony/nio/FileChannelFactory.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/FileChannelFactory.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java&r1=389571&r2=390171&rev=390171&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FileChannelFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/FileChannelFactory.java Thu Mar 30 08:22:51 2006
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package java.io;
+package org.apache.harmony.nio;
import java.nio.channels.FileChannel;
@@ -27,8 +27,8 @@
* A simple factory to provide a generic way to create FileChannel
* implementation from within the java.io package.
*/
-class FileChannelFactory {
- static FileChannel getFileChannel(Object stream, long fd, int mode) {
+public class FileChannelFactory {
+ public static FileChannel getFileChannel(Object stream, long fd, int mode) {
switch(mode){
case IFileSystem.O_RDONLY:
return new ReadOnlyFileChannel(stream, fd);