You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/08/08 18:29:36 UTC
svn commit: r429714 - in /incubator/harmony/enhanced/classlib/trunk: make/
modules/archive/src/main/native/archive/windows/
modules/awt/src/test/api/java/common/java/java/
modules/awt/src/test/api/java/common/java/java/serialization/
modules/luni/src/m...
Author: tellison
Date: Tue Aug 8 09:29:34 2006
New Revision: 429714
URL: http://svn.apache.org/viewvc?rev=429714&view=rev
Log:
Applying classlib update patch for HARMONY-1084 (Patches to move up to 5.0, and use new IBM VME)
Added:
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/java/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/java/serialization/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java (with props)
Modified:
incubator/harmony/enhanced/classlib/trunk/make/properties.xml
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/jclglob_harmony.c
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?rev=429714&r1=429713&r2=429714&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Tue Aug 8 09:29:34 2006
@@ -24,7 +24,7 @@
<!-- Javac properties -->
<property name="hy.javac.source" value="1.5" />
- <property name="hy.javac.target" value="jsr14" />
+ <property name="hy.javac.target" value="1.5" />
<property name="hy.javac.debug" value="on" />
<property name="hy.javac.maxmem" value="384M" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/jclglob_harmony.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/jclglob_harmony.c?rev=429714&r1=429713&r2=429714&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/jclglob_harmony.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/jclglob_harmony.c Tue Aug 8 09:29:34 2006
@@ -593,7 +593,7 @@
if (bootstrapClassPath)
{
vmiError rcSetProperty = (*vmInterface)->SetSystemProperty (vmInterface,
- "com.ibm.oti.system.class.path",
+ "org.apache.harmony.boot.class.path",
bootstrapClassPath);
if (VMI_ERROR_NONE != rcSetProperty)
{
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java?rev=429714&r1=429713&r2=429714&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/Locale.java Tue Aug 8 09:29:34 2006
@@ -284,7 +284,7 @@
};
List<String> result = new ArrayList<String>();
StringTokenizer paths = new StringTokenizer(System.getProperty(
- "com.ibm.oti.system.class.path", ""), System.getProperty( //$NON-NLS-1$ //$NON-NLS-2$
+ "org.apache.harmony.boot.class.path", ""), System.getProperty( //$NON-NLS-1$ //$NON-NLS-2$
"path.separator", ";")); //$NON-NLS-1$//$NON-NLS-2$
while (paths.hasMoreTokens()) {
String nextToken = paths.nextToken();
Added: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java?rev=429714&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java Tue Aug 8 09:29:34 2006
@@ -0,0 +1,52 @@
+/* Copyright 2006 The Apache Software Foundation or its licensors, as applicable
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.harmony.luni.platform;
+
+import java.util.Map;
+
+/**
+ * Environment
+ *
+ */
+public class Environment {
+
+ /**
+ * Returns a Map of the current environment variables, containing
+ * key and value pairs.
+ *
+ * @return a Map containing the environment variables and their
+ * values
+ *
+ * TODO: Implement
+ */
+ public static Map<String,String> getenv() {
+ throw new org.apache.harmony.luni.util.NotYetImplementedException("getenv is not implemented");
+ }
+
+ /**
+ * Returns a String containing the value of the specified name
+ * environment variable
+ *
+ * @param name - the environment variable to get the value of
+ *
+ * @return the value of the environment variable specified
+ *
+ * TODO: Implement
+ */
+ public static String getenv(String name) {
+ throw new org.apache.harmony.luni.util.NotYetImplementedException("getenv is not implemented");
+ }
+}
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/platform/Environment.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c?rev=429714&r1=429713&r2=429714&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/shared/main.c Tue Aug 8 09:29:34 2006
@@ -122,7 +122,7 @@
char *endPathPtr;
UDATA handle;
int javaRc = 0;
- char defaultDllName[] = "clearvm";
+ char defaultDllName[] = "harmonyvm";
char defaultDirName[] = "default";
int rc = -1;
int showVersion = 0;
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=429714&r1=429713&r2=429714&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 Tue Aug 8 09:29:34 2006
@@ -614,7 +614,7 @@
if (bootstrapClassPath)
{
vmiError rcSetProperty = (*vmInterface)->SetSystemProperty (vmInterface,
- "com.ibm.oti.system.class.path",
+ "org.apache.harmony.boot.class.path",
bootstrapClassPath);
if (VMI_ERROR_NONE != rcSetProperty)
{
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java?rev=429714&r1=429713&r2=429714&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ThreadGroupTest.java Tue Aug 8 09:29:34 2006
@@ -142,7 +142,7 @@
}
});
int count = tg.activeCount();
- assertTrue("wrong active count: " + count, count == 1);
+ assertTrue("wrong active count: " + count, count == 0);
t1.start();
count = tg.activeCount();
assertTrue("wrong active count: " + count, count == 1);
@@ -539,9 +539,6 @@
final Vector threads = populateGroupsWithThreads(testRoot,
THREADS_PER_GROUP);
- assertTrue("Internal error when populating ThreadGroups", testRoot
- .activeCount() == threads.size());
-
boolean[] isResumed = null;
try {
try {
@@ -550,6 +547,9 @@
t.start();
t.suspend();
}
+ // In 5.0, activeCount() only returns threads that are alive
+ assertTrue("Internal error when populating ThreadGroups", testRoot
+ .activeCount() == threads.size());
} catch (OutOfMemoryError e) {
for (int i = 0; i < threads.size(); i++) {
Thread t = (Thread) threads.elementAt(i);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java?rev=429714&r1=429713&r2=429714&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java Tue Aug 8 09:29:34 2006
@@ -429,11 +429,11 @@
}
// trying to put null in a primitive array causes
- // a NullPointerException in 1.4
+ // a IllegalArgumentException in 5.0
boolean exception = false;
try {
Array.set(new int[1], 0, null);
- } catch (NullPointerException e) {
+ } catch (IllegalArgumentException e) {
exception = true;
}
assertTrue("expected exception not thrown", exception);