You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/06/28 10:16:50 UTC
svn commit: r958498 - in /harmony/enhanced/java/branches/java6: ./ classlib/
classlib/depends/build/platform/ classlib/depends/libs/
classlib/modules/archive/src/main/native/zip/unix/
classlib/modules/luni/src/main/native/hyzip/unix/ classlib/modules/l...
Author: hindessm
Date: Mon Jun 28 08:16:49 2010
New Revision: 958498
URL: http://svn.apache.org/viewvc?rev=958498&view=rev
Log:
Merge changes from trunk@958493.
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk
harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java
harmony/enhanced/java/branches/java6/common_resources/ (props changed)
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 28 08:16:49 2010
@@ -1,3 +1,3 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-957725
+/harmony/enhanced/java/trunk:929253-958493
/harmony/enhanced/trunk:810871-929252
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 28 08:16:49 2010
@@ -1,7 +1,7 @@
/harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
/harmony/enhanced/classlib/trunk/working_classlib:884014-884286
/harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-957725
+/harmony/enhanced/java/trunk/classlib:929253-958493
/harmony/enhanced/trunk/classlib:476395-929252
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/working_classlib:423974-476394
Modified: harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk?rev=958498&r1=958497&r2=958498&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390.mk Mon Jun 28 08:16:49 2010
@@ -52,3 +52,6 @@ HYDEBUGCFLAGS = -g -O0
# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
# $(HY_HDK)/lib instead of directly against the .so libraries.
DLLPATH=$(LIBPATH)
+
+# AR doesn't support the 'o' option on z/OS so mtime will be updated
+AREXTRACT= x
Modified: harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk?rev=958498&r1=958497&r2=958498&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/build/platform/zos.s390x.mk Mon Jun 28 08:16:49 2010
@@ -52,3 +52,6 @@ HYDEBUGCFLAGS = -g -O0
# On z/OS set DLLPATH to LIBPATH so we link against .x export files in
# $(HY_HDK)/lib instead of directly against the .so libraries.
DLLPATH=$(LIBPATH)
+
+# AR doesn't support the 'o' option on z/OS so mtime will be updated
+AREXTRACT= x
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 28 08:16:49 2010
@@ -1,3 +1,3 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-957725
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-958493
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
Modified: harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile?rev=958498&r1=958497&r2=958498&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/main/native/zip/unix/makefile Mon Jun 28 08:16:49 2010
@@ -27,6 +27,6 @@ BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAR
LIBNAME = $(LIBPATH)libhyzip.a
%.o: $(LIBPATH)libhypool.a(%.o)
- ar $(ARFLAGS) xo $(LIBPATH)libhypool.a $@
+ ar $(ARFLAGS) $(AREXTRACT) $(LIBPATH)libhypool.a $@
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile?rev=958498&r1=958497&r2=958498&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/hyzip/unix/makefile Mon Jun 28 08:16:49 2010
@@ -25,6 +25,6 @@ BUILDFILES = $(SHAREDSUB)hyzip.o $(SHARE
LIBNAME = $(LIBPATH)libhyzip.a
%.o: $(LIBPATH)libhypool.a(%.o)
- ar $(ARFLAGS) xo $(LIBPATH)libhypool.a $@
+ ar $(ARFLAGS) $(AREXTRACT) $(LIBPATH)libhypool.a $@
include $(HY_HDK)/build/make/rules.mk
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java?rev=958498&r1=958497&r2=958498&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java Mon Jun 28 08:16:49 2010
@@ -348,7 +348,6 @@ public class HttpURLConnectionTest exten
*/
public void test_writeWithFixedLengthDisableMode() throws IOException {
String bigString = "big String:/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java b/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java";
- System.out.println(bigString.length());
java.net.HttpURLConnection httpURLConnection = (HttpURLConnection) url
.openConnection();
Propchange: harmony/enhanced/java/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 28 08:16:49 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh/common_resources:935751-941490
-/harmony/enhanced/java/trunk/common_resources:929253-957725
+/harmony/enhanced/java/trunk/common_resources:929253-958493
/harmony/enhanced/trunk/common_resources:476395-929252
/incubator/harmony/enhanced/trunk/common_resources:292550-476394
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 28 08:16:49 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-957725
+/harmony/enhanced/java/trunk/drlvm:929253-958493
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/working_vm:423974-476394
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 28 08:16:49 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-957725
+/harmony/enhanced/java/trunk/jdktools:929253-958493
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147