harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r391955 [1/5] - in /incubator/harmony/enhanced/classlib/trunk: make/patternsets/ modules/ modules/archive/META-INF/ modules/archive/src/main/java/java/util/jar/ modules/archive/src/main/java/java/util/zip/ modules/jndi/src/main/java/com/ mo...
Date Thu, 06 Apr 2006 10:42:32 GMT
Author: tellison
Date: Thu Apr  6 03:42:13 2006
New Revision: 391955

URL: http://svn.apache.org/viewcvs?rev=391955&view=rev
Log:
Package renaming from com.ibm to org.apache.harmony

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/EnvironmentReader.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/com/ibm/jndi/EnvironmentReader.java
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/UrlParser.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/com/ibm/jndi/UrlParser.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/org/
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/org/apache/
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/org/apache/harmony/
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/org/apache/harmony/kernel/
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/VM.java
      - copied, changed from r391945, incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/com/ibm/oti/vm/VM.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/String.java.bak
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/FileURLConnection.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/net/www/protocol/file/FileURLConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/net/www/protocol/file/Handler.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLConnection.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/net/www/protocol/ftp/FtpURLConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/FtpURLInputStream.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/net/www/protocol/ftp/FtpURLInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/ftp/Handler.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/net/www/protocol/ftp/Handler.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Handler.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/net/www/protocol/http/Handler.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/net/www/protocol/http/Header.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnection.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/net/www/protocol/http/HttpURLConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/Handler.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/net/www/protocol/jar/Handler.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnection.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/net/www/protocol/jar/JarURLConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/lang/ProcessInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessOutputStream.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/lang/ProcessOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/SystemProcess.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/lang/SystemProcess.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/DefaultPolicy.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/DefaultPolicy.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/DeleteOnExit.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/DeleteOnExit.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties
      - copied unchanged from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/ExternalMessages.properties
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/FloatingPointParser.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Inet6Util.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/InvalidJarIndexException.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/InvalidJarIndexException.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Msg.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Msg.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/MsgHelp.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/vm/MsgHelp.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/NumberConverter.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/NumberConverter.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/OIDDatabase.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/OIDDatabase.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PasswordProtectedInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PositionedInputStream.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PositionedInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PriviAction.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PriviAction.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/SHAOutputStream.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/SHAOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Util.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/common/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/common/ClassUtils.java
      - copied, changed from r389444, incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/com/ibm/common/ClassUtils.java
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/com/
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/com/
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/String.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/com/
Modified:
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/jndi.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni-kernel.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/sql.txt
    incubator/harmony/enhanced/classlib/trunk/modules/README.txt
    incubator/harmony/enhanced/classlib/trunk/modules/archive/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/InitManifest.java
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarVerifier.java
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/DeflaterOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/GZIPInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/Inflater.java
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipFile.java
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/Context.java
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ControlFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/NamingManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/Runtime.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/System.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedReader.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedWriter.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ByteArrayOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayReader.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayWriter.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.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/FilePermission.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FilterOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectStreamClass.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/OutputStreamWriter.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedReader.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PipedWriter.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PrintWriter.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/PushbackReader.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/RandomAccessFile.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/SequenceInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/StringBufferInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/StringReader.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ArrayIndexOutOfBoundsException.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/ClassCastException.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Double.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/Float.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/SecurityManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringBuffer.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/StringIndexOutOfBoundsException.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/lang/reflect/Proxy.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramPacket.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/DatagramSocket.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/HttpURLConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Inet6Address.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/MulticastSocket.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/NegativeCache.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/NetworkInterface.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/ServerSocket.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/Socket.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/SocketPermission.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URI.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URIEncoderDecoder.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URISyntaxException.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URL.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLClassLoader.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URLDecoder.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Currency.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Properties.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/ResourceBundle.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/SimpleTimeZone.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/TimeZone.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Timer.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/NetUtil.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/net/Socks4Message.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/OSComponent.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Platform.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ASN1Decoder.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ASN1Encoder.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/BASE64Decoder.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/nio/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/sql/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/AttributedCharacterIterator.java
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/AttributedString.java
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Collator.java
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/DateFormat.java
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/DecimalFormat.java
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Format.java
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/MessageFormat.java
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/NumberFormat.java
    incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/SimpleDateFormat.java
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/jclprots.h
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/libhymath.exp
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/main.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/bigint.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/bigint.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/jclglob.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/netif.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/process.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/bigint.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/bigint.h
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/dblparse.c
    incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/fltparse.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/jclprots.h
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/hymath.def

