harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r979561 - 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 Tue, 27 Jul 2010 07:15:33 GMT
Author: hindessm
Date: Tue Jul 27 07:15:33 2010
New Revision: 979561

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

Added:
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/
      - copied from r979280, harmony/enhanced/java/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/
      - copied from r979280, harmony/enhanced/java/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/Messages.java
      - copied unchanged from r979280, harmony/enhanced/java/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/Messages.java
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/messages.properties
      - copied unchanged from r979280, harmony/enhanced/java/trunk/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internal/nls/messages.properties
Removed:
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/internals/
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/MemoryNotificationInfo.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/CompilationMXBeanImpl.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/LoggingMXBeanImpl.java
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImpl.java
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/OpenTypeMappingIHandler.java
    harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/RuntimeMXBeanImpl.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/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 07:15:33 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-967074,967199,967211,967216
+/harmony/enhanced/java/trunk:929253-967074,967199,967211,967216,979280
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 07:15:33 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,967211,967216
+/harmony/enhanced/java/trunk/classlib:929253-967074,967199,967211,967216,979280
 /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 Tue Jul 27 07:15:33 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-967074,967199,967211,967216
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-967074,967199,967211,967216,979280
 /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=979561&r1=979560&r2=979561&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
Tue Jul 27 07:15:33 2010
@@ -43,7 +43,7 @@ import javax.management.ObjectName;
 import org.apache.harmony.lang.management.ManagementUtils;
 import org.apache.harmony.lang.management.MemoryManagerMXBeanImpl;
 import org.apache.harmony.lang.management.OpenTypeMappingIHandler;
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 
 /**

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/MemoryNotificationInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/MemoryNotificationInfo.java?rev=979561&r1=979560&r2=979561&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/MemoryNotificationInfo.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/java/lang/management/MemoryNotificationInfo.java
Tue Jul 27 07:15:33 2010
@@ -20,7 +20,7 @@ package java.lang.management;
 import javax.management.openmbean.CompositeData;
 
 import org.apache.harmony.lang.management.ManagementUtils;
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 /**
  * <p>

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=979561&r1=979560&r2=979561&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
Tue Jul 27 07:15:33 2010
@@ -20,7 +20,7 @@ package java.lang.management;
 import javax.management.openmbean.CompositeData;
 
 import org.apache.harmony.lang.management.ManagementUtils;
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 
 /**

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/CompilationMXBeanImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/CompilationMXBeanImpl.java?rev=979561&r1=979560&r2=979561&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/CompilationMXBeanImpl.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/CompilationMXBeanImpl.java
Tue Jul 27 07:15:33 2010
@@ -21,7 +21,7 @@ import java.lang.management.CompilationM
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 /**
  * Runtime type for {@link CompilationMXBean}

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=979561&r1=979560&r2=979561&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
Tue Jul 27 07:15:33 2010
@@ -31,7 +31,7 @@ import javax.management.MBeanOperationIn
 import javax.management.MBeanParameterInfo;
 import javax.management.ReflectionException;
 
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 /**
  * Abstract implementation of the {@link DynamicMBean} interface that provides

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/LoggingMXBeanImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/LoggingMXBeanImpl.java?rev=979561&r1=979560&r2=979561&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/LoggingMXBeanImpl.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/LoggingMXBeanImpl.java
Tue Jul 27 07:15:33 2010
@@ -25,7 +25,7 @@ import java.util.logging.LogManager;
 import java.util.logging.Logger;
 import java.util.logging.LoggingMXBean;
 
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 /**
  * Runtime type for {@link java.util.logging.LoggingMXBean}.

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java?rev=979561&r1=979560&r2=979561&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/ManagementUtils.java
Tue Jul 27 07:15:33 2010
@@ -61,7 +61,7 @@ import javax.management.openmbean.Tabula
 import javax.management.openmbean.TabularDataSupport;
 import javax.management.openmbean.TabularType;
 
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 /**
  * Support methods for org.apache.harmony.lang.management classes.

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImpl.java?rev=979561&r1=979560&r2=979561&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImpl.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImpl.java
Tue Jul 27 07:15:33 2010
@@ -26,7 +26,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 /**
  * Runtime type for {@link java.lang.management.MemoryPoolMXBean}

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/OpenTypeMappingIHandler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/OpenTypeMappingIHandler.java?rev=979561&r1=979560&r2=979561&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/OpenTypeMappingIHandler.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/OpenTypeMappingIHandler.java
Tue Jul 27 07:15:33 2010
@@ -44,7 +44,7 @@ import javax.management.ObjectName;
 import javax.management.ReflectionException;
 import javax.management.RuntimeMBeanException;
 
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 /**
  * Concrete instance of the {@link InvocationHandler} interface that is used to

Modified: harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/RuntimeMXBeanImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/RuntimeMXBeanImpl.java?rev=979561&r1=979560&r2=979561&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/RuntimeMXBeanImpl.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/lang-management/src/main/java/org/apache/harmony/lang/management/RuntimeMXBeanImpl.java
Tue Jul 27 07:15:33 2010
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 /**
  * Runtime type for {@link java.lang.management.RuntimeMXBean}

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=979561&r1=979560&r2=979561&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
Tue Jul 27 07:15:33 2010
@@ -23,7 +23,7 @@ import java.lang.management.ThreadMXBean
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import org.apache.harmony.lang.management.internals.nls.Messages;
+import org.apache.harmony.lang.management.internal.nls.Messages;
 
 /**
  * Runtime type for {@link java.lang.management.ThreadMXBean}

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 07:15:33 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-967074,967199,967211,967216
+/harmony/enhanced/java/trunk/drlvm:929253-967074,967199,967211,967216,979280
 /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 Tue Jul 27 07:15:33 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-967074,967199,967211,967216
+/harmony/enhanced/java/trunk/jdktools:929253-967074,967199,967211,967216,979280
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message