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/09/24 08:49:27 UTC
svn commit: r1000737 - in /harmony/enhanced/java/branches/java6: ./
classlib/ classlib/depends/files/ classlib/depends/libs/
classlib/modules/awt/src/main/native/fontlib/unix/
classlib/modules/awt/src/main/native/gl/windows/
classlib/modules/awt/src/ma...
Author: hindessm
Date: Fri Sep 24 06:49:25 2010
New Revision: 1000737
URL: http://svn.apache.org/viewvc?rev=1000737&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1000231:
r1000231 | hindessm | 2010-09-22 22:05:40 +0100 (Wed, 22 Sep 2010) | 1 line
More property fixes.
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/files/libhyempty.so (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/unix/FontLibExports.cpp (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/unix/FontLibExports.h (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/WinGDIGraphics2D.cpp (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIGraphics2D.h (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/resources/images/utest.jpg (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/resources/images/utest.png (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/launcher/windows/apache.ico (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/JustResources.pack (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/common/org/apache/harmony/x/print/javax.print.StreamPrintServiceFactory (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/unix/org/apache/harmony/x/print/javax.print.PrintServiceLookup (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/windows/org/apache/harmony/x/print/javax.print.PrintServiceLookup (props changed)
harmony/enhanced/java/branches/java6/classlib/modules/security/src/test/resources/hyts_badpem.cer (props changed)
harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/Harmony.GIF (props changed)
harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/Harmony.jpg (props changed)
harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/Harmony.png (props changed)
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H2335/readme.txt (props changed)
harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/neg.j (props changed)
harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/neg2.j (props changed)
harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/neg3.j (props changed)
harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/pos.j (props changed)
harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/pos2.j (props changed)
harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/run.test.xml (props changed)
harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H4579/neg.j (props changed)
harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H4579/run.test.xml (props changed)
harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/LICENSE (props changed)
harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/NOTICE (props changed)
harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/inline_info.h (props changed)
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 24 06:49:25 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 24 06:49:25 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-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231
/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/files/libhyempty.so
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 24 06:49:25 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/unix/FontLibExports.cpp
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/fontlib/unix/FontLibExports.h
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/WinGDIGraphics2D.cpp
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/awt/src/main/native/gl/windows/include/org_apache_harmony_awt_gl_windows_WinGDIGraphics2D.h
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/resources/images/utest.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Sep 24 06:49:25 2010
@@ -1 +1 @@
-application/octet-stream
+image/jpeg
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/imageio/src/test/resources/images/utest.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Sep 24 06:49:25 2010
@@ -1 +1 @@
-application/octet-stream
+image/png
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/native/launcher/windows/apache.ico
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Sep 24 06:49:25 2010
@@ -1 +1 @@
-application/octet-stream
+image/x-icon
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/pack200/src/test/resources/org/apache/harmony/pack200/tests/JustResources.pack
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/common/org/apache/harmony/x/print/javax.print.StreamPrintServiceFactory
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/unix/org/apache/harmony/x/print/javax.print.PrintServiceLookup
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/print/src/main/java/windows/org/apache/harmony/x/print/javax.print.PrintServiceLookup
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/classlib/modules/security/src/test/resources/hyts_badpem.cer
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/Harmony.GIF
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Sep 24 06:49:25 2010
@@ -1 +1 @@
-application/octet-stream
+image/gif
Propchange: harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/Harmony.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Sep 24 06:49:25 2010
@@ -1 +1 @@
-application/octet-stream
+image/jpeg
Propchange: harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/Harmony.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Sep 24 06:49:25 2010
@@ -1 +1 @@
-application/octet-stream
+image/png
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 24 06:49:25 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231
/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/drlvm/src/test/regression/H2335/readme.txt
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/neg.j
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/neg2.j
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/neg3.j
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/pos.j
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/pos2.j
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H3862/run.test.xml
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H4579/neg.j
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/drlvm/src/test/regression/H4579/run.test.xml
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/inline_info.h
('svn:executable' removed)
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 24 06:49:25 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147