Modified: incubator/harmony/enhanced/classlib/trunk/make/patternsets/jndi.txt
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/patternsets/jndi.txt?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/patternsets/jndi.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/patternsets/jndi.txt Thu Apr  6 03:42:13 2006
@@ -18,4 +18,4 @@
 javax/naming/ldap/*
 javax/naming/spi/*
 
-com/ibm/jndi/*
\ No newline at end of file
+org/apache/harmony/jndi/internal/*
\ No newline at end of file

Modified: incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni-kernel.txt
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni-kernel.txt?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni-kernel.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni-kernel.txt Thu Apr  6 03:42:13 2006
@@ -20,16 +20,12 @@
 java/lang/ClassLoader$*.*
 java/lang/Compiler.*
 java/lang/Compiler$*.*
-java/lang/J9VMInternals.*
-java/lang/J9VMInternals$*.*
 java/lang/Package.*
 java/lang/Package$*.*
 java/lang/Runtime.*
 java/lang/Runtime$*.*
 java/lang/StackTraceElement.*
 java/lang/StackTraceElement$*.*
-java/lang/String.*
-java/lang/String$*.*
 java/lang/System.*
 java/lang/System$*.*
 java/lang/Thread.*
@@ -59,22 +55,5 @@
 java/lang/ref/WeakReference.*
 java/lang/ref/WeakReference$*.*
 
-com/ibm/oti/util/IdentityHashtable.*
-com/ibm/oti/util/IdentityHashtable$*.*
-
-com/ibm/oti/vm/AbstractClassLoader.*
-com/ibm/oti/vm/AbstractClassLoader$*.*
-com/ibm/oti/vm/BootstrapClassLoader.*
-com/ibm/oti/vm/BootstrapClassLoader$*.*
-com/ibm/oti/vm/JarRunner.*
-com/ibm/oti/vm/JarRunner$*.*
-com/ibm/oti/vm/ReflectObjectInvalidException.*
-com/ibm/oti/vm/ReflectObjectInvalidException$*.*
-com/ibm/oti/vm/URLAppClassLoader.*
-com/ibm/oti/vm/URLAppClassLoader$*.*
-com/ibm/oti/vm/URLExtensionClassLoader.*
-com/ibm/oti/vm/URLExtensionClassLoader$*.*
-com/ibm/oti/vm/URLSystemClassLoader.*
-com/ibm/oti/vm/URLSystemClassLoader$*.*
-com/ibm/oti/vm/VM.*
-com/ibm/oti/vm/VM$*.*
+org/apache/harmony/kernel/vm/VM.*
+org/apache/harmony/kernel/vm/VM$*.*

Modified: incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni.txt
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni.txt?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni.txt Thu Apr  6 03:42:13 2006
@@ -13,16 +13,16 @@
 # limitations under the License.
 
 java/lang/*
-com/ibm/oti/lang/*
+org/apache/harmony/luni/internal/process/*
 
 java/util/*
-com/ibm/oti/util/*
+org/apache/harmony/luni/util/*
 
 java/net/*
-com/ibm/oti/net/www/protocol/file/*
-com/ibm/oti/net/www/protocol/ftp/*
-com/ibm/oti/net/www/protocol/http/*
-com/ibm/oti/net/www/protocol/jar/*
+org/apache/harmony/luni/internal/net/www/protocol/file/*
+org/apache/harmony/luni/internal/net/www/protocol/ftp/*
+org/apache/harmony/luni/internal/net/www/protocol/http/*
+org/apache/harmony/luni/internal/net/www/protocol/jar/*
 
 java/io/*
 com/ibm/oti/io/*
@@ -30,9 +30,6 @@
 java/lang/ref/*
 
 java/lang/reflect/*
-
-
-com/ibm/oti/vm/*
 
 org/apache/harmony/luni/internal/locale/*
 org/apache/harmony/luni/internal/net/www/*

Modified: incubator/harmony/enhanced/classlib/trunk/make/patternsets/sql.txt
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/patternsets/sql.txt?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/patternsets/sql.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/patternsets/sql.txt Thu Apr  6 03:42:13 2006
@@ -20,4 +20,4 @@
 javax/transaction/*
 javax/transaction/xa/*
 
-com/ibm/common/*
\ No newline at end of file
+org/apache/harmony/sql/internal/common/*
\ No newline at end of file

Modified: incubator/harmony/enhanced/classlib/trunk/modules/README.txt
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/README.txt?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/README.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/README.txt Thu Apr  6 03:42:13 2006
@@ -1,3 +1,3 @@
-The 'java-src' directory contains Java source files and manifest files
+The 'modules' directory contains Java source files and manifest files
 stored under the <class library component>/src and
 <class library component>/META-INF respectively.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/META-INF/MANIFEST.MF?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/META-INF/MANIFEST.MF Thu Apr  6 03:42:13 2006
@@ -15,7 +15,7 @@
  java.security.cert,
  java.nio,
  java.nio.charset,
- com.ibm.oti.util,
+ org.apache.harmony.luni.util,
  org.apache.harmony.luni.util,
  org.apache.harmony.security.utils
 Export-Package: java.util.jar,

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/InitManifest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/InitManifest.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/InitManifest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/InitManifest.java Thu Apr  6 03:42:13 2006
@@ -27,9 +27,9 @@
 import java.util.List;
 import java.util.Map;
 
-import com.ibm.oti.util.Msg;
-import com.ibm.oti.util.PriviAction;
-import com.ibm.oti.util.Util;
+import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.util.PriviAction;
+import org.apache.harmony.luni.util.Util;
 
 class InitManifest {
 	private byte[] inbuf = new byte[1024];
@@ -47,7 +47,7 @@
 	private boolean usingUTF8 = true;
 
 	private Map attributeNames = new HashMap();
-	
+
 	private byte[] mainAttributesChunk;
 
 	InitManifest(InputStream is, Attributes main, Map entries, Map chunks,
@@ -93,7 +93,7 @@
 		}
 
 	}
-	
+
 	byte[] getMainAttributesChunk()
 	{
 		return mainAttributesChunk;
@@ -147,7 +147,7 @@
                     if (inbufCount == inbuf.length && in.available() == 0) {
                         /* KA000 = "line too long" */
                         throw new IOException(Msg.getString("KA000"));
-                    }
+				}
                 } 
 				inbufPos = 0;
 			}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarVerifier.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarVerifier.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarVerifier.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/JarVerifier.java Thu Apr  6 03:42:13 2006
@@ -36,7 +36,7 @@
 
 import org.apache.harmony.security.utils.JarUtils;
 
