harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r453547 - in /incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi: DefaultRMIClassLoaderSpi.java activation/ActivationGroupImpl.java internal/nls/messages.properties transport/DefaultRMISocketFactory.java
Date Fri, 06 Oct 2006 10:27:23 GMT
Author: hindessm
Date: Fri Oct  6 03:27:22 2006
New Revision: 453547

URL: http://svn.apache.org/viewvc?view=rev&rev=453547
Log:
Minor fixes for "[#HARMONY-1317] [classlib][internationalization]
Internationalization of the rmi module".

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/DefaultRMIClassLoaderSpi.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/ActivationGroupImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/internal/nls/messages.properties
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/DefaultRMISocketFactory.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/DefaultRMIClassLoaderSpi.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/DefaultRMIClassLoaderSpi.java?view=diff&rev=453547&r1=453546&r2=453547
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/DefaultRMIClassLoaderSpi.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/DefaultRMIClassLoaderSpi.java
Fri Oct  6 03:27:22 2006
@@ -311,8 +311,8 @@
                     loaderLog.log(RMILog.VERBOSE,
                             Messages.getString("rmi.log.32", name)); //$NON-NLS-1$
                 }
-                // rmi.log.33=Could not load class {0}(access to loader for codebase "{1}"
denied).
-                throw new ClassNotFoundException(Messages.getString("rmi.log.33", //$NON-NLS-1$
+                // rmi.94=Could not load class {0}(access to loader for codebase "{1}" denied).
+                throw new ClassNotFoundException(Messages.getString("rmi.94", //$NON-NLS-1$
                         name, ((codebase == null) ? "" : codebase)), ex);//$NON-NLS-1$
                         
             }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/ActivationGroupImpl.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/ActivationGroupImpl.java?view=diff&rev=453547&r1=453546&r2=453547
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/ActivationGroupImpl.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/ActivationGroupImpl.java
Fri Oct  6 03:27:22 2006
@@ -209,8 +209,8 @@
             UnknownObjectException, RemoteException {
         ActiveObject ao = (ActiveObject) active_objects.get(id);
         if (ao == null) {
-            // rmi.log.8D=Object was not registered or already deactivated.
-            throw new UnknownObjectException(Messages.getString("rmi.log.8D")); //$NON-NLS-1$
+            // rmi.93=Object was not registered or already deactivated.
+            throw new UnknownObjectException(Messages.getString("rmi.93")); //$NON-NLS-1$
         }
 
         Activatable.unexportObject(ao.getImpl(), false);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/internal/nls/messages.properties?view=diff&rev=453547&r1=453546&r2=453547
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/internal/nls/messages.properties
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/internal/nls/messages.properties
Fri Oct  6 03:27:22 2006
@@ -163,6 +163,9 @@
 rmi.90=Using stream RMI protocol
 rmi.91=Unknown message got: {0}
 rmi.92=Unable to acknowledge protocol with server
+rmi.93=Object was not registered or already deactivated.
+rmi.94=Could not load class {0}(access to loader for codebase "{1}" denied).
+rmi.95=Connection to [{0}:{1}] timed out
 
 # log messages
 rmi.log.00=ActivationID.activate: activator = {0}
@@ -208,7 +211,6 @@
 rmi.log.116=Unable to connect to [
 rmi.log.117=Direct socket connection to [{0}:{1}] failed.
 rmi.log.118=Trying proxy connection to [{1}:{1}].
-rmi.log.119=Connection to [{0}:{1}] timed out
 rmi.log.11A=Direct socket connection to [{0}:{1}] from port {2} succeeded.
 rmi.log.11B=Proxy connection to [{0}:{1}] failed
 rmi.log.11C=Proxy connection to [{0}:{1}] from port {2} succeeded.
@@ -277,7 +279,6 @@
 rmi.log.30=Could not obtain classloader for codebase "{0}" (access denied).
 rmi.log.31=Trying thread context classloader ({0}).
 rmi.log.32=Could not load class {0} via thread context classloader (access to codebase loader
is denied).
-rmi.log.33=Could not load class {0}(access to loader for codebase "{1}" denied).
 rmi.log.34=Loaded class: {0} via thread context classloader.
 rmi.log.35=Loaded class: {0} via {1}
 rmi.log.36=RMID Monitor class = {0}
@@ -367,7 +368,6 @@
 rmi.log.8A=ao was put into Hashtable
 rmi.log.8B=calling newInstance of the superclass.
 rmi.log.8C=ActivationGroup was constructed.
-rmi.log.8D=Object was not registered or already deactivated.
 rmi.log.8E=ActiveObject: ActiveObject.<init>:
 rmi.log.8F=ActiveObject: remote_object_impl = {0}; remote_object_stub={1}
 rmi.log.90=ActiveObject: Failed to marshal remote stub: {0}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/DefaultRMISocketFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/DefaultRMISocketFactory.java?view=diff&rev=453547&r1=453546&r2=453547
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/DefaultRMISocketFactory.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/DefaultRMISocketFactory.java
Fri Oct  6 03:27:22 2006
@@ -166,8 +166,8 @@
                             } // Falling through to HTTP connection attempt.
                         }
                     } else {
-                        // rmi.log.119=Connection to [{0}:{1}] timed out
-                        throw new NoRouteToHostException(Messages.getString("rmi.log.119",
//$NON-NLS-1$
+                        // rmi.95=Connection to [{0}:{1}] timed out
+                        throw new NoRouteToHostException(Messages.getString("rmi.95", //$NON-NLS-1$
                                 host, port));
                     }
                 } else if (proxyTransportLog.isLoggable(RMILog.BRIEF)) {



Mime
View raw message