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/11/10 17:50:01 UTC
svn commit: r1033583 - in /harmony/enhanced/java/branches/java6: ./
classlib/ classlib/depends/libs/ classlib/modules/nio/build.xml drlvm/
jdktools/
Author: hindessm
Date: Wed Nov 10 16:50:00 2010
New Revision: 1033583
URL: http://svn.apache.org/viewvc?rev=1033583&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1030005:
r1030005 | hindessm | 2010-11-02 11:41:40 +0000 (Tue, 02 Nov 2010) | 3 lines
Add java.nio.channels.spi.SelectorProvider metadata - that has existed
(unused?) since June 2009.
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/nio/build.xml
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 Wed Nov 10 16:50:00 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-1029636,1029773,1029853
+/harmony/enhanced/java/trunk:929253-1029636,1029773,1029853,1030005
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 16:50:00 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-1029636,1029773,1029853
+/harmony/enhanced/java/trunk/classlib:929253-1029636,1029773,1029853,1030005
/harmony/enhanced/trunk/classlib:476395-929252
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/classlib:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 16:50:00 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636,1029773,1029853
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636,1029773,1029853,1030005
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Modified: harmony/enhanced/java/branches/java6/classlib/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/build.xml?rev=1033583&r1=1033582&r2=1033583&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/build.xml Wed Nov 10 16:50:00 2010
@@ -92,6 +92,7 @@
depends="-svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
manifest="META-INF/MANIFEST.MF">
+ <metainf prefix="META-INF/services" dir="META-INF/services" />
<fileset refid="classes" />
<fileset refid="common.resources" />
</hy.jar.bin>
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 16:50:00 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-1029636,1029773,1029853
+/harmony/enhanced/java/trunk/drlvm:929253-1029636,1029773,1029853,1030005
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 10 16:50:00 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-1029636,1029773,1029853
+/harmony/enhanced/java/trunk/jdktools:929253-1029636,1029773,1029853,1030005
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147