-import com.ibm.oti.util.Msg;
+import org.apache.harmony.luni.util.Msg;
 
 /**
  * Non-public class used by {@link java.util.jar.JarFile} and
@@ -427,8 +427,8 @@
 		if (ignorable) {
 			return true;
 		} else {
-			return false;
-		}
+		return false;
+	}
 	}
 
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/jar/Manifest.java Thu Apr  6 03:42:13 2006
@@ -26,7 +26,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * The Manifest class is used to obtain attribute information for a JarFile and
@@ -39,7 +39,7 @@
 	private HashMap entryAttributes = new HashMap();
 
 	private HashMap chunks;
-	
+
 	/*The data chunk of Main Attributes in the manifest is needed in verification.*/
 	private byte[] mainAttributesChunk;
 	

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/DeflaterOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/DeflaterOutputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/DeflaterOutputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/DeflaterOutputStream.java Thu Apr  6 03:42:13 2006
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import com.ibm.oti.util.Msg;
+import org.apache.harmony.luni.util.Msg;
 
 /**
  * The DeflaterOutputStream class implements a stream filter for the writing of

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/GZIPInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/GZIPInputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/GZIPInputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/GZIPInputStream.java Thu Apr  6 03:42:13 2006
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.ibm.oti.util.Msg;
+import org.apache.harmony.luni.util.Msg;
 
 /**
  * The GZIPInputStream class is used to read data stored in the GZIP format.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/Inflater.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/Inflater.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/Inflater.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/Inflater.java Thu Apr  6 03:42:13 2006
@@ -15,6 +15,7 @@
 
 package java.util.zip;
 
+
 /**
  * The Inflater class is used to decompress bytes using the DEFLATE compression
  * algorithm. Inflation is performed by the ZLIB compression library.
@@ -169,7 +170,7 @@
 			needsDictionary = false;
 			int result = inflateImpl(buf, off, nbytes, streamHandle);
 			if (needsDictionary && neededDict)
-				throw new DataFormatException(com.ibm.oti.util.Msg
+				throw new DataFormatException(org.apache.harmony.luni.util.Msg
 						.getString("K0324"));
 			return result;
 		}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/InflaterInputStream.java Thu Apr  6 03:42:13 2006
@@ -21,7 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.ibm.oti.util.Msg;
+import org.apache.harmony.luni.util.Msg;
 
 /**
  * InflaterOuputStream read data which has been compressed using the DEFLATE

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipFile.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipFile.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipFile.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipFile.java Thu Apr  6 03:42:13 2006
@@ -25,8 +25,8 @@
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
 
-import com.ibm.oti.util.Msg;
-import com.ibm.oti.util.Util;
+import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.util.Util;
 
 /**
  * ZipFile is used to read zip entries and their associated data from zip files.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipInputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipInputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipInputStream.java Thu Apr  6 03:42:13 2006
@@ -23,8 +23,8 @@
 import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 
-import com.ibm.oti.util.Msg;
-import com.ibm.oti.util.Util;
+import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.util.Util;
 
 /**
  * ZipInputStream is an input stream for reading zip files.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/java/java/util/zip/ZipOutputStream.java Thu Apr  6 03:42:13 2006
@@ -21,7 +21,7 @@
 import java.io.OutputStream;
 import java.util.Vector;
 
-import com.ibm.oti.util.Msg;
+import org.apache.harmony.luni.util.Msg;
 
 /**
  * ZipOuputStream is used to write ZipEntries to the underlying stream. Output

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/Context.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/Context.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/Context.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/Context.java Thu Apr  6 03:42:13 2006
@@ -166,10 +166,10 @@
  * in which dot separator characters are converted into slash path separator
  * characters to construct a filepath appended with "jndiprovider.properties".
  * Consider the example where you have a service provider which supplies
- * a context <code>com.ibm.jndi.example.exampleCtx</code>.
- * In this case the package prefix is <code>com.ibm.jndi.example</code>. 
+ * a context <code>org.apache.harmony.jndi.example.exampleCtx</code>.
+ * In this case the package prefix is <code>org.apache.harmony.jndi.example</code>. 
  * Substituting slash chars for dots & appending "jndiprovider.properties" 
- * gives you <code>com/ibm/jndi/example/jndiprovider.properties</code>.</p>
+ * gives you <code>org/apache/harmony/jndi/example/jndiprovider.properties</code>.</p>
  * <p>
  * An important part of service provider implementation is to specify certain
  * standard JNDI properties that are using to locate any of the various

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java Thu Apr  6 03:42:13 2006
@@ -19,8 +19,8 @@
 import java.util.Hashtable;
 import javax.naming.spi.NamingManager;
 
-import com.ibm.jndi.UrlParser;
-import com.ibm.jndi.EnvironmentReader;
+import org.apache.harmony.jndi.internal.UrlParser;
+import org.apache.harmony.jndi.internal.EnvironmentReader;
 
 /**
  * An <code>InitialContext</code> object is required as the starting context

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ControlFactory.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ControlFactory.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ControlFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/ldap/ControlFactory.java Thu Apr  6 03:42:13 2006
@@ -22,7 +22,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import com.ibm.jndi.EnvironmentReader;
+import org.apache.harmony.jndi.internal.EnvironmentReader;
 
 /**
  * This abstract class is used for factories which create controls as used in 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java Thu Apr  6 03:42:13 2006
@@ -40,8 +40,8 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.spi.DirStateFactory.Result;
 
-import com.ibm.jndi.EnvironmentReader;
-import com.ibm.jndi.UrlParser;
+import org.apache.harmony.jndi.internal.EnvironmentReader;
+import org.apache.harmony.jndi.internal.UrlParser;
 
 /**
  * The <code>DirectoryManager</code> class cannot be instantiated. All its

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/NamingManager.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/NamingManager.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/NamingManager.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/NamingManager.java Thu Apr  6 03:42:13 2006
@@ -26,8 +26,8 @@
 
 import javax.naming.CannotProceedException;
 import javax.naming.Context;
-import com.ibm.jndi.EnvironmentReader;
-import com.ibm.jndi.UrlParser;
+import org.apache.harmony.jndi.internal.EnvironmentReader;
+import org.apache.harmony.jndi.internal.UrlParser;
 
 import javax.naming.Name;
 import javax.naming.NamingException;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/EnvironmentReader.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/com/ibm/jndi/EnvironmentReader.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/EnvironmentReader.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/EnvironmentReader.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/com/ibm/jndi/EnvironmentReader.java&r1=389444&r2=391955&rev=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/com/ibm/jndi/EnvironmentReader.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/EnvironmentReader.java Thu Apr  6 03:42:13 2006
@@ -14,7 +14,7 @@
  */
 
 
