harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r979469 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/lang-management/src/main/java/java/lang/management/ classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ ...
Date Mon, 26 Jul 2010 22:16:57 GMT
Author: hindessm
Date: Mon Jul 26 22:16:56 2010
New Revision: 979469

URL: http://svn.apache.org/viewvc?rev=979469&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@967211

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/lang-management/src/main/java/java/lang/management/ManagementFactory.java
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/ThreadInfo.java
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/DynamicMXBeanImpl.java
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ThreadMXBeanImpl.java
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internals/nls/messages.properties
    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 Jul 26 22:16:56 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-967074,967199
+/harmony/enhanced/java/trunk:929253-967074,967199,967211
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 26 22:16:56 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-967074,967199
+/harmony/enhanced/java/trunk/classlib:929253-967074,967199,967211
 /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 Mon Jul 26 22:16:56 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-967074,967199
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-967074,967199,967211
 /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/lang-management/src/main/java/java/lang/management/ManagementFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/ManagementFactory.java?rev=979469&r1=979468&r2=979469&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/ManagementFactory.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/ManagementFactory.java
Mon Jul 26 22:16:56 2010
@@ -375,9 +375,9 @@ public class ManagementFactory {
         if (multiInstanceBeanNames.contains(mxbeanInterfaceName)) {
             // partial match is good enough
             if (!mxbeanName.startsWith(expectedObjectName)) {
-                // lm.01= is not an instance of interface {0}
+                // lm.02={0} is not an instance of interface {1}
                 throw new IllegalArgumentException(Messages.getString(
-                        "lm.01", mxbeanInterfaceName)); //$NON-NLS-1$                
+                        "lm.02", mxbeanName, mxbeanInterfaceName)); //$NON-NLS-1$       
        
             }
         } else {
             // exact match required

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/ThreadInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/ThreadInfo.java?rev=979469&r1=979468&r2=979469&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/ThreadInfo.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/ThreadInfo.java
Mon Jul 26 22:16:56 2010
@@ -103,7 +103,7 @@ public class ThreadInfo {
             long threadIdVal = ((Long) attributeVals[0]).longValue();
             String threadNameVal = (String) attributeVals[1];
             if (threadNameVal == null) {
-                //lm.06=Invalid composite data: Attribute threadNAme has null value
+                //lm.06=Invalid composite data: Attribute threadName has null value
                 throw new IllegalArgumentException(Messages.getString("lm.06")); //$NON-NLS-1$
               
                 }
             String threadStateStringVal = (String) attributeVals[2];

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/DynamicMXBeanImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/DynamicMXBeanImpl.java?rev=979469&r1=979468&r2=979469&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/DynamicMXBeanImpl.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/DynamicMXBeanImpl.java
Mon Jul 26 22:16:56 2010
@@ -172,8 +172,8 @@ public abstract class DynamicMXBeanImpl 
         MBeanAttributeInfo attribInfo = getPresentAttribute(attribute,
                 AttributeAccessType.READING);
         if (attribInfo == null) {            
-            //lm.0A=No such attribute :{0}
-            throw new AttributeNotFoundException(Messages.getString("lm.0A")); //$NON-NLs-1$
+            //lm.0A=No such attribute : {0}
+            throw new AttributeNotFoundException(Messages.getString("lm.0A", attribute));
//$NON-NLs-1$
         }
 
         try {
@@ -230,8 +230,8 @@ public abstract class DynamicMXBeanImpl 
         MBeanAttributeInfo attribInfo = getPresentAttribute(
                 attribute.getName(), AttributeAccessType.WRITING);
         if (attribInfo == null) {
-            //lm.0A=No such attribute :{0}
-            throw new AttributeNotFoundException(Messages.getString("lm.0A")); //$NON-NLs-1$
+            //lm.0A=No such attribute : {0}
+            throw new AttributeNotFoundException(Messages.getString("lm.0A"), attribute);
//$NON-NLs-1$
         }
 
         try {

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ThreadMXBeanImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ThreadMXBeanImpl.java?rev=979469&r1=979468&r2=979469&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ThreadMXBeanImpl.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ThreadMXBeanImpl.java
Mon Jul 26 22:16:56 2010
@@ -580,8 +580,8 @@ public final class ThreadMXBeanImpl exte
     public boolean isThreadCpuTimeEnabled() {
         if (!isThreadCpuTimeSupported()) {
             
-            //lm.1F=Thread CPU timing is not supported on this virtual machine.
-            throw new UnsupportedOperationException(Messages.getString("lm.1F")); //$NON-NLS-1$
+            //lm.01=Thread CPU timing is not supported on this virtual machine.
+            throw new UnsupportedOperationException(Messages.getString("lm.01")); //$NON-NLS-1$
         }
         return this.isThreadCpuTimeEnabledImpl();
     }
@@ -659,8 +659,8 @@ public final class ThreadMXBeanImpl exte
      */
     public void setThreadCpuTimeEnabled(boolean enable) {
         if (!isThreadCpuTimeSupported()) {
-            //lm.1F=Thread CPU timing is not supported on this virtual machine.
-            throw new UnsupportedOperationException(Messages.getString("lm.1F")); //$NON-NLS-1$
         
+            //lm.01=Thread CPU timing is not supported on this virtual machine.
+            throw new UnsupportedOperationException(Messages.getString("lm.01")); //$NON-NLS-1$
         
         }
 
         SecurityManager security = System.getSecurityManager();

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internals/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internals/nls/messages.properties?rev=979469&r1=979468&r2=979469&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internals/nls/messages.properties
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internals/nls/messages.properties
Mon Jul 26 22:16:56 2010
@@ -14,42 +14,33 @@
 #  limitations under the License.
 
 # messages for EN locale
-lm.01=is not an instance of interface {0}	
+lm.01=Thread CPU timing is not supported on this virtual machine.
 lm.02={0} is not an instance of interface {1}
 lm.03=poolName is null
 lm.04=usage is null
-lm.05=Attribute poolName has null value        	
-lm.06=Invalid composite data: Attribute threadNAme has null value
-lm.07=CompsiteData contains an unexpected threadState value. {0}             
-lm.08=StackTraceElement[] is missing                
-lm.09=VM does not support monitoring of compilation time          
-lm.0A=No such attribute :{0}        
-lm.0B={0} is a {1} attribute               
-lm.0C=No such operation : {0}        	
-lm.0D=Unable to find logger with name {0}            
-lm.0E=CompositeData does not contain the expected number of attribute.           
-lm.0F=CompositeData contains an attribute not of expected type. Expected {0} ,found {1}
-lm.10=CompositeData object does not contain expected key: {0}            	
-lm.11=CompositeData object does not have the expected number of attributes         	
-lm.12=TabularData row type is not CompositeType with two items.       
-lm.13=VM does not support collection usage threshold.        	
-lm.14=VM does not support usage threshold.        	
-lm.15=Collection usage threshold cannot be negative.        	          	        	
-lm.16=Collection usage threshold cannot exceed maximum amount of memory for pool.       
	
-lm.17=Unknown MXBean type : {0}        	
-lm.18=Bean name not in valid format. {0}           
-lm.19=Not registered {0}        	
-lm.1A=VM does not support boot classpath			
-lm.1B=Thread id must be greater than 0        	
-lm.1C=CPU time measurement is not supported on this virtual machine    	
+lm.05=Attribute poolName has null value
+lm.06=Invalid composite data: Attribute threadName has null value
+lm.07=CompsiteData contains an unexpected threadState value. {0}
+lm.08=StackTraceElement[] is missing
+lm.09=VM does not support monitoring of compilation time
+lm.0A=No such attribute : {0}
+lm.0B={0} is a {1} attribute
+lm.0C=No such operation : {0}
+lm.0D=Unable to find logger with name {0}
+lm.0E=CompositeData does not contain the expected number of attribute.
+lm.0F=CompositeData contains an attribute not of expected type. Expected {0}, found {1}
+lm.10=CompositeData object does not contain expected key: {0}
+lm.11=CompositeData object does not have the expected number of attributes
+lm.12=TabularData's row type is not CompositeType with two items.
+lm.13=VM does not support collection usage threshold.
+lm.14=VM does not support usage threshold.
+lm.15=Collection usage threshold cannot be negative.
+lm.16=Collection usage threshold cannot exceed maximum amount of memory for pool.
+lm.17=Unknown MXBean type : {0}
+lm.18=Bean name not in valid format. {0}
+lm.19=Not registered {0}
+lm.1A=VM does not support boot classpath
+lm.1B=Thread id must be greater than 0
+lm.1C=CPU time measurement is not supported on this virtual machine
 lm.1D=maxDepth value cannot be negative.
-lm.1E=Thread contention monitoring is not supported on this virtual machine.        	
-lm.1F=Thread CPU timing is not supported on this virtual machine.
- 	
-        	
-        	                
-                
-                
-                
-                
-                
\ No newline at end of file
+lm.1E=Thread contention monitoring is not supported on this virtual machine.

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 26 22:16:56 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-967074,967199
+/harmony/enhanced/java/trunk/drlvm:929253-967074,967199,967211
 /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 Mon Jul 26 22:16:56 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-967074,967199
+/harmony/enhanced/java/trunk/jdktools:929253-967074,967199,967211
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message