You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by py...@apache.org on 2006/08/21 05:50:00 UTC

svn commit: r433140 - in /incubator/harmony/enhanced/classlib/trunk/modules: luni/src/main/native/luni/shared/ luni/src/test/java/tests/api/java/io/ rmi/src/main/java/org/apache/harmony/rmi/activation/ rmi/src/test/api/java/org/apache/harmony/rmi/ tool...

Author: pyang
Date: Sun Aug 20 20:49:59 2006
New Revision: 433140

URL: http://svn.apache.org/viewvc?rev=433140&view=rev
Log:
Patch applied for HARMONY-1121 ([classlib] dead references to com.ibm.oti.system.class.path property)

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/SerializationStressTest5.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/Rmid.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/JavaInvoker.java
    incubator/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c?rev=433140&r1=433139&r2=433140&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c Sun Aug 20 20:49:59 2006
@@ -465,7 +465,7 @@
 /**
  * Initializes the bootstrap classpath used by the VM with entries suitable for this
  * class library configuration.  Stores the result into a system property named
- * 'com.ibm.oti.system.class.path'.
+ * 'org.apache.harmony.boot.class.path'.
  *
  * Reads the bootclasspath.properties file a line at a time 
  *

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/SerializationStressTest5.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/SerializationStressTest5.java?rev=433140&r1=433139&r2=433140&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/SerializationStressTest5.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/io/SerializationStressTest5.java Sun Aug 20 20:49:59 2006
@@ -91,7 +91,7 @@
 	private File[] makeClassPathArray() {
 		String classPath;
 		if (System.getProperty("java.vendor").startsWith("IBM"))
-			classPath = System.getProperty("com.ibm.oti.system.class.path");
+			classPath = System.getProperty("org.apache.harmony.boot.class.path");
 		else
 			classPath = System.getProperty("sun.boot.class.path");
 		int instanceOfSep = -1;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/Rmid.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/Rmid.java?rev=433140&r1=433139&r2=433140&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/Rmid.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/Rmid.java Sun Aug 20 20:49:59 2006
@@ -930,7 +930,7 @@
                 String bootClassPathVal = (String)
                         AccessController.doPrivileged(new GetStringPropAction(
                             (javaVmNameVal.equals("J9")
-                                            ? "com.ibm.oti.system.class.path"
+                                           ? "org.apache.harmony.boot.class.path"
                                             : "sun.boot.class.path")));
 
                 String executable = new File(new File(

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/JavaInvoker.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/JavaInvoker.java?rev=433140&r1=433139&r2=433140&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/JavaInvoker.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/api/java/org/apache/harmony/rmi/JavaInvoker.java Sun Aug 20 20:49:59 2006
@@ -85,7 +85,7 @@
         String vmName = System.getProperty("java.vm.name");
 
         bootClassPath = System.getProperty(vmName.equals("J9")
-                ? "com.ibm.oti.system.class.path" : "sun.boot.class.path");
+                ? "org.apache.harmony.boot.class.path" : "sun.boot.class.path");
 
         executable = new File(new File(javaHome, "bin"), "java").getPath();
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java?rev=433140&r1=433139&r2=433140&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java Sun Aug 20 20:49:59 2006
@@ -52,7 +52,7 @@
         System.arraycopy(args, 0, result, 0, args.length);
         result[args.length] = "-classpath";
         result[args.length + 1] = System.getProperty(
-                "com.ibm.oti.system.class.path", ".");
+                "org.apache.harmony.boot.class.path", ".");
         return result;
     }
 }