-package com.ibm.jndi;
+package org.apache.harmony.jndi.internal;
 
 import java.applet.Applet;
 import java.io.File;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/UrlParser.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/com/ibm/jndi/UrlParser.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/UrlParser.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/UrlParser.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/com/ibm/jndi/UrlParser.java&r1=389444&r2=391955&rev=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/com/ibm/jndi/UrlParser.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/UrlParser.java Thu Apr  6 03:42:13 2006
@@ -14,7 +14,7 @@
  */
 
 
-package com.ibm.jndi;
+package org.apache.harmony.jndi.internal;
 
 /**
  * Identifies the simplest URL syntax: <code>{scheme}:{scheme specific part}</code>.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/META-INF/MANIFEST.MF?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/META-INF/MANIFEST.MF (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/META-INF/MANIFEST.MF Thu Apr  6 03:42:13 2006
@@ -9,4 +9,4 @@
 Export-Package: java.lang,
  java.lang.reflect,
  java.lang.ref,
- com.ibm.oti.vm
+ org.apache.harmony.kernel.vm

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/Runtime.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/Runtime.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/Runtime.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/Runtime.java Thu Apr  6 03:42:13 2006
@@ -23,7 +23,7 @@
 /**
  * This class, with the exception of the exec() APIs, must be implemented by the
  * vm vendor. The exec() APIs must first do any required security checks, and
- * then call com.ibm.oti.lang.SystemProcess.create(). The Runtime interface.
+ * then call org.apache.harmony.luni.internal.process.SystemProcess.create(). The Runtime interface.
  */
 
 public class Runtime {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/System.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/System.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/System.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/java/lang/System.java Thu Apr  6 03:42:13 2006
@@ -523,7 +523,6 @@
 			systemProperties.put("console.encoding", consoleEncoding);
 		}
 
-		systemProperties.put("com.ibm.oti.jcl.build", "plugin");
 	}
 
 	/**

Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/VM.java (from r391945, incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/com/ibm/oti/vm/VM.java)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/VM.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/VM.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/com/ibm/oti/vm/VM.java&r1=391945&r2=391955&rev=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/com/ibm/oti/vm/VM.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni-kernel/src/main/java/org/apache/harmony/kernel/vm/VM.java Thu Apr  6 03:42:13 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.ibm.oti.vm;
+package org.apache.harmony.kernel.vm;
 
 /**
  * This class must be implemented by the vm vendor. Represents the running
@@ -23,10 +23,20 @@
  * represents the actively running VM.
  */
 public final class VM {
+	
+	/*
+	 * kernelVersion has the format: aabbxxyy
+	 * where:
+	 * 	aa - major version of kernel. Must equal that stored in jcl.
+	 * 	bb - minor version of kernel. Must be >= that in jcl.
+	 *	xx - major version of jcl. Must equal that stored in kernel.
+	 *	yy - minor version of jcl. Must be >= that in kernel.
+	 */
+	private static final int kernelVersion = 0x01000100;
 
 	/**
 	 * This method must be provided by the vm vendor, as it is used by
-	 * com.ibm.oti.vm.MsgHelp.setLocale() to get the bootstrap ClassLoader.
+	 * org.apache.harmony.kernel.vm.MsgHelp.setLocale() to get the bootstrap ClassLoader.
 	 * MsgHelp uses the bootstrap ClassLoader to find the resource bundle of
 	 * messages packaged with the bootstrap classes. Returns the ClassLoader of
 	 * the method (including natives) at the specified depth on the stack of the
@@ -78,6 +88,22 @@
 			boolean bootLoader) {
 		return;
 	};
+	
+	/**
+	 * This method must be provided by the vm vendor.
+	 *
+	 * Searches an internal table of strings for a string equal to the specified String.
+	 * If the string is not in the table, it is added. Answers the string contained
+	 * in the table which is equal to the specified String. The same string object is always
+	 * answered for strings which are equal.
+	 *
+	 * @param string	the String to intern
+	 *
+	 * @return		the interned string equal to the specified String
+	 */
+	public static final String intern(String string) {
+		return null;
+	}
 
 	/**
 	 * Native used to find and load a class using the VM
@@ -107,6 +133,27 @@
 	public static ClassLoader callerClassLoader() {
 		return null;
 	}
+	
+	/**
+	 * This method must be provided by the vm vendor, as it is used
+	 * by org.apache.harmony.luni.util.MsgHelp.setLocale() to get the bootstrap
+	 * ClassLoader. MsgHelp uses the bootstrap ClassLoader to find the
+	 * resource bundle of messages packaged with the bootstrap classes.
+	 * The reference implementation of this method uses the getStackClassLoader()
+	 * method.
+	 *
+	 * Returns the ClassLoader of the method that called the caller.
+	 * i.e. A.x() calls B.y() calls callerClassLoader(),
+	 * A's ClassLoader will be returned. Returns null for the
+	 * bootstrap ClassLoader.
+	 *
+	 * @return 		a ClassLoader
+	 *
+	 * @throws SecurityException when called from a non-bootstrap Class
+	 */
+	public static ClassLoader bootCallerClassLoader() {
+		return null;
+	}
 
 	/**
 	 * Native used to dump a string to the system console for debugging.
@@ -163,7 +210,7 @@
 
 	/**
 	 * This method must be provided by the vm vendor. Called to signal that the
-	 * com.ibm.oti.net.www.protocol.jar.JarURLConnection class has been loaded
+	 * org.apache.harmony.luni.internal.net.www.protocol.jar.JarURLConnection class has been loaded
 	 * and JarURLConnection.closeCachedFiles() should be called on VM shutdown.
 	 * 
 	 * @see #shutdown()
@@ -174,7 +221,7 @@
 
 	/**
 	 * This method must be provided by the vm vendor. Called to signal that the
-	 * com.ibm.oti.util.DeleteOnExit class has been loaded and
+	 * org.apache.harmony.luni.util.DeleteOnExit class has been loaded and
 	 * DeleteOnExit.deleteOnExit() should be called on VM shutdown.
 	 * 
 	 * @see #shutdown()
@@ -244,5 +291,17 @@
 	static byte[] getPathFromClassPath(int index) {
 		return null;
 	};
+	
+	/**
+	 * This method must be provided by the vm vendor.
+	 *
+	 * Returns an int containing the version number of the kernel. Used to check for kernel
+	 * compatibility.
+	 *
+	 * @return an int containing the kernel version number
+	 */
+	public static int getKernelVersion() {
+		return kernelVersion;
+	}
 
 }

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=391955&r1=391954&r2=391955&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 Apr  6 03:42:13 2006
@@ -17,8 +17,8 @@
  java.util.regex,
  java.util.zip,
  org.apache.harmony.nio
