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/17 12:37:10 UTC
svn commit: r998060 - in /harmony/enhanced/java/branches/java6: ./ classlib/
classlib/depends/libs/ drlvm/ drlvm/vm/gc_gen/src/mark_compact/
drlvm/vm/vmcore/include/ drlvm/vm/vmcore/src/init/
drlvm/vm/vmcore/src/util/ jdktools/
Author: hindessm
Date: Fri Sep 17 10:37:09 2010
New Revision: 998060
URL: http://svn.apache.org/viewvc?rev=998060&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@997759:
r997759 | hindessm | 2010-09-16 15:20:59 +0100 (Thu, 16 Sep 2010) | 3 lines
Trivial spelling fixes to avoid warnings from the Debian package
checker, lintian.
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/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/mark_compact/mspace_collect_compact.cpp
harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp
harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/jarfile_support.h
harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/init/harmony.properties
harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/jarfile_support.cpp
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 17 10:37:09 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624
+/harmony/enhanced/java/trunk:929253-997624,997759
/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 17 10:37:09 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
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759
/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 Fri Sep 17 10:37:09 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 17 10:37:09 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-997624
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Modified: harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/mark_compact/mspace_collect_compact.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/mark_compact/mspace_collect_compact.cpp?rev=998060&r1=998059&r2=998060&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/mark_compact/mspace_collect_compact.cpp (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/mark_compact/mspace_collect_compact.cpp Fri Sep 17 10:37:09 2010
@@ -292,7 +292,7 @@ void mspace_collection(Mspace* mspace)
TRACE2("gc.process", "\nGC: end of move compact algo ... \n");
}else{
- LDIE(75, "GC: The speficied major collection algorithm doesn't exist!");
+ LDIE(75, "GC: The specified major collection algorithm doesn't exist!");
}
if((!LOS_ADJUST_BOUNDARY)&&(kind != TRANS_NOTHING) ) {
Modified: harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp?rev=998060&r1=998059&r2=998060&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp Fri Sep 17 10:37:09 2010
@@ -284,7 +284,7 @@ void mspace_extend_compact(Collector *co
atomic_cas32( &num_space_changing_collectors, 0, num_active_collectors + 1);
old_num = atomic_inc32(&num_space_changing_collectors);
if( ++old_num == num_active_collectors ){
- if(NOS_SIZE) /* when NOS_SIZE is speficied, it can't be shrunk. */
+ if(NOS_SIZE) /* when NOS_SIZE is specified, it can't be shrunk. */
LWARN(59, "GC: collector[{0}]: MOS is overflowed, have to reduce NOS size." << ((POINTER_SIZE_INT)collector->thread_handle));
Block *old_nos_boundary = nspace->blocks;
nos_boundary = &mspace->blocks[mspace->free_block_idx - mspace->first_block_idx];
Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/jarfile_support.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/jarfile_support.h?rev=998060&r1=998059&r2=998060&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/jarfile_support.h (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/include/jarfile_support.h Fri Sep 17 10:37:09 2010
@@ -78,7 +78,7 @@ enum JarCompressionMethod
JAR_FILE_IMPLODED,
JAR_FILE_RESERVED_TCA,
JAR_FILE_DEFLATED,
- JAR_FILE_ENCHANCED_DEFLATE,
+ JAR_FILE_ENHANCED_DEFLATE,
JAR_FILE_PKWARED
};
Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/init/harmony.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/init/harmony.properties?rev=998060&r1=998059&r2=998060&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/init/harmony.properties (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/init/harmony.properties Fri Sep 17 10:37:09 2010
@@ -136,7 +136,7 @@ LDIE071=Unknown property table: {0}
LDIE072=FAILED on unloading classloader: \n{0} live j.l.Class of unloaded class is de tected: {1}
LDIE073=Unexpected kind
LDIE074=Unexpected register
-LDIE075=GC: The speficied major collection algorithm doesn't exist!
+LDIE075=GC: The specified major collection algorithm doesn't exist!
LDIE076=Property value {0} is not set!
LDIE077=Please define USE_UNIQUE_MARK_SWEEP_GC macro.
LDIE078=GC: Run out GC metadata, please give it more segments!
Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/jarfile_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/jarfile_support.cpp?rev=998060&r1=998059&r2=998060&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/jarfile_support.cpp (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/util/jarfile_support.cpp Fri Sep 17 10:37:09 2010
@@ -121,8 +121,8 @@ bool JarEntry::GetContent(unsigned char*
}
#endif //_IPF
break;
- case JAR_FILE_ENCHANCED_DEFLATE:
- printf( "Found ENCHANCED DEFLATE content. No support as of yet.\n" );
+ case JAR_FILE_ENHANCED_DEFLATE:
+ printf( "Found ENHANCED DEFLATE content. No support as of yet.\n" );
return false;
case JAR_FILE_PKWARED:
printf( "Found PKWARED content. No support as of yet.\n" );
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 17 10:37:09 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147