Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 2151 invoked from network); 6 Apr 2006 10:44:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Apr 2006 10:44:54 -0000 Received: (qmail 21579 invoked by uid 500); 6 Apr 2006 10:44:26 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 21304 invoked by uid 500); 6 Apr 2006 10:44:24 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 21233 invoked by uid 99); 6 Apr 2006 10:44:23 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Apr 2006 03:44:22 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 06 Apr 2006 03:44:18 -0700 Received: (qmail 1637 invoked by uid 65534); 6 Apr 2006 10:43:57 -0000 Message-ID: <20060406104357.1632.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r391955 [5/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 -0000 To: harmony-commits@incubator.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ASN1Encoder.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ASN1Encoder.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ASN1Encoder.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/ASN1Encoder.java Thu Apr 6 03:42:13 2006 @@ -35,7 +35,7 @@ import org.apache.harmony.luni.util.ASN1Decoder.Set2; import org.apache.harmony.luni.util.ASN1Decoder.UTCTime; -import com.ibm.oti.util.Msg; +import org.apache.harmony.luni.util.Msg; /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/BASE64Decoder.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/BASE64Decoder.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/BASE64Decoder.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/BASE64Decoder.java Thu Apr 6 03:42:13 2006 @@ -15,7 +15,7 @@ package org.apache.harmony.luni.util; -import com.ibm.oti.util.Msg; +import org.apache.harmony.luni.util.Msg; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/DefaultPolicy.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/DefaultPolicy.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/DefaultPolicy.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/DefaultPolicy.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/DefaultPolicy.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/DefaultPolicy.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/DefaultPolicy.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; import java.io.File; @@ -786,7 +786,7 @@ * [MSG "K00a2", "Parsing policy file: {0}, expected quoted * {1}, found unquoted: {2}"] */ - System.out.println(com.ibm.oti.util.Msg.getString("K00a2", + System.out.println(org.apache.harmony.luni.util.Msg.getString("K00a2", new Object[] { source, "codeBase", parser.sval })); invalidGrant = true; break; @@ -805,7 +805,7 @@ * [MSG "K00a2", "Parsing policy file: {0}, expected quoted * {1}, found unquoted: {2}"] */ - System.out.println(com.ibm.oti.util.Msg.getString("K00a2", + System.out.println(org.apache.harmony.luni.util.Msg.getString("K00a2", new Object[] { source, "signedBy", parser.sval })); invalidGrant = true; continue; @@ -816,7 +816,7 @@ * [MSG "K00a3", "Parsing policy file: {0}, found unexpected: * {1}"] */ - System.out.println(com.ibm.oti.util.Msg.getString("K00a3", + System.out.println(org.apache.harmony.luni.util.Msg.getString("K00a3", source, parser.sval)); invalidGrant = true; break; @@ -847,7 +847,7 @@ * [MSG "K00a8", "Parsing policy file: {0}, invalid codesource URL: * {1}"] */ - System.out.println(com.ibm.oti.util.Msg.getString("K00a8", source, + System.out.println(org.apache.harmony.luni.util.Msg.getString("K00a8", source, codeBase)); } if (invalidGrant) { @@ -955,7 +955,7 @@ } } /* [MSG "K00a3", "Parsing policy file: {0}, found unexpected: {1}"] */ - System.out.println(com.ibm.oti.util.Msg.getString("K00a3", + System.out.println(org.apache.harmony.luni.util.Msg.getString("K00a3", new Object[] { source, parser.sval })); invalidGrant = true; break; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/DeleteOnExit.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/DeleteOnExit.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/DeleteOnExit.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/DeleteOnExit.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/DeleteOnExit.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/DeleteOnExit.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/DeleteOnExit.java Thu Apr 6 03:42:13 2006 @@ -13,13 +13,13 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; import java.io.File; import java.util.Vector; -import com.ibm.oti.vm.VM; +import org.apache.harmony.kernel.vm.VM; public class DeleteOnExit { private static Vector deleteList = new Vector(); Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/FloatingPointParser.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/FloatingPointParser.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/FloatingPointParser.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Inet6Util.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Inet6Util.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Inet6Util.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; import java.util.ArrayList; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/InvalidJarIndexException.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/InvalidJarIndexException.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/InvalidJarIndexException.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/InvalidJarIndexException.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/InvalidJarIndexException.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/InvalidJarIndexException.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/InvalidJarIndexException.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; /** Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Msg.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Msg.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Msg.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Msg.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Msg.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Msg.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Msg.java Thu Apr 6 03:42:13 2006 @@ -13,14 +13,14 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.oti.vm.MsgHelp; +import org.apache.harmony.luni.util.MsgHelp; /** * This class retrieves strings from a resource bundle and returns them, @@ -28,7 +28,7 @@ *

* It is used by the system classes to provide national language support, by * looking up messages in the - * com.ibm.oti.util.ExternalMessages + * org.apache.harmony.luni.util.ExternalMessages * * resource bundle. Note that if this file is not available, or an invalid key * is looked up, or resource bundle support is not available, the key itself @@ -45,7 +45,7 @@ // Attempt to load the messages. try { bundle = MsgHelp.setLocale(Locale.getDefault(), - "com.ibm.oti.util.ExternalMessages"); + "org.apache.harmony.luni.util.ExternalMessages"); } catch (Throwable e) { e.printStackTrace(); } Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/MsgHelp.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/vm/MsgHelp.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/MsgHelp.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/MsgHelp.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/vm/MsgHelp.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/vm/MsgHelp.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/MsgHelp.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.luni.util; import java.security.AccessController; @@ -22,6 +22,8 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; +import org.apache.harmony.kernel.vm.VM; + /** * This class contains helper methods for loading resource bundles and * formatting external message strings. @@ -103,7 +105,7 @@ static public ResourceBundle setLocale(final Locale locale, final String resource) { try { - final ClassLoader loader = VM.getStackClassLoader(1); + final ClassLoader loader = VM.bootCallerClassLoader(); return (ResourceBundle) AccessController .doPrivileged(new PrivilegedAction() { public Object run() { Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/NumberConverter.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/NumberConverter.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/NumberConverter.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/NumberConverter.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/NumberConverter.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/NumberConverter.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/NumberConverter.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; public final class NumberConverter { Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/OIDDatabase.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/OIDDatabase.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/OIDDatabase.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/OIDDatabase.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/OIDDatabase.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/OIDDatabase.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/OIDDatabase.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; import java.util.HashSet; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PasswordProtectedInputStream.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PasswordProtectedInputStream.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PasswordProtectedInputStream.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PasswordProtectedInputStream.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; import java.io.FilterInputStream; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PositionedInputStream.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PositionedInputStream.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PositionedInputStream.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PositionedInputStream.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PositionedInputStream.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PositionedInputStream.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PositionedInputStream.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; import java.io.FilterInputStream; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PriviAction.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PriviAction.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PriviAction.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PriviAction.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PriviAction.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/PriviAction.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/PriviAction.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; import java.lang.reflect.AccessibleObject; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/SHAOutputStream.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/SHAOutputStream.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/SHAOutputStream.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/SHAOutputStream.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/SHAOutputStream.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/SHAOutputStream.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/SHAOutputStream.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; import java.io.OutputStream; Copied: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Util.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Util.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/com/ibm/oti/util/Util.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java Thu Apr 6 03:42:13 2006 @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ibm.oti.util; +package org.apache.harmony.luni.util; import java.io.ByteArrayOutputStream; Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/URLClassLoaderTest.java Thu Apr 6 03:42:13 2006 @@ -292,7 +292,7 @@ exception = false; try { Class.forName("bpack.Bart", true, ucl); - } catch (com.ibm.oti.util.InvalidJarIndexException e) { + } catch (org.apache.harmony.luni.util.InvalidJarIndexException e) { exception = true; } catch (ClassNotFoundException e) { exception = false; @@ -302,7 +302,7 @@ goodException = false; try { Class.forName("Main4", true, ucl); - } catch (com.ibm.oti.util.InvalidJarIndexException e) { + } catch (org.apache.harmony.luni.util.InvalidJarIndexException e) { goodException = false; } catch (ClassNotFoundException e) { goodException = true; @@ -322,7 +322,7 @@ exception = false; try { Class.forName("cpack.Mock", true, ucl); - } catch (com.ibm.oti.util.InvalidJarIndexException e) { + } catch (org.apache.harmony.luni.util.InvalidJarIndexException e) { exception = false; } catch (ClassNotFoundException e) { exception = true; 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=391955&r1=391954&r2=391955&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 Apr 6 03:42:13 2006 @@ -5,7 +5,7 @@ Bundle-Version: 1.0.0 Bundle-ClassPath: . Eclipse-JREBundle: true -Import-Package: com.ibm.oti.vm, +Import-Package: org.apache.harmony.kernel.vm, java.io, java.lang, java.lang.ref, Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/META-INF/MANIFEST.MF?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/prefs/META-INF/MANIFEST.MF (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/META-INF/MANIFEST.MF Thu Apr 6 03:42:13 2006 @@ -15,7 +15,7 @@ java.nio.charset, java.util, javax.xml.parsers, - com.ibm.oti.util, + org.apache.harmony.luni.util, javax.xml.transform, org.apache.xpath, org.w3c.dom, Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/META-INF/MANIFEST.MF?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/sql/META-INF/MANIFEST.MF (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/sql/META-INF/MANIFEST.MF Thu Apr 6 03:42:13 2006 @@ -8,7 +8,7 @@ Import-Package: java.lang, java.util, java.io, - com.ibm.oti.vm, + org.apache.harmony.kernel.vm, java.security, java.math, java.net, Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java Thu Apr 6 03:42:13 2006 @@ -22,8 +22,8 @@ import java.io.PrintWriter; import java.util.HashSet; import java.util.Vector; -import com.ibm.common.ClassUtils; -import com.ibm.oti.vm.VM; +import org.apache.harmony.sql.internal.common.ClassUtils; +import org.apache.harmony.kernel.vm.VM; /** * Provides facilities for managing JDBC Drivers. Copied: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/common/ClassUtils.java (from r389444, incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/com/ibm/common/ClassUtils.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/common/ClassUtils.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/common/ClassUtils.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/com/ibm/common/ClassUtils.java&r1=389444&r2=391955&rev=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/com/ibm/common/ClassUtils.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/common/ClassUtils.java Thu Apr 6 03:42:13 2006 @@ -14,7 +14,7 @@ */ -package com.ibm.common; +package org.apache.harmony.sql.internal.common; /** * A class containing sets of utility functions relating to Classes, ClassLoaders and associated Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/META-INF/MANIFEST.MF Thu Apr 6 03:42:13 2006 @@ -10,5 +10,5 @@ java.net, java.io, java.security, - com.ibm.oti.util + org.apache.harmony.luni.util Export-Package: java.text Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/AttributedCharacterIterator.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/AttributedCharacterIterator.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/AttributedCharacterIterator.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/AttributedCharacterIterator.java Thu Apr 6 03:42:13 2006 @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Set; -import com.ibm.oti.util.Msg; +import org.apache.harmony.luni.util.Msg; /** * AttributedCharacterIterator Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/AttributedString.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/AttributedString.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/AttributedString.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/AttributedString.java Thu Apr 6 03:42:13 2006 @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; -import com.ibm.oti.util.Msg; +import org.apache.harmony.luni.util.Msg; /** * AttributedString Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Collator.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Collator.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Collator.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Collator.java Thu Apr 6 03:42:13 2006 @@ -21,7 +21,7 @@ import java.util.Locale; import java.util.Vector; -import com.ibm.oti.util.PriviAction; +import org.apache.harmony.luni.util.PriviAction; /** * Collator is an abstract class which is the root of classes which provide Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/DateFormat.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/DateFormat.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/DateFormat.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/DateFormat.java Thu Apr 6 03:42:13 2006 @@ -23,7 +23,7 @@ import java.util.ResourceBundle; import java.util.TimeZone; -import com.ibm.oti.util.Msg; +import org.apache.harmony.luni.util.Msg; /** * DateFormat is the abstract superclass of formats which format and parse Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/DecimalFormat.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/DecimalFormat.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/DecimalFormat.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/DecimalFormat.java Thu Apr 6 03:42:13 2006 @@ -23,7 +23,7 @@ import java.util.Locale; import java.util.Vector; -import com.ibm.oti.util.Msg; +import org.apache.harmony.luni.util.Msg; /** * DecimalFormat is used to format and parse numbers, both integers and @@ -1814,7 +1814,7 @@ || getMaximumIntegerDigits() > DOUBLE_INTEGER_DIGITS || getMinimumFractionDigits() > DOUBLE_FRACTION_DIGITS || getMaximumFractionDigits() > DOUBLE_FRACTION_DIGITS) - throw new InvalidObjectException(com.ibm.oti.util.Msg + throw new InvalidObjectException(org.apache.harmony.luni.util.Msg .getString("K00f9")); } Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Format.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Format.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Format.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/Format.java Thu Apr 6 03:42:13 2006 @@ -22,7 +22,7 @@ import java.util.Locale; import java.util.ResourceBundle; -import com.ibm.oti.util.Msg; +import org.apache.harmony.luni.util.Msg; /** * Format is the abstract superclass of classes which format and parse objects Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/MessageFormat.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/MessageFormat.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/MessageFormat.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/MessageFormat.java Thu Apr 6 03:42:13 2006 @@ -27,7 +27,7 @@ import java.util.Locale; import java.util.Vector; -import com.ibm.oti.util.Msg; +import org.apache.harmony.luni.util.Msg; /** * MessageFormat is used to format and parse arguments based on a pattern. The Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/NumberFormat.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/NumberFormat.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/NumberFormat.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/NumberFormat.java Thu Apr 6 03:42:13 2006 @@ -25,7 +25,7 @@ import java.util.Locale; import java.util.ResourceBundle; -import com.ibm.oti.util.Msg; +import org.apache.harmony.luni.util.Msg; /** * NumberFormat is the abstract superclass of Formats which format and parse @@ -614,11 +614,11 @@ } if (minimumIntegerDigits > maximumIntegerDigits || minimumFractionDigits > maximumFractionDigits) - throw new InvalidObjectException(com.ibm.oti.util.Msg + throw new InvalidObjectException(org.apache.harmony.luni.util.Msg .getString("K00fa")); if (minimumIntegerDigits < 0 || maximumIntegerDigits < 0 || minimumFractionDigits < 0 || maximumFractionDigits < 0) - throw new InvalidObjectException(com.ibm.oti.util.Msg + throw new InvalidObjectException(org.apache.harmony.luni.util.Msg .getString("K00fb")); } Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/SimpleDateFormat.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/SimpleDateFormat.java?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/SimpleDateFormat.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/text/src/main/java/java/text/SimpleDateFormat.java Thu Apr 6 03:42:13 2006 @@ -136,7 +136,7 @@ int field = -1; int index = patternChars.indexOf(format); if (index == -1) - throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString( + throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg.getString( "K002b", format)); int beginPosition = buffer.length(); @@ -471,7 +471,7 @@ private void validateFormat(char format) { int index = patternChars.indexOf(format); if (index == -1) - throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString( + throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg.getString( "K002b", format)); } @@ -527,7 +527,7 @@ validateFormat((char) last); if (quote) - throw new IllegalArgumentException(com.ibm.oti.util.Msg + throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg .getString("K0019")); } @@ -644,7 +644,7 @@ private int parse(String string, int offset, char format, int count) { int index = patternChars.indexOf(format); if (index == -1) - throw new IllegalArgumentException(com.ibm.oti.util.Msg.getString( + throw new IllegalArgumentException(org.apache.harmony.luni.util.Msg.getString( "K002b", format)); int field = -1; int absolute = 0; Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/jclprots.h URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/jclprots.h?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/jclprots.h (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/jclprots.h Thu Apr 6 03:42:13 2006 @@ -78,9 +78,9 @@ void JNICALL Java_java_io_FileOutputStream_oneTimeInitialization PROTOTYPE((JNIEnv * env, jclass clazz)); /* NativesCommonDoubleParsing*/ -JNIEXPORT jdouble JNICALL Java_com_ibm_oti_util_FloatingPointParser_parseDblImpl +JNIEXPORT jdouble JNICALL Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl PROTOTYPE((JNIEnv *env, jclass clazz, jstring s, jint e)); -JNIEXPORT void JNICALL Java_com_ibm_oti_util_NumberConverter_bigIntDigitGeneratorInstImpl +JNIEXPORT void JNICALL Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl PROTOTYPE((JNIEnv *env, jobject inst, jlong f, jint e, jboolean isDenormalized, jboolean mantissaIsZero, jint p)); /* NativesCommonAdler32*/ @@ -307,7 +307,7 @@ void JNICALL Java_com_ibm_oti_connection_file_FileOutputStream_closeImpl PROTOTYPE((JNIEnv * env, jobject recv, jlong descriptor)); /* NativesCommonFloatParsing*/ -JNIEXPORT jfloat JNICALL Java_com_ibm_oti_util_FloatingPointParser_parseFltImpl +JNIEXPORT jfloat JNICALL Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl PROTOTYPE((JNIEnv *env, jclass clazz, jstring s, jint e)); /* NativesCommonNetHelpers*/ @@ -406,21 +406,21 @@ jboolean JNICALL Java_java_io_FileDescriptor_valid PROTOTYPE((JNIEnv * env, jobject recv)); /* NativesCommonProcess*/ -jint JNICALL Java_com_ibm_oti_lang_ProcessInputStream_availableImpl PROTOTYPE((JNIEnv * env, jobject recv)); -void JNICALL Java_com_ibm_oti_lang_ProcessInputStream_oneTimeInitialization PROTOTYPE((JNIEnv * env, jclass clazz)); -void JNICALL Java_com_ibm_oti_lang_SystemProcess_destroyImpl PROTOTYPE((JNIEnv * env, jobject recv)); -void JNICALL Java_com_ibm_oti_lang_ProcessOutputStream_writeImpl PROTOTYPE((JNIEnv *env, jobject recv, jbyteArray buffer, jint offset, jint nbytes,jlong handle)); -jint JNICALL Java_com_ibm_oti_lang_SystemProcess_waitForCompletionImpl PROTOTYPE((JNIEnv * env, jobject recv)); -void JNICALL Java_com_ibm_oti_lang_SystemProcess_closeImpl PROTOTYPE((JNIEnv * env, jobject recv)); -void JNICALL Java_com_ibm_oti_lang_ProcessOutputStream_closeImpl PROTOTYPE((JNIEnv *env, jobject recv)); -void JNICALL Java_com_ibm_oti_lang_ProcessOutputStream_oneTimeInitialization PROTOTYPE((JNIEnv * env, jclass clazz)); -jint JNICALL Java_com_ibm_oti_lang_ProcessInputStream_readImpl PROTOTYPE((JNIEnv *env, jobject recv, jbyteArray buffer, jint offset, jint nbytes, jlong handle)); -void JNICALL Java_com_ibm_oti_lang_ProcessOutputStream_setFDImpl PROTOTYPE((JNIEnv *env, jobject recv, jobject arg1, jlong arg2)); -void JNICALL Java_com_ibm_oti_lang_ProcessInputStream_closeImpl PROTOTYPE((JNIEnv * env, jobject recv)); -jlongArray JNICALL Java_com_ibm_oti_lang_SystemProcess_createImpl PROTOTYPE((JNIEnv * env, jclass clazz, jobject recv, +jint JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_availableImpl PROTOTYPE((JNIEnv * env, jobject recv)); +void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_oneTimeInitialization PROTOTYPE((JNIEnv * env, jclass clazz)); +void JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_destroyImpl PROTOTYPE((JNIEnv * env, jobject recv)); +void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_writeImpl PROTOTYPE((JNIEnv *env, jobject recv, jbyteArray buffer, jint offset, jint nbytes,jlong handle)); +jint JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_waitForCompletionImpl PROTOTYPE((JNIEnv * env, jobject recv)); +void JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_closeImpl PROTOTYPE((JNIEnv * env, jobject recv)); +void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_closeImpl PROTOTYPE((JNIEnv *env, jobject recv)); +void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_oneTimeInitialization PROTOTYPE((JNIEnv * env, jclass clazz)); +jint JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_readImpl PROTOTYPE((JNIEnv *env, jobject recv, jbyteArray buffer, jint offset, jint nbytes, jlong handle)); +void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_setFDImpl PROTOTYPE((JNIEnv *env, jobject recv, jobject arg1, jlong arg2)); +void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_closeImpl PROTOTYPE((JNIEnv * env, jobject recv)); +jlongArray JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_createImpl PROTOTYPE((JNIEnv * env, jclass clazz, jobject recv, jobjectArray arg1, jobjectArray arg2, jbyteArray dir)); -void JNICALL Java_com_ibm_oti_lang_ProcessInputStream_setFDImpl PROTOTYPE((JNIEnv *env, jobject recv, jobject arg1, jlong arg2)); -void JNICALL Java_com_ibm_oti_lang_SystemProcess_oneTimeInitialization PROTOTYPE((JNIEnv * env, jclass clazz)); +void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_setFDImpl PROTOTYPE((JNIEnv *env, jobject recv, jobject arg1, jlong arg2)); +void JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_oneTimeInitialization PROTOTYPE((JNIEnv * env, jclass clazz)); /* NativesCommonServerSocket*/ void JNICALL Java_com_ibm_oti_connection_serversocket_Connection_acceptStreamSocketImpl PROTOTYPE((JNIEnv *env, @@ -460,11 +460,11 @@ ** COMPONENT: NativesCommonFileSystem ************************************************************/ /* NativesCommonVMFileSystem*/ -jbyteArray JNICALL Java_com_ibm_oti_vm_VM_getPathFromClassPath PROTOTYPE((JNIEnv * env, jclass clazz, jint cpIndex)); -jbyteArray JNICALL Java_com_ibm_oti_vm_VM_readManifestFromClassPath PROTOTYPE((JNIEnv * env, jclass clazz, jint cpIndex)); -jbyteArray JNICALL Java_com_ibm_oti_vm_VM_readZip PROTOTYPE((JNIEnv * env, jclass clazz, jbyteArray zipName, jstring fileNameString)); -jbyteArray JNICALL Java_com_ibm_oti_vm_VM_readZipFromClassPath PROTOTYPE((JNIEnv * env, jclass clazz, jint cpIndex, jstring fileNameString)); -jbyteArray JNICALL Java_com_ibm_oti_vm_VM_readManifest PROTOTYPE((JNIEnv * env, jclass clazz, jbyteArray zipName)); +jbyteArray JNICALL Java_org_apache_harmony_kernel_vm_VM_getPathFromClassPath PROTOTYPE((JNIEnv * env, jclass clazz, jint cpIndex)); +jbyteArray JNICALL Java_org_apache_harmony_kernel_vm_VM_readManifestFromClassPath PROTOTYPE((JNIEnv * env, jclass clazz, jint cpIndex)); +jbyteArray JNICALL Java_org_apache_harmony_kernel_vm_VM_readZip PROTOTYPE((JNIEnv * env, jclass clazz, jbyteArray zipName, jstring fileNameString)); +jbyteArray JNICALL Java_org_apache_harmony_kernel_vm_VM_readZipFromClassPath PROTOTYPE((JNIEnv * env, jclass clazz, jint cpIndex, jstring fileNameString)); +jbyteArray JNICALL Java_org_apache_harmony_kernel_vm_VM_readManifest PROTOTYPE((JNIEnv * env, jclass clazz, jbyteArray zipName)); /************************************************************ ** COMPONENT: NativesUNIX Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp Thu Apr 6 03:42:13 2006 @@ -1,27 +1,27 @@ HYLUNI_0.1 { global : - Java_com_ibm_oti_lang_ProcessInputStream_availableImpl; - Java_com_ibm_oti_lang_ProcessInputStream_closeImpl; - Java_com_ibm_oti_lang_ProcessInputStream_oneTimeInitialization; - Java_com_ibm_oti_lang_ProcessInputStream_readImpl; - Java_com_ibm_oti_lang_ProcessInputStream_setFDImpl; - Java_com_ibm_oti_lang_ProcessOutputStream_closeImpl; - Java_com_ibm_oti_lang_ProcessOutputStream_oneTimeInitialization; - Java_com_ibm_oti_lang_ProcessOutputStream_setFDImpl; - Java_com_ibm_oti_lang_ProcessOutputStream_writeImpl; - Java_com_ibm_oti_lang_SystemProcess_closeImpl; - Java_com_ibm_oti_lang_SystemProcess_createImpl; - Java_com_ibm_oti_lang_SystemProcess_destroyImpl; - Java_com_ibm_oti_lang_SystemProcess_oneTimeInitialization; - Java_com_ibm_oti_lang_SystemProcess_waitForCompletionImpl; - Java_com_ibm_oti_util_math_BigInteger_addImpl; - Java_com_ibm_oti_util_math_BigInteger_compImpl; - Java_com_ibm_oti_util_math_BigInteger_divImpl; - Java_com_ibm_oti_util_math_BigInteger_mulImpl; - Java_com_ibm_oti_util_math_BigInteger_negImpl; - Java_com_ibm_oti_util_math_BigInteger_remImpl; - Java_com_ibm_oti_util_math_BigInteger_shlImpl; - Java_com_ibm_oti_util_math_BigInteger_subImpl; + Java_org_apache_harmony_luni_internal_process_ProcessInputStream_availableImpl; + Java_org_apache_harmony_luni_internal_process_ProcessInputStream_closeImpl; + Java_org_apache_harmony_luni_internal_process_ProcessInputStream_oneTimeInitialization; + Java_org_apache_harmony_luni_internal_process_ProcessInputStream_readImpl; + Java_org_apache_harmony_luni_internal_process_ProcessInputStream_setFDImpl; + Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_closeImpl; + Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_oneTimeInitialization; + Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_setFDImpl; + Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_writeImpl; + Java_org_apache_harmony_luni_internal_process_SystemProcess_closeImpl; + Java_org_apache_harmony_luni_internal_process_SystemProcess_createImpl; + Java_org_apache_harmony_luni_internal_process_SystemProcess_destroyImpl; + Java_org_apache_harmony_luni_internal_process_SystemProcess_oneTimeInitialization; + Java_org_apache_harmony_luni_internal_process_SystemProcess_waitForCompletionImpl; + Java_org_apache_harmony_math_util_BigInteger_addImpl; + Java_org_apache_harmony_math_util_BigInteger_compImpl; + Java_org_apache_harmony_math_util_BigInteger_divImpl; + Java_org_apache_harmony_math_util_BigInteger_mulImpl; + Java_org_apache_harmony_math_util_BigInteger_negImpl; + Java_org_apache_harmony_math_util_BigInteger_remImpl; + Java_org_apache_harmony_math_util_BigInteger_shlImpl; + Java_org_apache_harmony_math_util_BigInteger_subImpl; Java_java_io_File_deleteDirImpl; Java_java_io_File_deleteFileImpl; Java_java_io_File_existsImpl; @@ -215,6 +215,5 @@ Java_org_apache_harmony_luni_platform_OSNetworkSystem_getHostByAddrImpl; Java_org_apache_harmony_luni_platform_OSNetworkSystem_getHostByNameImpl; Java_org_apache_harmony_luni_platform_OSNetworkSystem_setInetAddressImpl; - Java_org_apache_harmony_luni_platform_OSNetworkSystem_isReachableByPing; local : *; }; Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/libhymath.exp URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/libhymath.exp?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/libhymath.exp (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/libhymath.exp Thu Apr 6 03:42:13 2006 @@ -1,16 +1,16 @@ HYMATH_0.1 { global : - Java_com_ibm_oti_util_FloatingPointParser_parseDblImpl; - Java_com_ibm_oti_util_FloatingPointParser_parseFltImpl; - Java_com_ibm_oti_util_math_BigInteger_addImpl; - Java_com_ibm_oti_util_math_BigInteger_compImpl; - Java_com_ibm_oti_util_math_BigInteger_divImpl; - Java_com_ibm_oti_util_math_BigInteger_mulImpl; - Java_com_ibm_oti_util_math_BigInteger_negImpl; - Java_com_ibm_oti_util_math_BigInteger_remImpl; - Java_com_ibm_oti_util_math_BigInteger_shlImpl; - Java_com_ibm_oti_util_math_BigInteger_subImpl; - Java_com_ibm_oti_util_NumberConverter_bigIntDigitGeneratorInstImpl; + Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl; + Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl; + Java_org_apache_harmony_math_util_BigInteger_addImpl; + Java_org_apache_harmony_math_util_BigInteger_compImpl; + Java_org_apache_harmony_math_util_BigInteger_divImpl; + Java_org_apache_harmony_math_util_BigInteger_mulImpl; + Java_org_apache_harmony_math_util_BigInteger_negImpl; + Java_org_apache_harmony_math_util_BigInteger_remImpl; + Java_org_apache_harmony_math_util_BigInteger_shlImpl; + Java_org_apache_harmony_math_util_BigInteger_subImpl; + Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl; JNI_OnLoad; JNI_OnUnload; local : *; Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/main.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/main.c?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/main.c (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/launcher/main.c Thu Apr 6 03:42:13 2006 @@ -642,7 +642,7 @@ HYNLS_EXELIB_INTERNAL_VM_ERR_OUT_OF_MEMORY); return 1; } - strcpy (mainClassJar, "com.ibm.oti.vm.JarRunner"); + strcpy (mainClassJar, "org.apache.harmony.kernel.vm.JarRunner"); } } /* entries from command line, properties file, 3 defaults plus the port library option */ Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/bigint.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/bigint.c?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/bigint.c (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/bigint.c Thu Apr 6 03:42:13 2006 @@ -112,7 +112,7 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_addImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_addImpl (JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2) { @@ -120,7 +120,7 @@ } jint JNICALL -Java_com_ibm_oti_util_math_BigInteger_compImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_compImpl (JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2) { @@ -182,7 +182,7 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_divImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_divImpl (JNIEnv * env, jclass cls, jlongArray topObject, jlongArray bottomObject) { @@ -461,7 +461,7 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_mulImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_mulImpl (JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2) { @@ -595,14 +595,14 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_negImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_negImpl (JNIEnv * env, jclass cls, jlongArray src) { return internalBigIntegerNeg (env, src); } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_remImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_remImpl (JNIEnv * env, jclass cls, jlongArray topObject, jlongArray bottomObject) { @@ -925,7 +925,7 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_shlImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_shlImpl (JNIEnv * env, jclass cls, jlongArray src, jint shiftval) { IDATA len, lenR; @@ -1061,7 +1061,7 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_subImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_subImpl (JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2) { Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/bigint.h URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/bigint.h?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/bigint.h (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/bigint.h Thu Apr 6 03:42:13 2006 @@ -15,22 +15,22 @@ #if !defined(bigint_h) #define bigint_h -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_subImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_subImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_divImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_divImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray topObject, jlongArray bottomObject)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_mulImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_mulImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_negImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_negImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_addImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_addImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_remImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_remImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray topObject, jlongArray bottomObject)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_shlImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_shlImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src, jint shiftval)); -jint JNICALL Java_com_ibm_oti_util_math_BigInteger_compImpl +jint JNICALL Java_org_apache_harmony_math_util_BigInteger_compImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2)); #endif /* bigint_h */ Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/jclglob.h URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/jclglob.h?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/jclglob.h (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/jclglob.h Thu Apr 6 03:42:13 2006 @@ -25,11 +25,11 @@ jfieldID FID_java_io_FileDescriptor_descriptor; jfieldID FID_java_io_FileInputStream_fd; jfieldID FID_java_io_FileOutputStream_fd; - jfieldID FID_com_ibm_oti_lang_ProcessInputStream_handle; - jfieldID FID_com_ibm_oti_lang_ProcessInputStream_fd; - jfieldID FID_com_ibm_oti_lang_ProcessOutputStream_handle; - jfieldID FID_com_ibm_oti_lang_ProcessOutputStream_fd; - jfieldID FID_com_ibm_oti_lang_SystemProcess_handle; + jfieldID FID_org_apache_harmony_luni_internal_process_ProcessInputStream_handle; + jfieldID FID_org_apache_harmony_luni_internal_process_ProcessInputStream_fd; + jfieldID FID_org_apache_harmony_luni_internal_process_ProcessOutputStream_handle; + jfieldID FID_org_apache_harmony_luni_internal_process_ProcessOutputStream_fd; + jfieldID FID_org_apache_harmony_luni_internal_process_SystemProcess_handle; jfieldID FID_java_net_SocketImpl_address; jfieldID FID_java_net_SocketImpl_port; jfieldID FID_java_net_DatagramPacket_length; Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/netif.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/netif.c?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/netif.c (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/netif.c Thu Apr 6 03:42:13 2006 @@ -89,7 +89,7 @@ return NULL; } - utilClass = (*env)->FindClass (env, "com/ibm/oti/util/Util"); + utilClass = (*env)->FindClass (env, "org/apache/harmony/luni/util/Util"); if (!utilClass) { return NULL; Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/process.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/process.c?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/process.c (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/process.c Thu Apr 6 03:42:13 2006 @@ -23,7 +23,7 @@ * environment and arguments */ jlongArray JNICALL -Java_com_ibm_oti_lang_SystemProcess_createImpl (JNIEnv * env, jclass clazz, +Java_org_apache_harmony_luni_internal_process_SystemProcess_createImpl (JNIEnv * env, jclass clazz, jobject recv, jobjectArray arg1, jobjectArray arg2, @@ -150,41 +150,41 @@ /* Kill the receiver */ void JNICALL -Java_com_ibm_oti_lang_SystemProcess_destroyImpl (JNIEnv * env, jobject recv) +Java_org_apache_harmony_luni_internal_process_SystemProcess_destroyImpl (JNIEnv * env, jobject recv) { jlong pHandle; pHandle = (*env)->GetLongField (env, recv, JCL_CACHE_GET (env, - FID_com_ibm_oti_lang_SystemProcess_handle)); + FID_org_apache_harmony_luni_internal_process_SystemProcess_handle)); termProc ((IDATA) pHandle); } /* Close the input stream*/ void JNICALL -Java_com_ibm_oti_lang_ProcessInputStream_closeImpl (JNIEnv * env, +Java_org_apache_harmony_luni_internal_process_ProcessInputStream_closeImpl (JNIEnv * env, jobject recv) { PORT_ACCESS_FROM_ENV (env); new_ioh_close (env, recv, JCL_CACHE_GET (env, - FID_com_ibm_oti_lang_ProcessInputStream_fd)); + FID_org_apache_harmony_luni_internal_process_ProcessInputStream_fd)); } void JNICALL -Java_com_ibm_oti_lang_ProcessOutputStream_closeImpl (JNIEnv * env, +Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_closeImpl (JNIEnv * env, jobject recv) { PORT_ACCESS_FROM_ENV (env); new_ioh_close (env, recv, JCL_CACHE_GET (env, - FID_com_ibm_oti_lang_ProcessOutputStream_fd)); + FID_org_apache_harmony_luni_internal_process_ProcessOutputStream_fd)); } /* Read nbytes from the receiver */ jint JNICALL -Java_com_ibm_oti_lang_ProcessInputStream_readImpl (JNIEnv * env, jobject recv, +Java_org_apache_harmony_luni_internal_process_ProcessInputStream_readImpl (JNIEnv * env, jobject recv, jbyteArray buffer, jint offset, jint nbytes, jlong handle) @@ -197,7 +197,7 @@ /* Return the number of byes available to be read without blocking */ jint JNICALL -Java_com_ibm_oti_lang_ProcessInputStream_availableImpl (JNIEnv * env, +Java_org_apache_harmony_luni_internal_process_ProcessInputStream_availableImpl (JNIEnv * env, jobject recv) { jlong sHandle; @@ -206,7 +206,7 @@ sHandle = (*env)->GetLongField (env, recv, JCL_CACHE_GET (env, - FID_com_ibm_oti_lang_ProcessInputStream_handle)); + FID_org_apache_harmony_luni_internal_process_ProcessInputStream_handle)); retVal = getAvailable ((jint)sHandle); if (retVal < 0) { @@ -219,7 +219,7 @@ /* Write nbytes to the receiver */ void JNICALL -Java_com_ibm_oti_lang_ProcessOutputStream_writeImpl (JNIEnv * env, +Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_writeImpl (JNIEnv * env, jobject recv, jbyteArray buffer, jint offset, jint nbytes, @@ -232,7 +232,7 @@ /* Set the descriptor field od the receiver */ void JNICALL -Java_com_ibm_oti_lang_ProcessInputStream_setFDImpl (JNIEnv * env, +Java_org_apache_harmony_luni_internal_process_ProcessInputStream_setFDImpl (JNIEnv * env, jobject recv, jobject arg1, jlong arg2) { @@ -240,7 +240,7 @@ } void JNICALL -Java_com_ibm_oti_lang_ProcessOutputStream_setFDImpl (JNIEnv * env, +Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_setFDImpl (JNIEnv * env, jobject recv, jobject arg1, jlong arg2) { @@ -249,29 +249,29 @@ /* Wait for the receiver to finish then return the exit value */ jint JNICALL -Java_com_ibm_oti_lang_SystemProcess_waitForCompletionImpl (JNIEnv * env, +Java_org_apache_harmony_luni_internal_process_SystemProcess_waitForCompletionImpl (JNIEnv * env, jobject recv) { jlong pHandle; pHandle = (*env)->GetLongField (env, recv, JCL_CACHE_GET (env, - FID_com_ibm_oti_lang_SystemProcess_handle)); + FID_org_apache_harmony_luni_internal_process_SystemProcess_handle)); return (jint) waitForProc ((IDATA) pHandle); } void JNICALL -Java_com_ibm_oti_lang_SystemProcess_oneTimeInitialization (JNIEnv * env, +Java_org_apache_harmony_luni_internal_process_SystemProcess_oneTimeInitialization (JNIEnv * env, jclass clazz) { jfieldID fid = (*env)->GetFieldID (env, clazz, "handle", "J"); if (!fid) return; - JCL_CACHE_SET (env, FID_com_ibm_oti_lang_SystemProcess_handle, fid); + JCL_CACHE_SET (env, FID_org_apache_harmony_luni_internal_process_SystemProcess_handle, fid); } void JNICALL -Java_com_ibm_oti_lang_ProcessOutputStream_oneTimeInitialization (JNIEnv * env, +Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_oneTimeInitialization (JNIEnv * env, jclass clazz) { jfieldID fid; @@ -279,16 +279,16 @@ fid = (*env)->GetFieldID (env, clazz, "handle", "J"); if (!fid) return; - JCL_CACHE_SET (env, FID_com_ibm_oti_lang_ProcessOutputStream_handle, fid); + JCL_CACHE_SET (env, FID_org_apache_harmony_luni_internal_process_ProcessOutputStream_handle, fid); fid = (*env)->GetFieldID (env, clazz, "fd", "Ljava/io/FileDescriptor;"); if (!fid) return; - JCL_CACHE_SET (env, FID_com_ibm_oti_lang_ProcessOutputStream_fd, fid); + JCL_CACHE_SET (env, FID_org_apache_harmony_luni_internal_process_ProcessOutputStream_fd, fid); } void JNICALL -Java_com_ibm_oti_lang_ProcessInputStream_oneTimeInitialization (JNIEnv * env, +Java_org_apache_harmony_luni_internal_process_ProcessInputStream_oneTimeInitialization (JNIEnv * env, jclass clazz) { jfieldID fid; @@ -296,22 +296,22 @@ fid = (*env)->GetFieldID (env, clazz, "handle", "J"); if (!fid) return; - JCL_CACHE_SET (env, FID_com_ibm_oti_lang_ProcessInputStream_handle, fid); + JCL_CACHE_SET (env, FID_org_apache_harmony_luni_internal_process_ProcessInputStream_handle, fid); fid = (*env)->GetFieldID (env, clazz, "fd", "Ljava/io/FileDescriptor;"); if (!fid) return; - JCL_CACHE_SET (env, FID_com_ibm_oti_lang_ProcessInputStream_fd, fid); + JCL_CACHE_SET (env, FID_org_apache_harmony_luni_internal_process_ProcessInputStream_fd, fid); } /* Close the handle */ void JNICALL -Java_com_ibm_oti_lang_SystemProcess_closeImpl (JNIEnv * env, jobject recv) +Java_org_apache_harmony_luni_internal_process_SystemProcess_closeImpl (JNIEnv * env, jobject recv) { jlong pHandle; pHandle = (*env)->GetLongField (env, recv, JCL_CACHE_GET (env, - FID_com_ibm_oti_lang_SystemProcess_handle)); + FID_org_apache_harmony_luni_internal_process_SystemProcess_handle)); closeProc ((IDATA) pHandle); } Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/bigint.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/bigint.c?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/bigint.c (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/bigint.c Thu Apr 6 03:42:13 2006 @@ -112,7 +112,7 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_addImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_addImpl (JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2) { @@ -120,7 +120,7 @@ } jint JNICALL -Java_com_ibm_oti_util_math_BigInteger_compImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_compImpl (JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2) { @@ -182,7 +182,7 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_divImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_divImpl (JNIEnv * env, jclass cls, jlongArray topObject, jlongArray bottomObject) { @@ -461,7 +461,7 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_mulImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_mulImpl (JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2) { @@ -595,14 +595,14 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_negImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_negImpl (JNIEnv * env, jclass cls, jlongArray src) { return internalBigIntegerNeg (env, src); } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_remImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_remImpl (JNIEnv * env, jclass cls, jlongArray topObject, jlongArray bottomObject) { @@ -920,7 +920,7 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_shlImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_shlImpl (JNIEnv * env, jclass cls, jlongArray src, jint shiftval) { IDATA len, lenR; @@ -1056,7 +1056,7 @@ } jlongArray JNICALL -Java_com_ibm_oti_util_math_BigInteger_subImpl (JNIEnv * env, jclass cls, +Java_org_apache_harmony_math_util_BigInteger_subImpl (JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2) { Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/bigint.h URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/bigint.h?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/bigint.h (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/bigint.h Thu Apr 6 03:42:13 2006 @@ -15,22 +15,22 @@ #if !defined(bigint_h) #define bigint_h -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_subImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_subImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_divImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_divImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray topObject, jlongArray bottomObject)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_mulImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_mulImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_negImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_negImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_addImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_addImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_remImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_remImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray topObject, jlongArray bottomObject)); -jlongArray JNICALL Java_com_ibm_oti_util_math_BigInteger_shlImpl +jlongArray JNICALL Java_org_apache_harmony_math_util_BigInteger_shlImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src, jint shiftval)); -jint JNICALL Java_com_ibm_oti_util_math_BigInteger_compImpl +jint JNICALL Java_org_apache_harmony_math_util_BigInteger_compImpl PROTOTYPE ((JNIEnv * env, jclass cls, jlongArray src1, jlongArray src2)); #endif /* bigint_h */ Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/dblparse.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/dblparse.c?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/dblparse.c (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/dblparse.c Thu Apr 6 03:42:13 2006 @@ -33,11 +33,11 @@ #define DEFAULT_WIDTH MAX_ACCURACY_WIDTH JNIEXPORT jdouble JNICALL -Java_com_ibm_oti_util_FloatingPointParser_parseDblImpl (JNIEnv * env, +Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl (JNIEnv * env, jclass clazz, jstring s, jint e); JNIEXPORT void JNICALL -Java_com_ibm_oti_util_NumberConverter_bigIntDigitGeneratorInstImpl (JNIEnv * +Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl (JNIEnv * env, jobject inst, @@ -622,7 +622,7 @@ #endif JNIEXPORT jdouble JNICALL -Java_com_ibm_oti_util_FloatingPointParser_parseDblImpl (JNIEnv * env, +Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl (JNIEnv * env, jclass clazz, jstring s, jint e) { @@ -681,7 +681,7 @@ * */ JNIEXPORT void JNICALL -Java_com_ibm_oti_util_NumberConverter_bigIntDigitGeneratorInstImpl (JNIEnv * +Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl (JNIEnv * env, jobject inst, Modified: incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/fltparse.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/fltparse.c?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/fltparse.c (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/fltparse.c Thu Apr 6 03:42:13 2006 @@ -30,7 +30,7 @@ #define DEFAULT_WIDTH MAX_ACCURACY_WIDTH JNIEXPORT jfloat JNICALL -Java_com_ibm_oti_util_FloatingPointParser_parseFltImpl (JNIEnv * env, +Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl (JNIEnv * env, jclass clazz, jstring s, jint e); @@ -525,7 +525,7 @@ #endif JNIEXPORT jfloat JNICALL -Java_com_ibm_oti_util_FloatingPointParser_parseFltImpl (JNIEnv * env, +Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl (JNIEnv * env, jclass clazz, jstring s, jint e) { Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/jclprots.h URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/jclprots.h?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/jclprots.h (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/jclprots.h Thu Apr 6 03:42:13 2006 @@ -117,10 +117,10 @@ /* NativesCommonDoubleParsing*/ JNIEXPORT jdouble JNICALL - Java_com_ibm_oti_util_FloatingPointParser_parseDblImpl + Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl PROTOTYPE ((JNIEnv * env, jclass clazz, jstring s, jint e)); JNIEXPORT void JNICALL - Java_com_ibm_oti_util_NumberConverter_bigIntDigitGeneratorInstImpl + Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl PROTOTYPE ((JNIEnv * env, jobject inst, jlong f, jint e, jboolean isDenormalized, jboolean mantissaIsZero, jint p)); @@ -545,7 +545,7 @@ /* NativesCommonFloatParsing*/ JNIEXPORT jfloat JNICALL - Java_com_ibm_oti_util_FloatingPointParser_parseFltImpl + Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl PROTOTYPE ((JNIEnv * env, jclass clazz, jstring s, jint e)); /* NativesCommonNetHelpers*/ @@ -708,36 +708,36 @@ PROTOTYPE ((JNIEnv * env, jobject recv)); /* NativesCommonProcess*/ - jint JNICALL Java_com_ibm_oti_lang_ProcessInputStream_availableImpl + jint JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_availableImpl PROTOTYPE ((JNIEnv * env, jobject recv)); - void JNICALL Java_com_ibm_oti_lang_ProcessInputStream_oneTimeInitialization + void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_oneTimeInitialization PROTOTYPE ((JNIEnv * env, jclass clazz)); - void JNICALL Java_com_ibm_oti_lang_SystemProcess_destroyImpl + void JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_destroyImpl PROTOTYPE ((JNIEnv * env, jobject recv)); - void JNICALL Java_com_ibm_oti_lang_ProcessOutputStream_writeImpl + void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_writeImpl PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset, jint nbytes, jlong handle)); - jint JNICALL Java_com_ibm_oti_lang_SystemProcess_waitForCompletionImpl + jint JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_waitForCompletionImpl PROTOTYPE ((JNIEnv * env, jobject recv)); - void JNICALL Java_com_ibm_oti_lang_SystemProcess_closeImpl + void JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_closeImpl PROTOTYPE ((JNIEnv * env, jobject recv)); - void JNICALL Java_com_ibm_oti_lang_ProcessOutputStream_closeImpl + void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_closeImpl PROTOTYPE ((JNIEnv * env, jobject recv)); - void JNICALL Java_com_ibm_oti_lang_ProcessOutputStream_oneTimeInitialization + void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_oneTimeInitialization PROTOTYPE ((JNIEnv * env, jclass clazz)); - jint JNICALL Java_com_ibm_oti_lang_ProcessInputStream_readImpl + jint JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_readImpl PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset, jint nbytes, jlong handle)); - void JNICALL Java_com_ibm_oti_lang_ProcessOutputStream_setFDImpl + void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_setFDImpl PROTOTYPE ((JNIEnv * env, jobject recv, jobject arg1, jlong arg2)); - void JNICALL Java_com_ibm_oti_lang_ProcessInputStream_closeImpl + void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_closeImpl PROTOTYPE ((JNIEnv * env, jobject recv)); - jlongArray JNICALL Java_com_ibm_oti_lang_SystemProcess_createImpl + jlongArray JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_createImpl PROTOTYPE ((JNIEnv * env, jclass clazz, jobject recv, jobjectArray arg1, jobjectArray arg2, jbyteArray dir)); - void JNICALL Java_com_ibm_oti_lang_ProcessInputStream_setFDImpl + void JNICALL Java_org_apache_harmony_luni_internal_process_ProcessInputStream_setFDImpl PROTOTYPE ((JNIEnv * env, jobject recv, jobject arg1, jlong arg2)); - void JNICALL Java_com_ibm_oti_lang_SystemProcess_oneTimeInitialization + void JNICALL Java_org_apache_harmony_luni_internal_process_SystemProcess_oneTimeInitialization PROTOTYPE ((JNIEnv * env, jclass clazz)); /* NativesCommonServerSocket*/ Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def Thu Apr 6 03:42:13 2006 @@ -5,28 +5,28 @@ .text EXECUTE READ EXPORTS - Java_com_ibm_oti_lang_ProcessInputStream_availableImpl - Java_com_ibm_oti_lang_ProcessInputStream_closeImpl - Java_com_ibm_oti_lang_ProcessInputStream_oneTimeInitialization - Java_com_ibm_oti_lang_ProcessInputStream_readImpl - Java_com_ibm_oti_lang_ProcessInputStream_setFDImpl - Java_com_ibm_oti_lang_ProcessOutputStream_closeImpl - Java_com_ibm_oti_lang_ProcessOutputStream_oneTimeInitialization - Java_com_ibm_oti_lang_ProcessOutputStream_setFDImpl - Java_com_ibm_oti_lang_ProcessOutputStream_writeImpl - Java_com_ibm_oti_lang_SystemProcess_closeImpl - Java_com_ibm_oti_lang_SystemProcess_createImpl - Java_com_ibm_oti_lang_SystemProcess_destroyImpl - Java_com_ibm_oti_lang_SystemProcess_oneTimeInitialization - Java_com_ibm_oti_lang_SystemProcess_waitForCompletionImpl - Java_com_ibm_oti_util_math_BigInteger_addImpl - Java_com_ibm_oti_util_math_BigInteger_compImpl - Java_com_ibm_oti_util_math_BigInteger_divImpl - Java_com_ibm_oti_util_math_BigInteger_mulImpl - Java_com_ibm_oti_util_math_BigInteger_negImpl - Java_com_ibm_oti_util_math_BigInteger_remImpl - Java_com_ibm_oti_util_math_BigInteger_shlImpl - Java_com_ibm_oti_util_math_BigInteger_subImpl + Java_org_apache_harmony_luni_internal_process_ProcessInputStream_availableImpl + Java_org_apache_harmony_luni_internal_process_ProcessInputStream_closeImpl + Java_org_apache_harmony_luni_internal_process_ProcessInputStream_oneTimeInitialization + Java_org_apache_harmony_luni_internal_process_ProcessInputStream_readImpl + Java_org_apache_harmony_luni_internal_process_ProcessInputStream_setFDImpl + Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_closeImpl + Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_oneTimeInitialization + Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_setFDImpl + Java_org_apache_harmony_luni_internal_process_ProcessOutputStream_writeImpl + Java_org_apache_harmony_luni_internal_process_SystemProcess_closeImpl + Java_org_apache_harmony_luni_internal_process_SystemProcess_createImpl + Java_org_apache_harmony_luni_internal_process_SystemProcess_destroyImpl + Java_org_apache_harmony_luni_internal_process_SystemProcess_oneTimeInitialization + Java_org_apache_harmony_luni_internal_process_SystemProcess_waitForCompletionImpl + Java_org_apache_harmony_math_util_BigInteger_addImpl + Java_org_apache_harmony_math_util_BigInteger_compImpl + Java_org_apache_harmony_math_util_BigInteger_divImpl + Java_org_apache_harmony_math_util_BigInteger_mulImpl + Java_org_apache_harmony_math_util_BigInteger_negImpl + Java_org_apache_harmony_math_util_BigInteger_remImpl + Java_org_apache_harmony_math_util_BigInteger_shlImpl + Java_org_apache_harmony_math_util_BigInteger_subImpl Java_java_io_File_deleteDirImpl Java_java_io_File_deleteFileImpl Java_java_io_File_existsImpl Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/hymath.def URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/hymath.def?rev=391955&r1=391954&r2=391955&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/hymath.def (original) +++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/hymath.def Thu Apr 6 03:42:13 2006 @@ -5,16 +5,16 @@ .text EXECUTE READ EXPORTS - Java_com_ibm_oti_util_FloatingPointParser_parseDblImpl - Java_com_ibm_oti_util_FloatingPointParser_parseFltImpl - Java_com_ibm_oti_util_math_BigInteger_addImpl - Java_com_ibm_oti_util_math_BigInteger_compImpl - Java_com_ibm_oti_util_math_BigInteger_divImpl - Java_com_ibm_oti_util_math_BigInteger_mulImpl - Java_com_ibm_oti_util_math_BigInteger_negImpl - Java_com_ibm_oti_util_math_BigInteger_remImpl - Java_com_ibm_oti_util_math_BigInteger_shlImpl - Java_com_ibm_oti_util_math_BigInteger_subImpl - Java_com_ibm_oti_util_NumberConverter_bigIntDigitGeneratorInstImpl + Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl + Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl + Java_org_apache_harmony_math_util_BigInteger_addImpl + Java_org_apache_harmony_math_util_BigInteger_compImpl + Java_org_apache_harmony_math_util_BigInteger_divImpl + Java_org_apache_harmony_math_util_BigInteger_mulImpl + Java_org_apache_harmony_math_util_BigInteger_negImpl + Java_org_apache_harmony_math_util_BigInteger_remImpl + Java_org_apache_harmony_math_util_BigInteger_shlImpl + Java_org_apache_harmony_math_util_BigInteger_subImpl + Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl JNI_OnLoad JNI_OnUnload