-Export-Package: com.ibm.oti.util,
- com.ibm.oti.vm,
+Export-Package: org.apache.harmony.luni.util,
+ org.apache.harmony.kernel.vm,
  java.io,
  java.lang,
  java.lang.ref,
@@ -28,3 +28,4 @@
  org.apache.harmony.luni.util,
  org.apache.harmony.luni.net,
  org.apache.harmony.luni.platform
+

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedInputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedInputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedInputStream.java Thu Apr  6 03:42:13 2006
@@ -80,7 +80,7 @@
 		if (size > 0)
 			buf = new byte[size];
 		else
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 					.getString("K0058")); //$NON-NLS-1$
 	}
 
@@ -96,7 +96,7 @@
 	 */
 	public synchronized int available() throws IOException {
 		if (buf == null) {
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0059")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0059")); //$NON-NLS-1$
 		}
 		return count - pos + in.available();
 	}
@@ -194,7 +194,7 @@
 				return buf[pos++] & 0xFF;
 			return -1;
 		}
-		throw new IOException(com.ibm.oti.util.Msg.getString("K0059")); //$NON-NLS-1$
+		throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0059")); //$NON-NLS-1$
 	}
 
 	/**
@@ -271,9 +271,9 @@
 			throw new ArrayIndexOutOfBoundsException();
 		}
 		if (buf == null) {
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0059")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0059")); //$NON-NLS-1$
 		}
-		throw new NullPointerException(com.ibm.oti.util.Msg.getString("K0047")); //$NON-NLS-1$
+		throw new NullPointerException(org.apache.harmony.luni.util.Msg.getString("K0047")); //$NON-NLS-1$
 	}
 
 	/**
@@ -292,9 +292,9 @@
 			if (buf != null) {
 				pos = markpos;
 			} else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0059")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0059")); //$NON-NLS-1$
 		} else
-			throw new IOException(com.ibm.oti.util.Msg.getString("K005a")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K005a")); //$NON-NLS-1$
 	}
 
 	/**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedOutputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedOutputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedOutputStream.java Thu Apr  6 03:42:13 2006
@@ -66,7 +66,7 @@
 		if (size > 0)
 			buf = new byte[size];
 		else
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 					.getString("K0058")); //$NON-NLS-1$
 	}
 
@@ -142,10 +142,10 @@
 					}
 				}
 			} else
-				throw new ArrayIndexOutOfBoundsException(com.ibm.oti.util.Msg
+				throw new ArrayIndexOutOfBoundsException(org.apache.harmony.luni.util.Msg
 						.getString("K002f")); //$NON-NLS-1$
 		} else
-			throw new NullPointerException(com.ibm.oti.util.Msg
+			throw new NullPointerException(org.apache.harmony.luni.util.Msg
 					.getString("K0047")); //$NON-NLS-1$
 	}
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedReader.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedReader.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedReader.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedReader.java Thu Apr  6 03:42:13 2006
@@ -79,7 +79,7 @@
 			this.in = in;
 			buf = new char[size];
 		} else
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 					.getString("K0058")); //$NON-NLS-1$
 	}
 
@@ -164,7 +164,7 @@
 					marklimit = readlimit;
 					markpos = pos;
 				} else
-					throw new IOException(com.ibm.oti.util.Msg
+					throw new IOException(org.apache.harmony.luni.util.Msg
 							.getString("K005b")); //$NON-NLS-1$
 			}
 		} else
@@ -205,7 +205,7 @@
 					return buf[pos++];
 				return -1;
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K005b")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K005b")); //$NON-NLS-1$
 		}
 	}
 
@@ -287,7 +287,7 @@
 				}
 				throw new ArrayIndexOutOfBoundsException();
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K005b")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K005b")); //$NON-NLS-1$
 		}
 	}
 
@@ -347,7 +347,7 @@
 					pos = count;
 				}
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K005b")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K005b")); //$NON-NLS-1$
 		}
 	}
 
@@ -371,7 +371,7 @@
 		synchronized (lock) {
 			if (isOpen())
 				return ((count - pos) > 0) || in.ready();
-			throw new IOException(com.ibm.oti.util.Msg.getString("K005b")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K005b")); //$NON-NLS-1$
 		}
 	}
 
@@ -391,10 +391,10 @@
 				if (markpos != -1)
 					pos = markpos;
 				else
-					throw new IOException(com.ibm.oti.util.Msg
+					throw new IOException(org.apache.harmony.luni.util.Msg
 							.getString("K005c")); //$NON-NLS-1$
 			} else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K005b")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K005b")); //$NON-NLS-1$
 		}
 	}
 
@@ -439,7 +439,7 @@
 					}
 					return amount;
 				}
-				throw new IOException(com.ibm.oti.util.Msg.getString("K005b")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K005b")); //$NON-NLS-1$
 			}
 		}
 		throw new IllegalArgumentException();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedWriter.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedWriter.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedWriter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedWriter.java Thu Apr  6 03:42:13 2006
@@ -18,7 +18,7 @@
 
 import java.security.AccessController;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * BufferedWriter is for writing buffered character output. Characters written
@@ -69,7 +69,7 @@
 			this.out = out;
 			this.buf = new char[size];
 		} else
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 					.getString("K0058")); //$NON-NLS-1$
 	}
 
@@ -109,7 +109,7 @@
 				pos = 0;
 				out.flush();
 			} else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K005d")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K005d")); //$NON-NLS-1$
 		}
 	}
 
@@ -191,7 +191,7 @@
 						}
 					}
 				} else
-					throw new IOException(com.ibm.oti.util.Msg
+					throw new IOException(org.apache.harmony.luni.util.Msg
 							.getString("K005d")); //$NON-NLS-1$
 			}
 		} else
@@ -216,7 +216,7 @@
 				}
 				buf[pos++] = (char) oneChar;
 			} else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K005d")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K005d")); //$NON-NLS-1$
 		}
 	}
 
@@ -277,7 +277,7 @@
 						}
 					}
 				} else
-					throw new IOException(com.ibm.oti.util.Msg
+					throw new IOException(org.apache.harmony.luni.util.Msg
 							.getString("K005d")); //$NON-NLS-1$
 			}
 		} else

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ByteArrayOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ByteArrayOutputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ByteArrayOutputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ByteArrayOutputStream.java Thu Apr  6 03:42:13 2006
@@ -60,7 +60,7 @@
 		if (size >= 0)
 			buf = new byte[size];
 		else
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 					.getString("K005e")); //$NON-NLS-1$
 	}
 
@@ -202,10 +202,10 @@
 				System.arraycopy(buffer, offset, buf, this.count, len);
 				this.count += len;
 			} else
-				throw new ArrayIndexOutOfBoundsException(com.ibm.oti.util.Msg
+				throw new ArrayIndexOutOfBoundsException(org.apache.harmony.luni.util.Msg
 						.getString("K002f")); //$NON-NLS-1$
 		} else
-			throw new NullPointerException(com.ibm.oti.util.Msg
+			throw new NullPointerException(org.apache.harmony.luni.util.Msg
 					.getString("K0047")); //$NON-NLS-1$
 	}
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayReader.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayReader.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayReader.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayReader.java Thu Apr  6 03:42:13 2006
@@ -121,7 +121,7 @@
 			if (isOpen())
 				markedPos = pos;
 			else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0060")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0060")); //$NON-NLS-1$
 		}
 	}
 
@@ -152,7 +152,7 @@
 					return buf[pos++];
 				return -1;
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0060")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0060")); //$NON-NLS-1$
 		}
 	}
 
@@ -191,7 +191,7 @@
 					}
 					return -1;
 				}
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0060")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0060")); //$NON-NLS-1$
 			}
 		}
 		throw new ArrayIndexOutOfBoundsException();
@@ -217,7 +217,7 @@
 			if (isOpen()) {
 				return pos != count;
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0060")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0060")); //$NON-NLS-1$
 		}
 	}
 
@@ -235,7 +235,7 @@
 			if (isOpen())
 				pos = markedPos != -1 ? markedPos : 0;
 			else
-				throw new IOException(com.ibm.oti.util.Msg.getString("K0060")); //$NON-NLS-1$
+				throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0060")); //$NON-NLS-1$
 		}
 	}
 
@@ -266,7 +266,7 @@
 				}
 				return skipped;
 			}
-			throw new IOException(com.ibm.oti.util.Msg.getString("K0060")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K0060")); //$NON-NLS-1$
 		}
 	}
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayWriter.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayWriter.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayWriter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/CharArrayWriter.java Thu Apr  6 03:42:13 2006
@@ -59,7 +59,7 @@
 			buf = new char[initialSize];
 			lock = buf;
 		} else
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 					.getString("K005e")); //$NON-NLS-1$
 	}
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataInputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataInputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataInputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataInputStream.java Thu Apr  6 03:42:13 2006
@@ -204,7 +204,7 @@
 			} else
 				throw new IndexOutOfBoundsException();
 		} else
-			throw new NullPointerException(com.ibm.oti.util.Msg
+			throw new NullPointerException(org.apache.harmony.luni.util.Msg
 					.getString("K0047")); //$NON-NLS-1$
 	}
 
@@ -404,7 +404,7 @@
 
 		readFully(buf, 0, utfSize);
 		String result;
-		result = com.ibm.oti.util.Util.convertUTF8WithBuf(buf, out, 0, utfSize);
+		result = org.apache.harmony.luni.util.Util.convertUTF8WithBuf(buf, out, 0, utfSize);
 		if (!makeBuf)
 			useShared = true;
 		return result;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataOutputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataOutputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/DataOutputStream.java Thu Apr  6 03:42:13 2006
@@ -87,7 +87,7 @@
 			out.write(buffer, offset, count);
 			written += count;
 		} else
-			throw new NullPointerException(com.ibm.oti.util.Msg
+			throw new NullPointerException(org.apache.harmony.luni.util.Msg
 					.getString("K0047")); //$NON-NLS-1$
 	}
 
@@ -356,7 +356,7 @@
 				writeShort((int) utfCount);
 				writeUTFBytes(str, utfCount);
 			} else
-				throw new UTFDataFormatException(com.ibm.oti.util.Msg
+				throw new UTFDataFormatException(org.apache.harmony.luni.util.Msg
 						.getString("K0068")); //$NON-NLS-1$
 		}
 	}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/File.java Thu Apr  6 03:42:13 2006
@@ -21,7 +21,7 @@
 import java.net.URL;
 import java.security.AccessController;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * File is a class which represents a file name or directory. The file may be
@@ -176,36 +176,36 @@
 
 	private void checkURI(URI uri) {
 		if (!uri.isAbsolute()) {
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString(
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg.getString(
 					"K031a", uri)); //$NON-NLS-1$
 		} else if (!uri.getRawSchemeSpecificPart().startsWith("/")) { //$NON-NLS-1$
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString(
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg.getString(
 					"K031b", uri)); //$NON-NLS-1$
 		}
 
 		String temp = uri.getScheme();
 		if (temp == null || !temp.equals("file")) { //$NON-NLS-1$
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString(
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg.getString(
 					"K031c", uri)); //$NON-NLS-1$
 		}
 
 		temp = uri.getRawPath();
 		if (temp == null || temp.length() == 0) {
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString(
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg.getString(
 					"K031d", uri)); //$NON-NLS-1$
 		}
 
 		if (uri.getRawAuthority() != null) {
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString(
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg.getString(
 					"K031e", new String[] { "authority", uri.toString() })); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
 		if (uri.getRawQuery() != null)
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString(
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg.getString(
 					"K031e", new String[] { "query", uri.toString() }));  //$NON-NLS-1$//$NON-NLS-2$
 
 		if (uri.getRawFragment() != null)
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString(
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg.getString(
 					"K031e", new String[] { "fragment", uri.toString() })); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -228,7 +228,7 @@
 			return new File[0];
 		File result[] = new File[rootsList.length];
 		for (int i = 0; i < rootsList.length; i++)
-			result[i] = new File(com.ibm.oti.util.Util.toString(rootsList[i]));
+			result[i] = new File(org.apache.harmony.luni.util.Util.toString(rootsList[i]));
 		return result;
 	}
 
@@ -334,7 +334,7 @@
 	public int compareTo(Object another) {
 		if (this.getClass() == another.getClass())
 			return this.getPath().compareTo(((File) another).getPath());
-		throw new ClassCastException(com.ibm.oti.util.Msg.getString("K0069")); //$NON-NLS-1$
+		throw new ClassCastException(org.apache.harmony.luni.util.Msg.getString("K0069")); //$NON-NLS-1$
 	}
 
 	/**
@@ -385,7 +385,7 @@
 		if (security != null)
 			security.checkDelete(path);
 
-		com.ibm.oti.util.DeleteOnExit.addFile(com.ibm.oti.util.Util
+		org.apache.harmony.luni.util.DeleteOnExit.addFile(org.apache.harmony.luni.util.Util
 				.toString(properPath(true)));
 	}
 
@@ -438,7 +438,7 @@
 	 */
 	public String getAbsolutePath() {
 		byte[] absolute = properPath(false);
-		return com.ibm.oti.util.Util.toString(absolute);
+		return org.apache.harmony.luni.util.Util.toString(absolute);
 	}
 
 	/**
@@ -552,7 +552,7 @@
 		newResult[newLength] = 0;
 		newResult = getCanonImpl(newResult);
 		newLength = newResult.length;
-		return com.ibm.oti.util.Util.toString(newResult, 0, newLength);
+		return org.apache.harmony.luni.util.Util.toString(newResult, 0, newLength);
 	}
 
 	/**
@@ -656,7 +656,7 @@
 	 * @see #getPath
 	 */
 	public boolean isAbsolute() {
-		return isAbsoluteImpl(com.ibm.oti.util.Util.getBytes(path));
+		return isAbsoluteImpl(org.apache.harmony.luni.util.Util.getBytes(path));
 	}
 
 	private native boolean isAbsoluteImpl(byte[] filePath);
@@ -764,7 +764,7 @@
 				security.checkWrite(path);
 			return (setLastModifiedImpl(properPath(true), time));
 		}
-		throw new IllegalArgumentException(com.ibm.oti.util.Msg
+		throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 				.getString("K006a")); //$NON-NLS-1$
 	}
 
@@ -828,7 +828,7 @@
 			return new String[0];
 		String result[] = new String[implList.length];
 		for (int index = 0; index < implList.length; index++)
-			result[index] = com.ibm.oti.util.Util.toString(implList[index]);
+			result[index] = org.apache.harmony.luni.util.Util.toString(implList[index]);
 		return result;
 	}
 
@@ -912,7 +912,7 @@
 			return new File[0];
 		java.util.Vector tempResult = new java.util.Vector();
 		for (int index = 0; index < implList.length; index++) {
-			String aName = com.ibm.oti.util.Util.toString(implList[index]);
+			String aName = org.apache.harmony.luni.util.Util.toString(implList[index]);
 			File aFile = new File(this, aName);
 			if (filter == null || filter.accept(aFile))
 				tempResult.addElement(aFile);
@@ -950,7 +950,7 @@
 			return new String[0];
 		java.util.Vector tempResult = new java.util.Vector();
 		for (int index = 0; index < implList.length; index++) {
-			String aName = com.ibm.oti.util.Util.toString(implList[index]);
+			String aName = org.apache.harmony.luni.util.Util.toString(implList[index]);
 			if (filter == null || filter.accept(this, aName))
 				tempResult.addElement(aName);
 		}
@@ -1032,9 +1032,9 @@
 		case 1:
 			return false;
 		case 3:
-			throw new IOException(com.ibm.oti.util.Msg.getString("K01c1")); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K01c1")); //$NON-NLS-1$
 		default:
-			throw new IOException(com.ibm.oti.util.Msg.getString("K01c2", path)); //$NON-NLS-1$
+			throw new IOException(org.apache.harmony.luni.util.Msg.getString("K01c2", path)); //$NON-NLS-1$
 		}
 	}
 
@@ -1089,7 +1089,7 @@
 				} while (!result.createNewFile());
 				return result;
 			}
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 					.getString("K006b")); //$NON-NLS-1$
 		}
 		throw new NullPointerException();
@@ -1118,7 +1118,7 @@
 	byte[] properPath(boolean internal) {
 		if (properPath != null)
 			return properPath;
-		byte[] pathBytes = com.ibm.oti.util.Util.getBytes(path);
+		byte[] pathBytes = org.apache.harmony.luni.util.Util.getBytes(path);
 		if (isAbsoluteImpl(pathBytes))
 			return properPath = pathBytes;
 		// Check security by getting user.dir when the path is not absolute
@@ -1131,24 +1131,24 @@
 		if ((properPath = properPathImpl(pathBytes)) != null)
 			return properPath;
 		if (path.length() == 0)
-			return properPath = com.ibm.oti.util.Util.getBytes(userdir);
+			return properPath = org.apache.harmony.luni.util.Util.getBytes(userdir);
 		int length = userdir.length();
 		if (path.charAt(0) == '\\') {
 			if (length > 1 && userdir.charAt(1) == ':') {
-				return properPath = com.ibm.oti.util.Util.getBytes(userdir
+				return properPath = org.apache.harmony.luni.util.Util.getBytes(userdir
 						.substring(0, 2)
 						+ path);
 			}
 			if (length > 0 && userdir.charAt(length - 1) == separatorChar) {
-				return properPath = com.ibm.oti.util.Util.getBytes(userdir
+				return properPath = org.apache.harmony.luni.util.Util.getBytes(userdir
 						+ path.substring(1));
 			}
-			return properPath = com.ibm.oti.util.Util.getBytes(userdir + path);
+			return properPath = org.apache.harmony.luni.util.Util.getBytes(userdir + path);
 		}
 		if (length > 0 && userdir.charAt(length - 1) == separatorChar) {
-			return properPath = com.ibm.oti.util.Util.getBytes(userdir + path);
+			return properPath = org.apache.harmony.luni.util.Util.getBytes(userdir + path);
 		}
-		return properPath = com.ibm.oti.util.Util.getBytes(userdir + separator
+		return properPath = org.apache.harmony.luni.util.Util.getBytes(userdir + separator
 				+ path);
 	}
 

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=391955&r1=391954&r2=391955&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 Apr  6 03:42:13 2006
@@ -107,7 +107,7 @@
 	public FileOutputStream(FileDescriptor fd) {
 		super();
         if (fd == null) {
-            throw new NullPointerException(com.ibm.oti.util.Msg
+            throw new NullPointerException(org.apache.harmony.luni.util.Msg
                     .getString("K006c")); //$NON-NLS-1$
         }
         SecurityManager security = System.getSecurityManager();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FilePermission.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FilePermission.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FilePermission.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FilePermission.java Thu Apr  6 03:42:13 2006
@@ -96,10 +96,10 @@
 				}
 				this.actions = toCanonicalActionString(pathActions);
 			} else
-				throw new NullPointerException(com.ibm.oti.util.Msg
+				throw new NullPointerException(org.apache.harmony.luni.util.Msg
 						.getString("K006e")); //$NON-NLS-1$
 		} else
-			throw new IllegalArgumentException(com.ibm.oti.util.Msg
+			throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg
 					.getString("K006d")); //$NON-NLS-1$
 	}
 
@@ -162,7 +162,7 @@
 				actionInt |= 1;
 			else
 				throw new java.lang.IllegalArgumentException(
-						com.ibm.oti.util.Msg.getString("K006f", action)); //$NON-NLS-1$
+						org.apache.harmony.luni.util.Msg.getString("K006f", action)); //$NON-NLS-1$
 			head = tail + 1;
 		} while (tail > 0);
 		return actionInt;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FilterOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FilterOutputStream.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FilterOutputStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/FilterOutputStream.java Thu Apr  6 03:42:13 2006
@@ -115,7 +115,7 @@
 				// override the write() method.
 				write(buffer[offset + i]);
 		} else
-			throw new ArrayIndexOutOfBoundsException(com.ibm.oti.util.Msg
+			throw new ArrayIndexOutOfBoundsException(org.apache.harmony.luni.util.Msg
 					.getString("K002f")); //$NON-NLS-1$
 	}
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java?rev=391955&r1=391954&r2=391955&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/InputStreamReader.java Thu Apr  6 03:42:13 2006
@@ -13,7 +13,8 @@
  * limitations under the License.
  */
 
-package java.io;
+package java.io; 
+
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -23,7 +24,7 @@
 import java.security.AccessController;
 import java.util.HashMap;
 
-import com.ibm.oti.util.PriviAction;
+import org.apache.harmony.luni.util.PriviAction;
 
 /**
  * InputStreamReader is class for turning a byte Stream into a character Stream.



Mime
View raw message