harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r453541 [1/6] - in /incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java: java/rmi/ java/rmi/activation/ java/rmi/dgc/ java/rmi/registry/ java/rmi/server/ org/apache/harmony/rmi/ org/apache/harmony/rmi/activation/ org/apache/...
Date Fri, 06 Oct 2006 10:15:55 GMT
Author: hindessm
Date: Fri Oct  6 03:15:51 2006
New Revision: 453541

URL: http://svn.apache.org/viewvc?view=rev&rev=453541
Log:
Applying patch from "[#HARMONY-1317] [classlib][internationalization]
Internationalization of the rmi module".

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/Naming.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/RemoteException.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/Activatable.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationDesc.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationException.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroupID.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup_Stub.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationID.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/dgc/VMID.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/registry/LocateRegistry.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LoaderHandler.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LogStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/ObjID.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMISocketFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteObject.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteObjectInvocationHandler.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteRef.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteServer.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/ServerCloneException.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/UID.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/UnicastRemoteObject.java
    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/activation/NodeInfo.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/Rmid.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/RmidMonitorFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/Rmid_Skel.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/activation/Rmid_Stub.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/client/ClientConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/client/ClientConnectionManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/client/ClientRemoteCall.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/CreateThreadAction.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/EclipseJavaCompiler.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/ExecJavaCompiler.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/JavaCompiler.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/MethodJavaCompiler.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/RMIConstants.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/RMIHash.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/RMILog.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/RMIProperties.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/RMIUtil.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/common/SubProcess.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/compiler/ClassStub.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/compiler/Indenter.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/compiler/Main.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/compiler/RMICompiler.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/compiler/RmicConstants.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/compiler/RmicStrings.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/compiler/RmicUtil.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/registry/RegistryImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl_Skel.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl_Stub.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/ActivatableRef.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/ActivatableServerRef.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastRef.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastRef2.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastServerRef.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastServerRef2.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ClientDGC.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl_Skel.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl_Stub.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ExportManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/RMIObjectInfo.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/RMIReference.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/RemoteRefBase.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ServerConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ServerConnectionManager.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ServerRemoteCall.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/DefaultRMISocketFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/Endpoint.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/RMIObjectInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/RMIObjectOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/proxy/HttpConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/proxy/HttpInboundSocket.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/proxy/HttpInputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/proxy/HttpOutboundSocket.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/proxy/HttpOutputStream.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/proxy/HttpProxyRMISocketFactory.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/proxy/HttpServerConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/proxy/HttpServerSocket.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/proxy/Proxy.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/proxy/ProxyConstants.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/tcp/TcpConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/transport/tcp/TcpServerConnection.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/Naming.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/Naming.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/Naming.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/Naming.java Fri Oct  6 03:15:51 2006
@@ -24,6 +24,8 @@
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 
+import org.apache.harmony.rmi.internal.nls.Messages;
+
 public final class Naming {
 
     // This class could not be instantiated.
@@ -32,12 +34,13 @@
 
     public static String[] list(String name) throws RemoteException, MalformedURLException {
         if (name == null) {
-            throw new NullPointerException("URL could not be null.");
+            // rmi.00=URL could not be null.
+            throw new NullPointerException(Messages.getString("rmi.00")); //$NON-NLS-1$
         }
         RegistryURL url = getRegistryURL(name, true);
         Registry reg = LocateRegistry.getRegistry(url.host, url.port);
         String[] names = reg.list();
-        String regName = "//" + ((url.host == null) ? "" : url.host) + ":" + url.port + "/";
+        String regName = "//" + ((url.host == null) ? "" : url.host) + ":" + url.port + "/"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 
         for (int i = 0; i < names.length; ++i) {
             names[i] = regName + names[i];
@@ -48,7 +51,8 @@
     public static void rebind(String name, Remote obj) throws RemoteException,
             MalformedURLException {
         if (name == null) {
-            throw new NullPointerException("URL could not be null.");
+            // rmi.00=URL could not be null.
+            throw new NullPointerException(Messages.getString("rmi.00")); //$NON-NLS-1$
         }
         RegistryURL url = getRegistryURL(name, false);
         Registry reg = LocateRegistry.getRegistry(url.host, url.port);
@@ -58,7 +62,8 @@
     public static void unbind(String name) throws RemoteException, NotBoundException,
             MalformedURLException {
         if (name == null) {
-            throw new NullPointerException("URL could not be null.");
+            // rmi.00=URL could not be null.
+            throw new NullPointerException(Messages.getString("rmi.00")); //$NON-NLS-1$
         }
         RegistryURL url = getRegistryURL(name, false);
         Registry reg = LocateRegistry.getRegistry(url.host, url.port);
@@ -68,7 +73,8 @@
     public static void bind(String name, Remote obj) throws AlreadyBoundException,
             MalformedURLException, RemoteException {
         if (name == null) {
-            throw new NullPointerException("URL could not be null.");
+            // rmi.00=URL could not be null.
+            throw new NullPointerException(Messages.getString("rmi.00")); //$NON-NLS-1$
         }
         RegistryURL url = getRegistryURL(name, false);
         Registry reg = LocateRegistry.getRegistry(url.host, url.port);
@@ -78,7 +84,8 @@
     public static Remote lookup(String name) throws NotBoundException, MalformedURLException,
             RemoteException {
         if (name == null) {
-            throw new NullPointerException("URL could not be null.");
+            // rmi.00=URL could not be null.
+            throw new NullPointerException(Messages.getString("rmi.00")); //$NON-NLS-1$
         }
         RegistryURL url = getRegistryURL(name, false);
         Registry reg = LocateRegistry.getRegistry(url.host, url.port);
@@ -95,35 +102,37 @@
         try {
             uri = new URI(strUrl);
         } catch (URISyntaxException use) {
-            throw new MalformedURLException("Invalid URL \"" + strUrl + "\":" + use);
+            // rmi.01=Invalid URL "{0}":{1}
+            throw new MalformedURLException(Messages.getString("rmi.01", strUrl, use)); //$NON-NLS-1$
         }
         String prot = uri.getScheme();
 
-        if ((prot != null) && !prot.toLowerCase().equals("rmi")) {
-            throw new MalformedURLException("Non-rmi protocol in URL \"" + strUrl + "\": "
-                    + prot);
+        if ((prot != null) && !prot.toLowerCase().equals("rmi")) { //$NON-NLS-1$
+            // rmi.02=Non-rmi protocol in URL "{0}": {1}
+            throw new MalformedURLException(Messages.getString("rmi.02", strUrl, prot)); //$NON-NLS-1$
         }
 
         if (uri.getUserInfo() != null) {
-            throw new MalformedURLException("Invalid character ('@') in URL \"" + strUrl
-                    + "\" host part.");
+            // rmi.03=Invalid character ('@') in URL "{0}" host part.
+            throw new MalformedURLException(Messages.getString("rmi.03", strUrl)); //$NON-NLS-1$
         } else if (uri.getQuery() != null) {
-            throw new MalformedURLException("Invalid character ('?') in URL \"" + strUrl
-                    + "\" name part.");
+            // rmi.04=Invalid character ('?') in URL "{0}" name part.
+            throw new MalformedURLException(Messages.getString("rmi.04", strUrl)); //$NON-NLS-1$
         } else if (uri.getFragment() != null) {
-            throw new MalformedURLException("Invalid character ('#') in URL \"" + strUrl
-                    + "\" name part.");
+            // rmi.05=Invalid character ('\#') in URL "{0}" name part.
+            throw new MalformedURLException(Messages.getString("rmi.05", strUrl)); //$NON-NLS-1$
         }
         int port = uri.getPort();
         String auth = uri.getAuthority();
 
-        if (auth != null && auth.startsWith(":") && auth.length() != 1) {
+        if (auth != null && auth.startsWith(":") && auth.length() != 1) { //$NON-NLS-1$
             // to handle URLs like "rmi://:1099/xxx"
             try {
                 port = Integer.parseInt(auth.substring(1));
             } catch (NumberFormatException nfe) {
-                throw new MalformedURLException("Invalid port number in URL \"" + strUrl
-                        + "\": " + auth.substring(1));
+                // rmi.06=Invalid port number in URL "{0}": {0}
+                throw new MalformedURLException(
+                        Messages.getString("rmi.06", strUrl, auth.substring(1))); //$NON-NLS-1$
             }
         }
 
@@ -134,18 +143,18 @@
 
         if (!ignoreEmptyNames) {
             if (path == null || path.length() == 0) {
-                throw new MalformedURLException("Name could not be empty (URL: \"" + strUrl
-                        + "\").");
+                // rmi.07=Name could not be empty (URL: "{0}").
+                throw new MalformedURLException(Messages.getString("rmi.07", strUrl)); //$NON-NLS-1$
             }
         }
 
-        if (path != null && path.startsWith("/")) {
+        if (path != null && path.startsWith("/")) { //$NON-NLS-1$
             path = path.substring(1);
         }
         String host = uri.getHost();
 
         if (host == null) {
-            host = "localhost";
+            host = "localhost"; //$NON-NLS-1$
         }
         return new RegistryURL(host, port, path);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/RemoteException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/RemoteException.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/RemoteException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/RemoteException.java Fri Oct  6 03:15:51 2006
@@ -20,6 +20,8 @@
 
 import java.io.IOException;
 
+import org.apache.harmony.rmi.internal.nls.Messages;
+
 public class RemoteException extends IOException {
     private static final long serialVersionUID = -5148567311918794206L;
 
@@ -50,6 +52,6 @@
         if (detail == null) {
             return super.getMessage();
         }
-        return super.getMessage() + "; nested exception is:\n\t" + detail;
+        return Messages.getString("rmi.08", super.getMessage(),detail); //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/Activatable.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/Activatable.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/Activatable.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/Activatable.java Fri Oct  6 03:15:51 2006
@@ -32,6 +32,7 @@
 import java.rmi.server.RemoteServer;
 
 import org.apache.harmony.rmi.common.RMILog;
+import org.apache.harmony.rmi.internal.nls.Messages;
 import org.apache.harmony.rmi.remoteref.ActivatableServerRef;
 import org.apache.harmony.rmi.server.ExportManager;
 
@@ -86,10 +87,12 @@
      */
     protected Activatable(ActivationID id, int port) throws RemoteException {
         super();
-        rlog.log(RMILog.VERBOSE, "Activatable.<init>[" + id + ", " + port + "]");
+        // rmi.log.05=Activatable.<init>[{0}, {1}]
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.05", id, port)); //$NON-NLS-1$
         this.id = id;
-
-        rlog.log(RMILog.VERBOSE, "Activatable >>> Ready to export object:");
+        
+        // rmi.log.0E=Activatable >>> Ready to export object:
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.0E")); //$NON-NLS-1$
         exportObject(this, id, port);
     }
 
@@ -119,7 +122,8 @@
 
         ActivationSystem as = ActivationGroup.getSystem();
         ActivationID aid = as.registerObject(desc);
-        rlog.log(RMILog.VERBOSE, "aid = " + aid);
+        // rmi.log.0F=aid = {0}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.0F", aid)); //$NON-NLS-1$
 
         return org.apache.harmony.rmi.remoteref.ActivatableRef
                 .getStub(desc, aid);
@@ -164,7 +168,8 @@
         ActivationID aid = ActivationGroup.getSystem().registerObject(adesc);
         Remote stub = exportObject(robj, aid, port);
         ActivationGroup curAG = ActivationGroup.getCurrentAG();
-        System.out.println("CurAG = "+curAG);
+        // rmi.console.00=CurAG = {0}
+        System.out.println(Messages.getString("rmi.console.00", curAG)); //$NON-NLS-1$
         curAG.activeObject(aid, robj);
 
         return aid;
@@ -174,17 +179,21 @@
      * @com.intel.drl.spec_ref
      */
     public static Remote exportObject(Remote robj, ActivationID aid, int port) throws RemoteException {
-        rlog.log(RMILog.VERBOSE, "Activatable >>> exportObject");
+        // rmi.log.10=Activatable >>> exportObject
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.10")); //$NON-NLS-1$
         ActivatableServerRef asr = new ActivatableServerRef(aid, port);
         if (robj instanceof Activatable) {
             ((Activatable) robj).ref = asr;
         }
-        rlog.log(RMILog.VERBOSE, "Activatable >>> ActivatableServerRef=" + asr);
+        // rmi.log.11=Activatable >>> ActivatableServerRef={0}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.11", asr)); //$NON-NLS-1$
 
         ExportManager.exportObject(robj, asr, false, true, true);
-        rlog.log(RMILog.VERBOSE, "Activatable >>> asr after export: " + asr);
+        // rmi.log.12=Activatable >>> asr after export: {0}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.12", asr)); //$NON-NLS-1$
         Remote rmt = RemoteObject.toStub(robj);
-        rlog.log(RMILog.VERBOSE, "Activatable.exportObject: stub = " + rmt);
+        // rmi.log.13=Activatable.exportObject: stub = {0}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.13", rmt)); //$NON-NLS-1$
         return rmt;
     }
 
@@ -216,6 +225,6 @@
      * @com.intel.drl.spec_ref
      */
     public String toString() {
-        return this.getClass() + ": [ActivationID =" + id + "; Ref =" + ref+ "]";
+        return this.getClass() + ": [ActivationID =" + id + "; Ref =" + ref+ "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationDesc.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationDesc.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationDesc.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationDesc.java Fri Oct  6 03:15:51 2006
@@ -25,6 +25,8 @@
 import java.io.Serializable;
 import java.rmi.MarshalledObject;
 
+import org.apache.harmony.rmi.internal.nls.Messages;
+
 
 /**
  * @com.intel.drl.spec_ref
@@ -73,8 +75,8 @@
         ActivationGroupID currentGID = ActivationGroup.currentGroupID();
 
         if (currentGID == null) {
-            throw new ActivationException(
-                    "The default group for this JVM is inactive.");
+            // rmi.0D=The default group for this JVM is inactive.
+            throw new ActivationException(Messages.getString("rmi.0D")); //$NON-NLS-1$
         }
 
         this.groupID = currentGID;
@@ -93,8 +95,8 @@
         ActivationGroupID currentGID = ActivationGroup.currentGroupID();
 
         if (currentGID == null) {
-            throw new ActivationException(
-                    "The default group for this JVM is inactive.");
+            // rmi.0D=The default group for this JVM is inactive.
+            throw new ActivationException(Messages.getString("rmi.0D")); //$NON-NLS-1$
         }
 
         this.groupID = currentGID;
@@ -111,7 +113,8 @@
             String location, MarshalledObject data) {
 
         if (groupID == null) {
-            throw new IllegalArgumentException("The groupID can't be null.");
+            // rmi.10=The groupID can't be null.
+            throw new IllegalArgumentException(Messages.getString("rmi.10")); //$NON-NLS-1$
         }
 
         this.groupID = groupID;
@@ -128,7 +131,8 @@
             String location, MarshalledObject data, boolean restart) {
 
         if (groupID == null) {
-            throw new IllegalArgumentException("The groupID can't be null.");
+            // rmi.10=The groupID can't be null.
+            throw new IllegalArgumentException(Messages.getString("rmi.10")); //$NON-NLS-1$
         }
         this.groupID = groupID;
         this.className = className;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationException.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationException.java Fri Oct  6 03:15:51 2006
@@ -70,6 +70,6 @@
      * @com.intel.drl.spec_ref
      */
     public String getMessage() {
-        return super.getMessage() + "[detail throwable = " + detail + "] ";
+        return super.getMessage() + "[detail throwable = " + detail + "] "; //$NON-NLS-1$ //$NON-NLS-2$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup.java Fri Oct  6 03:15:51 2006
@@ -34,6 +34,7 @@
 
 import org.apache.harmony.rmi.common.GetStringPropAction;
 import org.apache.harmony.rmi.common.RMILog;
+import org.apache.harmony.rmi.internal.nls.Messages;
 
 
 /**
@@ -100,13 +101,13 @@
             Thread.sleep(500);
         } catch (Throwable t) {
         }
-        rlog.log(RMILog.VERBOSE, "ActivationGroup.activeObject: " + id
-                + "; " + mobj);
-        rlog.log(RMILog.VERBOSE, "monitor: " + monitor);
+        // rmi.log.14=ActivationGroup.activeObject: {0}; {1}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.14", id, mobj)); //$NON-NLS-1$
+        // rmi.log.15=monitor: {0}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.15", monitor)); //$NON-NLS-1$
         monitor.activeObject(id, mobj);
-        rlog
-                .log(RMILog.VERBOSE,
-                        "ActivationGroup.activeObject finished.");
+        // rmi.log.16=ActivationGroup.activeObject finished.
+        rlog.log(RMILog.VERBOSE,Messages.getString("rmi.log.16")); //$NON-NLS-1$
     }
 
     /**
@@ -121,8 +122,9 @@
     public static synchronized ActivationGroup createGroup(
             ActivationGroupID id, ActivationGroupDesc desc, long incarnation)
             throws ActivationException {
-        rlog.log(RMILog.VERBOSE, "ActivationGroup.createGroup [id=" + id
-                + ", desc=" + desc + ", incarnation=" + incarnation);
+        // rmi.log.17=ActivationGroup.createGroup [id={0}, desc={1}, incarnation={2}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.17", //$NON-NLS-1$ 
+                new Object[]{id, desc, incarnation})); 
 
         SecurityManager sm = System.getSecurityManager();
 
@@ -136,19 +138,21 @@
          * otherwise.
          */
         String group_CN = (desc.getClassName() == null) ?
-                "org.apache.harmony.rmi.activation.ActivationGroupImpl"
+                "org.apache.harmony.rmi.activation.ActivationGroupImpl" //$NON-NLS-1$
                 : desc.getClassName();
-
-        rlog.log(RMILog.VERBOSE, "group_CN = " + group_CN);
+        // rmi.log.18=group_CN = {0}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.18", group_CN)); //$NON-NLS-1$
 
         if (current_AG != null) {
-            throw new ActivationException(
-                    "The ActivationGroup for this VM already exists.");
+            // rmi.11=The ActivationGroup for this VM already exists.
+            throw new ActivationException(Messages.getString("rmi.11")); //$NON-NLS-1$
         }
         try {
-            rlog.log(RMILog.VERBOSE, "Ready to load ActivationGroupImpl class");
+            // rmi.log.19=Ready to load ActivationGroupImpl class
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.19")); //$NON-NLS-1$
             Class cl = RMIClassLoader.loadClass(desc.getLocation(), group_CN);
-            rlog.log(RMILog.VERBOSE, "ag class = " + cl);
+            // rmi.log.1A=ag class = {0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.1A", cl)); //$NON-NLS-1$
 
             Class[] special_constructor_parameter_classes = {
                     ActivationGroupID.class, MarshalledObject.class };
@@ -158,26 +162,33 @@
             Object[] constructor_parameters = { id, desc.getData() };
             ActivationGroup ag = (ActivationGroup) constructor
                     .newInstance(constructor_parameters);
-            rlog.log(RMILog.VERBOSE, "ag = " + ag);
+            // rmi.log.1B=ag = {0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.1B", ag)); //$NON-NLS-1$
             current_AS = id.getSystem();
-            rlog.log(RMILog.VERBOSE, "current_AS = " + current_AS);
+            // rmi.log.1C=current_AS = {0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.1C", current_AS)); //$NON-NLS-1$
 
             ag.incarnation = incarnation;
-            rlog.log(RMILog.VERBOSE, "ag.incarnation = " + ag.incarnation);
+            // rmi.log.1D=ag.incarnation = {0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.1D", ag.incarnation)); //$NON-NLS-1$
 
             ag.monitor = current_AS.activeGroup(id, ag, incarnation);
-            rlog.log(RMILog.VERBOSE, "ag.monitor = " + ag.monitor);
+            // rmi.log.1E=ag.monitor = {0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.1E", ag.monitor)); //$NON-NLS-1$
 
             current_AG = ag;
             current_AGID = id;
             isGroupCreated = true;
 
         } catch (Throwable t) {
-            rlog.log(RMILog.VERBOSE, "Exception in createGroup: " + t);
+            // rmi.log.1F=Exception in createGroup: {0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.1F", t)); //$NON-NLS-1$
             t.printStackTrace();
-            throw new ActivationException("Unable to create group.", t);
+            // rmi.12=Unable to create group.
+            throw new ActivationException(Messages.getString("rmi.12"), t); //$NON-NLS-1$
         }
-        rlog.log(RMILog.VERBOSE, "Group created: " + current_AG);
+        // rmi.log.20=Group created: {0}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.20", current_AG)); //$NON-NLS-1$
 
         return current_AG;
     }
@@ -194,32 +205,34 @@
      */
     public static synchronized ActivationSystem getSystem()
             throws ActivationException {
-        rlog.log(RMILog.VERBOSE,
-                "---------- ActivationGroup.getSystem() ----------");
+        // rmi.log.21=---------- ActivationGroup.getSystem() ----------
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.21")); //$NON-NLS-1$
         System.out.flush();
 
         try {
             if (current_AS == null) {
 
                 String port = (String)AccessController.doPrivileged(
-                        new GetStringPropAction("java.rmi.activation.port",
-                                                ActivationSystem.SYSTEM_PORT+""));
+                        new GetStringPropAction("java.rmi.activation.port", //$NON-NLS-1$
+                                                ActivationSystem.SYSTEM_PORT+"")); //$NON-NLS-1$
 
-                current_AS = (ActivationSystem) Naming.lookup("//:" + port
-                        + "/java.rmi.activation.ActivationSystem");
-                rlog.log(RMILog.VERBOSE,
-                        "Activation System was got using Naming.lookup() at port "
-                                + port);
+                current_AS = (ActivationSystem) Naming.lookup("//:" + port //$NON-NLS-1$
+                        + "/java.rmi.activation.ActivationSystem"); //$NON-NLS-1$
+                // rmi.log.22=Activation System was got using Naming.lookup() at port {0}
+                rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.22", port)); //$NON-NLS-1$
             }
         } catch (Throwable t) {
-            throw new ActivationException("getSystem fails.", t);
+            // rmi.13=getSystem fails.
+            throw new ActivationException(Messages.getString("rmi.13"), t); //$NON-NLS-1$
         }
-        rlog.log(RMILog.VERBOSE, "current_AS = " + current_AS);
-        rlog.log(RMILog.VERBOSE, "current_AS.ref = "
-                + ((RemoteObject) current_AS).getRef());
+        // rmi.log.1C=current_AS = {0}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.1C", current_AS)); //$NON-NLS-1$
+        // rmi.log.23=current_AS.ref = {0}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.23", //$NON-NLS-1$
+                ((RemoteObject) current_AS).getRef()));
 
-        rlog.log(RMILog.VERBOSE,
-                "---------- END -> ActivationGroup.getSystem() ----------");
+        // rmi.log.24=---------- END -> ActivationGroup.getSystem() ----------
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.24")); //$NON-NLS-1$
 
         return current_AS;
     }
@@ -247,8 +260,8 @@
     public static synchronized void setSystem(ActivationSystem system)
             throws ActivationException {
         if (current_AS != null) {
-            throw new ActivationException(
-                    "The ActivationSystem for this ActivationGroup was already defined.");
+            // rmi.14=The ActivationSystem for this ActivationGroup was already defined.
+            throw new ActivationException(Messages.getString("rmi.14")); //$NON-NLS-1$
         }
         current_AS = system;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroupID.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroupID.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroupID.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroupID.java Fri Oct  6 03:15:51 2006
@@ -79,6 +79,6 @@
 
      */
     public String toString() {
-        return "ActivationGroupID[" + uid + "; " + system + "]";
+        return "ActivationGroupID[" + uid + "; " + system + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup_Stub.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup_Stub.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup_Stub.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup_Stub.java Fri Oct  6 03:15:51 2006
@@ -10,6 +10,8 @@
  */
 package java.rmi.activation;
 
+import org.apache.harmony.rmi.internal.nls.Messages;
+
 
 public final class ActivationGroup_Stub extends java.rmi.server.RemoteStub
         implements java.rmi.activation.ActivationInstantiator, java.rmi.Remote {
@@ -20,10 +22,10 @@
 
     static {
         try {
-            $method_newInstance_0 = java.rmi.activation.ActivationInstantiator.class.getMethod("newInstance", new java.lang.Class[] {java.rmi.activation.ActivationID.class, java.rmi.activation.ActivationDesc.class});
+            $method_newInstance_0 = java.rmi.activation.ActivationInstantiator.class.getMethod("newInstance", new java.lang.Class[] {java.rmi.activation.ActivationID.class, java.rmi.activation.ActivationDesc.class}); //$NON-NLS-1$
         } catch (java.lang.NoSuchMethodException e) {
-            throw new java.lang.NoSuchMethodError(
-                    "Stub class initialization failed: java.rmi.activation.ActivationGroup_Stub");
+            // rmi.0B=Stub class initialization failed: java.rmi.activation.ActivationGroup_Stub
+            throw new java.lang.NoSuchMethodError(Messages.getString("rmi.0B")); //$NON-NLS-1$
         }
     }
 
@@ -44,7 +46,8 @@
         } catch (java.rmi.activation.ActivationException e) {
             throw e;
         } catch (java.lang.Exception e) {
-            throw new java.rmi.UnexpectedException("Undeclared checked exception", e);
+            // rmi.0C=Undeclared checked exception
+            throw new java.rmi.UnexpectedException(Messages.getString("rmi.0C"), e); //$NON-NLS-1$
         }
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationID.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationID.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationID.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/activation/ActivationID.java Fri Oct  6 03:15:51 2006
@@ -36,6 +36,7 @@
 import java.rmi.server.UID;
 
 import org.apache.harmony.rmi.common.RMILog;
+import org.apache.harmony.rmi.internal.nls.Messages;
 
 
 /**
@@ -75,30 +76,28 @@
      */
     public Remote activate(boolean force) throws ActivationException,
             UnknownObjectException, RemoteException {
-        rlog.log(RMILog.VERBOSE, "ActivationID.activate: activator = "
-                + activator);
+        // rmi.log.00=ActivationID.activate: activator = {0}
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.00", activator)); //$NON-NLS-1$
 
         try {
             MarshalledObject stub = (MarshalledObject) activator.activate(this,
                     force);
-            rlog.log(RMILog.VERBOSE, "ActivationID.activate:stub=" + stub);
+            // rmi.log.01=ActivationID.activate:stub={0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.01", stub)); //$NON-NLS-1$
             Remote deserialized_stub = (Remote) stub.get();
+            // rmi.log.02=ActivationID.activate: deserialized_stub = {0}
             rlog.log(RMILog.VERBOSE,
-                    "ActivationID.activate: deserialized_stub = "
-                            + deserialized_stub);
-
-            rlog.log(RMILog.VERBOSE,
-                    "<<<<<<<<< ActivationID.activate COMPLETED.");
+                    Messages.getString("rmi.log.02", deserialized_stub)); //$NON-NLS-1$
+            // rmi.log.03=<<<<<<<<< ActivationID.activate COMPLETED.
+            rlog.log(RMILog.VERBOSE,Messages.getString("rmi.log.03")); //$NON-NLS-1$
 
             return deserialized_stub;
         } catch (IOException ioe) {
-            throw new RemoteException(
-                    "An IOException occured while deserializing the object" +
-                    " from its internal representation.");
+            // rmi.0E=An IOException occured while deserializing the object from its internal representation.
+            throw new RemoteException(Messages.getString("rmi.0E")); //$NON-NLS-1$
         } catch (ClassNotFoundException cnfe) {
-            throw new RemoteException(
-                    "A ClassNotFoundException occured while deserializing the " +
-                    "object from its internal representation.");
+            // rmi.0F=A ClassNotFoundException occured while deserializing the object from its internal representation.
+            throw new RemoteException(Messages.getString("rmi.0F")); //$NON-NLS-1$
         }
     }
 
@@ -128,33 +127,39 @@
      */
     private void readObject(ObjectInputStream in) throws IOException,
             ClassNotFoundException {
-        rlog.log(RMILog.VERBOSE, "ActivationID.readObject:");
+        // rmi.log.06=ActivationID.readObject:
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.06")); //$NON-NLS-1$
         try {
             uid = (UID) in.readObject();
-            rlog.log(RMILog.VERBOSE, "UID=" + uid);
+            // rmi.log.07=UID={0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.07", uid)); //$NON-NLS-1$
 
             String refType = in.readUTF();
-            rlog.log(RMILog.VERBOSE, "refType=" + refType);
+            // rmi.log.08=refType={0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.08", refType)); //$NON-NLS-1$
 
-            Class cl = Class.forName("org.apache.harmony.rmi.remoteref."
+            Class cl = Class.forName("org.apache.harmony.rmi.remoteref." //$NON-NLS-1$
                     + refType);
             RemoteRef ref = (RemoteRef) cl.newInstance();
-            rlog.log(RMILog.VERBOSE, "ref = " + ref);
+            // rmi.log.09=ref = {0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.09", ref)); //$NON-NLS-1$
             ref.readExternal(in);
-            rlog.log(RMILog.VERBOSE, "readExternal finished successfully.");
+            // rmi.log.0A=readExternal finished successfully.
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.0A")); //$NON-NLS-1$
 
             Class activator_class = RMIClassLoader.loadClass((String) null,
-                    "org.apache.harmony.rmi.activation.Rmid_Stub");
+                    "org.apache.harmony.rmi.activation.Rmid_Stub"); //$NON-NLS-1$
             Class constructor_parameter_classes[] = { RemoteRef.class };
             Constructor constructor = activator_class
                     .getConstructor(constructor_parameter_classes);
             Object[] constructor_parameters = { ref };
             activator = (Activator) constructor
                     .newInstance(constructor_parameters);
-            rlog.log(RMILog.VERBOSE,
-                    "ActivationID.readObject COMPLETED.");
+            // rmi.log.0B=ActivationID.readObject COMPLETED.
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.0B")); //$NON-NLS-1$
         } catch (Throwable t) {
-            throw new IOException("Unable to deserialize ActivationID: " + t);
+            // rmi.09=Unable to deserialize ActivationID: {0}
+            throw new IOException(Messages.getString("rmi.09", t)); //$NON-NLS-1$
         }
     }
 
@@ -163,24 +168,29 @@
      */
     private void writeObject(ObjectOutputStream out) throws IOException,
             ClassNotFoundException {
-        rlog.log(RMILog.VERBOSE, "ActivationID.writeObject:");
+        // rmi.log.0C=ActivationID.writeObject:
+        rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.0C")); //$NON-NLS-1$
         try {
             out.writeObject(uid);
-            rlog.log(RMILog.VERBOSE, "activator = " + activator);
+            // rmi.log.0D=activator = {0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.0D", activator)); //$NON-NLS-1$
 
             RemoteRef ref = ((RemoteObject) activator).getRef();
-            rlog.log(RMILog.VERBOSE, "ref = " + ref);
+            // rmi.log.09=ref = {0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.09", ref)); //$NON-NLS-1$
 
             String refType = ref.getRefClass(out);
-            rlog.log(RMILog.VERBOSE, "refType = " + refType);
+            // rmi.log.08=refType={0}
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.08", refType)); //$NON-NLS-1$
             out.writeUTF(refType);
             ref.writeExternal(out);
-            rlog.log(RMILog.VERBOSE,
-                    "ActivationID.writeObject COMPLETED.");
+            // rmi.log.04=ActivationID.writeObject COMPLETED.
+            rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.04")); //$NON-NLS-1$
 
         } catch (Throwable t) {
-            throw new IOException("Unable to serialize ActivationID: "
-                    + t.getMessage());
+            // rmi.0A=Unable to serialize ActivationID: {0}
+            throw new IOException(Messages.getString("rmi.0A", t.getMessage()));//$NON-NLS-1$
+                    
         }
     }
 
@@ -188,6 +198,6 @@
      * @com.intel.drl.spec_ref
      */
     public String toString() {
-        return "ActivationID: " + "[" + uid + "; " + activator + "]";
+        return "ActivationID: " + "[" + uid + "; " + activator + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/dgc/VMID.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/dgc/VMID.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/dgc/VMID.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/dgc/VMID.java Fri Oct  6 03:15:51 2006
@@ -82,14 +82,14 @@
      * each byte.
      */
     public String toString() {
-        String str = "VMID[";
+        String str = "VMID["; //$NON-NLS-1$
 
         for (int i = 0; i < addr.length; ++i) {
             int ibyte = addr[i] & 255; // quick way to have a module of the byte
 
-            str += ((ibyte < 16) ? "0" : "") + Integer.toString(ibyte, 16);
+            str += ((ibyte < 16) ? "0" : "") + Integer.toString(ibyte, 16); //$NON-NLS-1$ //$NON-NLS-2$
         }
-        return str + ", " + uid + "]";
+        return str + ", " + uid + "]"; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/registry/LocateRegistry.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/registry/LocateRegistry.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/registry/LocateRegistry.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/registry/LocateRegistry.java Fri Oct  6 03:15:51 2006
@@ -30,6 +30,7 @@
 import java.rmi.server.ObjID;
 import java.rmi.server.RemoteRef;
 
+import org.apache.harmony.rmi.internal.nls.Messages;
 import org.apache.harmony.rmi.registry.RegistryImpl;
 import org.apache.harmony.rmi.remoteref.UnicastRef;
 import org.apache.harmony.rmi.remoteref.UnicastRef2;
@@ -56,7 +57,8 @@
                                           RMIServerSocketFactory ssf)
             throws RemoteException {
         if (port < 0) {
-            throw new IllegalArgumentException("Port value out of range: " + port);
+            // rmi.15=Port value out of range: {0}
+            throw new IllegalArgumentException(Messages.getString("rmi.15", port)); //$NON-NLS-1$
         }
         return new RegistryImpl(port, csf, ssf);
     }
@@ -72,7 +74,7 @@
             try {
                 host = InetAddress.getLocalHost().getHostName();
             } catch (UnknownHostException uhe) {
-                host = "localhost";
+                host = "localhost"; //$NON-NLS-1$
             }
         }
 
@@ -82,7 +84,7 @@
 
         try {
             Class regClass = Class.forName(
-                    "org.apache.harmony.rmi.registry.RegistryImpl_Stub");
+                    "org.apache.harmony.rmi.registry.RegistryImpl_Stub"); //$NON-NLS-1$
             RemoteRef ref;
 
             if (csf == null) {
@@ -95,7 +97,8 @@
                     new Class[] { RemoteRef.class }).newInstance(
                             new Object[] { ref });
         } catch (Exception ex) {
-            throw new RemoteException("Unable to get registry.", ex);
+            // rmi.16=Unable to get registry.
+            throw new RemoteException(Messages.getString("rmi.16"), ex); //$NON-NLS-1$
         }
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LoaderHandler.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LoaderHandler.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LoaderHandler.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LoaderHandler.java Fri Oct  6 03:15:51 2006
@@ -41,7 +41,7 @@
      * @com.intel.drl.spec_ref
      */
     @Deprecated
-    public static final String packagePrefix = "org.apache.harmony.rmi";
+    public static final String packagePrefix = "org.apache.harmony.rmi"; //$NON-NLS-1$
 
     /**
      * @com.intel.drl.spec_ref

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LogStream.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LogStream.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LogStream.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/LogStream.java Fri Oct  6 03:15:51 2006
@@ -86,7 +86,7 @@
      */
     @Deprecated
     public String toString() {
-        return "LogStream[" + name + "]";
+        return "LogStream[" + name + "]"; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -111,7 +111,7 @@
             } else {
                 if (isFirstByte) {
                     isFirstByte = false;
-                    print(toString() + ":");
+                    print(toString() + ":"); //$NON-NLS-1$
                 }
                 super.write(b);
             }
@@ -147,11 +147,11 @@
         }
         levelStr = levelStr.trim().toUpperCase();
 
-        if (levelStr.equals("SILENT")) {
+        if (levelStr.equals("SILENT")) { //$NON-NLS-1$
             return SILENT;
-        } else if (levelStr.equals("BRIEF")) {
+        } else if (levelStr.equals("BRIEF")) { //$NON-NLS-1$
             return BRIEF;
-        } else if (levelStr.equals("VERBOSE")) {
+        } else if (levelStr.equals("VERBOSE")) { //$NON-NLS-1$
             return VERBOSE;
         } else {
             try {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/ObjID.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/ObjID.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/ObjID.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/ObjID.java Fri Oct  6 03:15:51 2006
@@ -88,7 +88,7 @@
      * @com.intel.drl.spec_ref
      */
     public String toString() {
-        return "ObjID[" + objNum + ", " + space + "]";
+        return "ObjID[" + objNum + ", " + space + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java Fri Oct  6 03:15:51 2006
@@ -31,6 +31,7 @@
 import java.security.PrivilegedAction;
 
 import org.apache.harmony.rmi.DefaultRMIClassLoaderSpi;
+import org.apache.harmony.rmi.internal.nls.Messages;
 
 
 /**
@@ -43,11 +44,11 @@
 public class RMIClassLoader {
 
     // The name of property for custom RMIClassLoaderSpi.
-    private static final String spiProp = "java.rmi.server.RMIClassLoaderSpi";
+    private static final String spiProp = "java.rmi.server.RMIClassLoaderSpi"; //$NON-NLS-1$
 
     // The name of resource for custom RMIClassLoaderSpi.
     private static final String spiResource =
-            "META-INF/services/java.rmi.server.RMIClassLoaderSpi";
+            "META-INF/services/java.rmi.server.RMIClassLoaderSpi"; //$NON-NLS-1$
 
     /*
      * Default RMIClassLoaderSpi instance.
@@ -151,7 +152,7 @@
         SecurityManager mgr = System.getSecurityManager();
 
         if (mgr != null) {
-            mgr.checkPermission(new RuntimePermission("setFactory"));
+            mgr.checkPermission(new RuntimePermission("setFactory")); //$NON-NLS-1$
         }
         return defaultSpi;
     }
@@ -163,7 +164,7 @@
         String spi = System.getProperty(spiProp);
 
         if (spi != null) {
-            if (spi.equals("default")) {
+            if (spi.equals("default")) { //$NON-NLS-1$
                 return defaultSpi;
             }
 
@@ -171,17 +172,16 @@
                 return (RMIClassLoaderSpi) (Class.forName(spi, false,
                         ClassLoader.getSystemClassLoader()).newInstance());
             } catch (Exception ex) {
-                throw new Error(
-                        "Unable to initialize RMIClassLoaderSpi instance " + spi
-                        + ", specified in " + spiProp + " property", ex);
+                // rmi.1B=Unable to initialize RMIClassLoaderSpi instance {0}, specified in {1} property
+                throw new Error(Messages.getString("rmi.1B", spi, spiProp), ex); //$NON-NLS-1$
             }
         }
 
         try {
             spi = getSpiFromResource();
         } catch (IOException ioe) {
-            throw new Error("Unable to get RMIClassLoaderSpi name from "
-                    + "resource " + spiResource, ioe);
+            // rmi.1C=Unable to get RMIClassLoaderSpi name from resource {0}
+            throw new Error(Messages.getString("rmi.1C", spiResource), ioe); //$NON-NLS-1$
         }
 
         if (spi != null) {
@@ -189,9 +189,8 @@
                 return (RMIClassLoaderSpi) (Class.forName(spi, true,
                         ClassLoader.getSystemClassLoader()).newInstance());
             } catch (Exception ex) {
-                throw new Error(
-                        "Unable to initialize RMIClassLoaderSpi instance " + spi
-                        + ", specified in " + spiResource + " resource", ex);
+                // rmi.1D=Unable to initialize RMIClassLoaderSpi instance {0}, specified in {1} resource
+                throw new Error(Messages.getString("rmi.1D", spi, spiResource), ex); //$NON-NLS-1$
             }
         }
         return defaultSpi;
@@ -216,12 +215,12 @@
         Object obj = null;
         byte[] buf = new byte[in.available()];
         in.read(buf);
-        String str = new String(buf, "UTF-8");
-        StringTokenizer tok = new StringTokenizer(str, "\n\r");
+        String str = new String(buf, "UTF-8"); //$NON-NLS-1$
+        StringTokenizer tok = new StringTokenizer(str, "\n\r"); //$NON-NLS-1$
 
         while (tok.hasMoreTokens()) {
             String spiName = tok.nextToken();
-            int idx = spiName.indexOf("#");
+            int idx = spiName.indexOf("#"); //$NON-NLS-1$
 
             if (idx != -1) {
                 // this is commented line
@@ -238,6 +237,6 @@
         }
 
         // we did not found any uncommented non-empty lines
-        return "";
+        return ""; //$NON-NLS-1$
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMISocketFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMISocketFactory.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMISocketFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RMISocketFactory.java Fri Oct  6 03:15:51 2006
@@ -26,6 +26,7 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 
+import org.apache.harmony.rmi.internal.nls.Messages;
 import org.apache.harmony.rmi.transport.DefaultRMISocketFactory;
 
 
@@ -84,7 +85,8 @@
         }
 
         if (globalRsf == null) {
-            throw new IOException("RMISocketFactory has been already set.");
+            // rmi.1F=RMISocketFactory has been already set.
+            throw new IOException(Messages.getString("rmi.1F")); //$NON-NLS-1$
         }
         globalRsf = rsf;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteObject.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteObject.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteObject.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteObject.java Fri Oct  6 03:15:51 2006
@@ -32,6 +32,7 @@
 import java.rmi.UnmarshalException;
 
 import org.apache.harmony.rmi.common.RMIUtil;
+import org.apache.harmony.rmi.internal.nls.Messages;
 import org.apache.harmony.rmi.server.ExportManager;
 
 
@@ -75,7 +76,7 @@
     public String toString() {
         String clName = RMIUtil.getShortName(getClass());
         return (ref == null) ? clName
-                : clName + "[" + ref.remoteToString() + "]";
+                : clName + "[" + ref.remoteToString() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**
@@ -115,8 +116,8 @@
     private void writeObject(ObjectOutputStream out)
             throws IOException {
         if (ref == null) {
-            throw new MarshalException(
-                    "Invalid remote object: RemoteRef = null");
+            // rmi.17=Invalid remote object: RemoteRef = null
+            throw new MarshalException(Messages.getString("rmi.17")); //$NON-NLS-1$
         }
         String refType = ref.getRefClass(out);
 
@@ -124,7 +125,7 @@
             out.writeUTF(refType);
             ref.writeExternal(out);
         } else {
-            out.writeUTF("");
+            out.writeUTF(""); //$NON-NLS-1$
             out.writeObject(ref);
         }
     }
@@ -148,13 +149,13 @@
             // well-known RemoteRef types
             // TODO: the following line is a temporary solution. Line after
             //       that should be uncommented later.
-            String refClName = "org.apache.harmony.rmi.remoteref." + refName;
+            String refClName = "org.apache.harmony.rmi.remoteref." + refName; //$NON-NLS-1$
             //String refClName = RemoteRef.packagePrefix + "." + refName;
             ref = ((RemoteRef) Class.forName(refClName).newInstance());
             ref.readExternal(in);
         } catch (Exception ex) {
-            throw new UnmarshalException("Unable to create RemoteRef instance",
-                    ex);
+            // rmi.18=Unable to create RemoteRef instance
+            throw new UnmarshalException(Messages.getString("rmi.18"), ex);//$NON-NLS-1$
         }
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteObjectInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteObjectInvocationHandler.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteObjectInvocationHandler.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteObjectInvocationHandler.java Fri Oct  6 03:15:51 2006
@@ -30,6 +30,7 @@
 import java.rmi.UnexpectedException;
 
 import org.apache.harmony.rmi.common.RMIHash;
+import org.apache.harmony.rmi.internal.nls.Messages;
 
 
 /**
@@ -50,8 +51,8 @@
         super(ref);
 
         if (ref == null) {
-            throw new NullPointerException(
-                    "RemoteRef parameter could not be null.");
+            // rmi.20=RemoteRef parameter could not be null.
+            throw new NullPointerException(Messages.getString("rmi.20")); //$NON-NLS-1$
         }
     }
 
@@ -65,8 +66,8 @@
         if (m.getDeclaringClass() == Object.class) {
             return invokeObjectMethod(proxy, m, args);
         } else if (!(proxy instanceof Remote)) {
-            throw new IllegalArgumentException(
-                    "Proxy does not implement Remote interface.");
+            // rmi.21=Proxy does not implement Remote interface.
+            throw new IllegalArgumentException(Messages.getString("rmi.21")); //$NON-NLS-1$
         } else {
             return invokeRemoteMethod(proxy, m, args);
         }
@@ -76,8 +77,9 @@
      * @com.intel.drl.spec_ref
      */
     private void readObjectNoData() throws InvalidObjectException {
-        throw new InvalidObjectException("No data in stream for class "
-                + this.getClass().getName());
+        // rmi.22=No data in stream for class {0} 
+        throw new InvalidObjectException(Messages.getString("rmi.22", //$NON-NLS-1$
+                this.getClass().getName()));
     }
 
     /*
@@ -86,30 +88,30 @@
     private Object invokeObjectMethod(Object proxy, Method m, Object[] args) {
         String mName = m.getName();
 
-        if (mName.equals("hashCode")) {
+        if (mName.equals("hashCode")) { //$NON-NLS-1$
             // return result of hashCode method call from RemoteObject class
             return new Integer(hashCode());
-        } else if (mName.equals("equals")) {
+        } else if (mName.equals("equals")) { //$NON-NLS-1$
             Object obj = args[0];
             return new Boolean((proxy == obj) // the same object?
                     || (obj != null && Proxy.isProxyClass(obj.getClass())
                             && equals(Proxy.getInvocationHandler(obj))));
-        } else if (mName.equals("toString")) {
+        } else if (mName.equals("toString")) { //$NON-NLS-1$
             Class[] interf = proxy.getClass().getInterfaces();
 
             if (interf.length == 0) {
-                return "Proxy[" + toString() + "]";
+                return "Proxy[" + toString() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
             }
-            String str = "Proxy[interf:[";
+            String str = "Proxy[interf:["; //$NON-NLS-1$
 
             for (int i = 0; i < interf.length - 1; ++i) {
-                str += interf[i].getName() + ", ";
+                str += interf[i].getName() + ", "; //$NON-NLS-1$
             }
-            return str + interf[interf.length - 1].getName() + "], "
-                    + toString() + "]";
+            return str + interf[interf.length - 1].getName() + "], " //$NON-NLS-1$
+                    + toString() + "]"; //$NON-NLS-1$
         } else {
-            throw new IllegalArgumentException(
-                    "Illegal method from Object class: " + m);
+            // rmi.23=Illegal method from Object class: {0}
+            throw new IllegalArgumentException(Messages.getString("rmi.23", m)); //$NON-NLS-1$
         }
     }
 
@@ -133,7 +135,8 @@
                     throw ex;
                 }
             }
-            throw new UnexpectedException("Unexpected exception", ex);
+            // rmi.24=Unexpected exception
+            throw new UnexpectedException(Messages.getString("rmi.24"), ex); //$NON-NLS-1$
         }
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteRef.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteRef.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteRef.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteRef.java Fri Oct  6 03:15:51 2006
@@ -41,7 +41,7 @@
 
     /** @com.intel.drl.spec_ref */
     public static final String packagePrefix =
-            "org.apache.harmony.rmi.remoteref";
+            "org.apache.harmony.rmi.remoteref"; //$NON-NLS-1$
 
     /**
      * @com.intel.drl.spec_ref

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteServer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteServer.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteServer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/RemoteServer.java Fri Oct  6 03:15:51 2006
@@ -27,6 +27,7 @@
 import java.util.logging.LoggingPermission;
 
 import org.apache.harmony.rmi.common.RMILog;
+import org.apache.harmony.rmi.internal.nls.Messages;
 import org.apache.harmony.rmi.server.ServerConnectionManager;
 
 
@@ -61,8 +62,8 @@
         String host = ServerConnectionManager.getClientHost();
 
         if (host == null) {
-            throw new ServerNotActiveException(
-                    "There are no in-progress RMI calls in this thread.");
+            // rmi.19=There are no in-progress RMI calls in this thread.
+            throw new ServerNotActiveException(Messages.getString("rmi.19")); //$NON-NLS-1$
         }
         return host;
     }
@@ -81,7 +82,7 @@
         SecurityManager mgr = System.getSecurityManager();
 
         if (mgr != null) {
-            mgr.checkPermission(new LoggingPermission("control", null));
+            mgr.checkPermission(new LoggingPermission("control", null)); //$NON-NLS-1$
         }
         RMILog.getServerCallsLog().setOutputStream(out);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/ServerCloneException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/ServerCloneException.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/ServerCloneException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/ServerCloneException.java Fri Oct  6 03:15:51 2006
@@ -22,6 +22,8 @@
  */
 package java.rmi.server;
 
+import org.apache.harmony.rmi.internal.nls.Messages;
+
 
 /**
  * @com.intel.drl.spec_ref
@@ -68,7 +70,8 @@
         if (detail == null) {
             return super.getMessage();
         } else {
-            return super.getMessage() + " Caused by: " + detail.getMessage();
+            // rmi.1E={0} Caused by: {1}
+            return Messages.getString("rmi.1E", super.getMessage(), detail.getMessage()); //$NON-NLS-1$
         }
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/UID.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/UID.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/UID.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/UID.java Fri Oct  6 03:15:51 2006
@@ -92,9 +92,9 @@
      * @com.intel.drl.spec_ref
      */
     public String toString() {
-        return "UID[" + Integer.toString(unique, 16) + ":"
-                      + Long.toString(time, 16) + ":"
-                      + Integer.toString(count, 16) + "]";
+        return "UID[" + Integer.toString(unique, 16) + ":" //$NON-NLS-1$ //$NON-NLS-2$
+                      + Long.toString(time, 16) + ":" //$NON-NLS-1$
+                      + Integer.toString(count, 16) + "]"; //$NON-NLS-1$
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/UnicastRemoteObject.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/UnicastRemoteObject.java?view=diff&rev=453541&r1=453540&r2=453541
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/UnicastRemoteObject.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/server/UnicastRemoteObject.java Fri Oct  6 03:15:51 2006
@@ -28,6 +28,7 @@
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
+import org.apache.harmony.rmi.internal.nls.Messages;
 import org.apache.harmony.rmi.remoteref.UnicastServerRef;
 import org.apache.harmony.rmi.remoteref.UnicastServerRef2;
 import org.apache.harmony.rmi.server.ExportManager;
@@ -83,7 +84,8 @@
             clonedObj.export();
             return clonedObj;
         } catch (RemoteException re) {
-            throw new ServerCloneException("Unable to clone the object", re);
+            // rmi.1A=Unable to clone the object
+            throw new ServerCloneException(Messages.getString("rmi.1A"), re); //$NON-NLS-1$
         }
     }
 

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=453541&r1=453540&r2=453541
==============================================================================
--- 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:15:51 2006
@@ -52,6 +52,7 @@
 import org.apache.harmony.rmi.common.GetStringPropAction;
 import org.apache.harmony.rmi.common.RMILog;
 import org.apache.harmony.rmi.common.RMIProperties;
+import org.apache.harmony.rmi.internal.nls.Messages;
 
 
 /**
@@ -93,10 +94,11 @@
                                 ClassLoader defaultLoader)
             throws MalformedURLException, ClassNotFoundException {
         if (loaderLog.isLoggable(RMILog.VERBOSE)) {
-            loaderLog.log(RMILog.VERBOSE, "Loading proxy class: interf=["
-                    + Arrays.asList(interf) + "], codebase=\""
-                    + ((codebase == null) ? "" : codebase)
-                    + "\", defaultLoader=" + defaultLoader);
+            // rmi.log.25=Loading proxy class: interf=[{0}], codebase="{1}", defaultLoader={2}
+            loaderLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.25", //$NON-NLS-1$
+                    new Object[]{Arrays.asList(interf),
+                        ((codebase == null) ? "" : codebase), //$NON-NLS-1$
+                        defaultLoader}));
         }
         Class[] interfCl = new Class[interf.length];
         ClassLoader codebaseLoader = null;
@@ -106,10 +108,9 @@
             codebaseLoader = getClassLoader1(codebase);
         } catch (SecurityException se) {
             if (loaderLog.isLoggable(RMILog.BRIEF)) {
-                loaderLog.log(RMILog.BRIEF,
-                        "Could not obtain classloader for codebase \""
-                        + ((codebase == null) ? "" : codebase)
-                        + "\" (access denied).");
+                // rmi.log.26=Could not obtain classloader for codebase "{0}" (access denied).
+                loaderLog.log(RMILog.BRIEF, Messages.getString("rmi.log.26", //$NON-NLS-1$
+                        ((codebase == null) ? "" : codebase))); //$NON-NLS-1$
             }
             ex = se;
         }
@@ -123,10 +124,10 @@
                             defaultLoader);
                 } catch (Exception ex1) {
                     if (loaderLog.isLoggable(RMILog.VERBOSE)) {
-                        loaderLog.log(RMILog.VERBOSE,
-                                "Unable to load interface " + interf[i]
-                                + " via default loader " + defaultLoader + ":"
-                                + ex1);
+                        // rmi.log.27=Unable to load interface {0} via default loader {1}:{2}
+                        loaderLog.log(RMILog.VERBOSE, Messages.getString(
+                                "rmi.log.27", new Object[] { interf[i], //$NON-NLS-1$
+                                        defaultLoader, ex1 }));
                     }
                     failed = true;
                 }
@@ -139,9 +140,9 @@
                     Thread.currentThread().getContextClassLoader();
 
                 if (loaderLog.isLoggable(RMILog.VERBOSE)) {
-                    loaderLog.log(RMILog.VERBOSE,
-                        "Trying thread context classloader ("
-                        + curLoader + ").");
+                    // rmi.log.28=Trying thread context classloader ({0}).
+                    loaderLog.log(RMILog.VERBOSE, Messages.getString(
+                            "rmi.log.28", curLoader)); //$NON-NLS-1$
                 }
                 codebaseLoader = curLoader;
 
@@ -153,24 +154,23 @@
                             codebaseLoader);
                 } catch (Exception ex1) {
                     if (loaderLog.isLoggable(RMILog.BRIEF)) {
-                        loaderLog.log(RMILog.BRIEF,
-                                "Unable to load interface " + interf[i]
-                                + " via " + codebaseLoader);
+                        // rmi.log.29=Unable to load interface {0} via {1}
+                        loaderLog.log(RMILog.BRIEF, Messages.getString(
+                                "rmi.log.29", interf[i], codebaseLoader)); //$NON-NLS-1$
                     }
 
                     if (ex != null) {
-                        String msg = "Could not load proxy class "
-                            + "(access to loader for codebase \""
-                            + ((codebase == null) ? "" : codebase)
-                            + "\" denied).";
+                        // rmi.log.2A=Could not load proxy class (access to loader for codebase "{0}" denied).
+                        String msg = Messages.getString("rmi.log.2A", //$NON-NLS-1$
+                                ((codebase == null) ? "" : codebase)); //$NON-NLS-1$
 
                         if (loaderLog.isLoggable(RMILog.BRIEF)) {
                             loaderLog.log(RMILog.BRIEF, msg);
                         }
                         throw new ClassNotFoundException(msg, ex);
                     } else {
-                        throw new ClassNotFoundException(
-                                "Unable to load proxy class", ex1);
+                        // rmi.25=Unable to load proxy class
+                        throw new ClassNotFoundException(Messages.getString("rmi.25"), ex1); //$NON-NLS-1$
                     }
                 }
             }
@@ -191,10 +191,9 @@
                     interfLoader = loader;
                 } else if (!interfLoader.equals(loader)) {
                     if (loaderLog.isLoggable(RMILog.BRIEF)) {
-                        loaderLog.log(RMILog.BRIEF, "Non-public interface "
-                                + interfCl[i] + " is loaded by another loader ("
-                                + loader + ") then others (" + interfLoader
-                                + ")");
+                        // rmi.log.2B=Non-public interface {0} is loaded by another loader ({1}) then others ({2})
+                        loaderLog.log(RMILog.BRIEF, Messages.getString("rmi.log.2B", //$NON-NLS-1$
+                                new Object[] { interfCl[i], loader, interfLoader }));
                     }
                     sameLoader = false;
                 }
@@ -209,26 +208,27 @@
                 proxyCl = Proxy.getProxyClass(codebaseLoader, interfCl);
 
                 if (loaderLog.isLoggable(RMILog.BRIEF)) {
-                    loaderLog.log(RMILog.BRIEF, "Loaded proxy class "
-                            + proxyCl + " via " + codebaseLoader);
+                    // rmi.log.2C=Loaded proxy class {0} via {1}
+                    loaderLog.log(RMILog.BRIEF, Messages.getString("rmi.log.2C", //$NON-NLS-1$
+                            proxyCl, codebaseLoader));
                 }
             } catch (IllegalArgumentException iae) {
                 try {
                     proxyCl = Proxy.getProxyClass(defaultLoader, interfCl);
 
                     if (loaderLog.isLoggable(RMILog.BRIEF)) {
-                        loaderLog.log(RMILog.BRIEF, "Loaded proxy class "
-                                + proxyCl + " via " + defaultLoader);
+                        // rmi.log.2C=Loaded proxy class {0} via {1}
+                        loaderLog.log(RMILog.BRIEF, Messages.getString("rmi.log.2C", //$NON-NLS-1$
+                                proxyCl, defaultLoader));
                     }
                 } catch (IllegalArgumentException iae1) {
                     if (loaderLog.isLoggable(RMILog.BRIEF)) {
-                        loaderLog.log(RMILog.BRIEF,
-                                "Unable to load proxy class via both "
-                                + "loaders (" + codebaseLoader + ", "
-                                + defaultLoader + ")");
+                        // rmi.log.2D=Unable to load proxy class via both loaders ({0}, {1})
+                        loaderLog.log(RMILog.BRIEF, Messages.getString("rmi.log.2D", //$NON-NLS-1$
+                                codebaseLoader, defaultLoader));
                     }
-                    throw new ClassNotFoundException(
-                            "Unable to load proxy class", iae1);
+                    // rmi.25=Unable to load proxy class
+                    throw new ClassNotFoundException(Messages.getString("rmi.25"), iae1); //$NON-NLS-1$
                 }
             }
             return proxyCl;
@@ -240,12 +240,14 @@
             Class proxyCl = Proxy.getProxyClass(interfLoader, interfCl);
 
             if (loaderLog.isLoggable(RMILog.BRIEF)) {
-                loaderLog.log(RMILog.BRIEF, "Loaded proxy class "
-                        + proxyCl + " via " + interfLoader);
+                // rmi.log.2C=Loaded proxy class {0} via {1}
+                loaderLog.log(RMILog.BRIEF, Messages.getString("rmi.log.2C", //$NON-NLS-1$
+                        proxyCl, interfLoader));
             }
             return proxyCl;
         }
-        throw new LinkageError("Unable to load proxy class");
+        // rmi.25=Unable to load proxy class
+        throw new LinkageError(Messages.getString("rmi.25")); //$NON-NLS-1$
     }
 
     /**
@@ -256,9 +258,10 @@
                            ClassLoader defaultLoader)
             throws MalformedURLException, ClassNotFoundException {
         if (loaderLog.isLoggable(RMILog.VERBOSE)) {
-            loaderLog.log(RMILog.VERBOSE, "Loading class: name=\"" + name
-                    + "\", codebase=\"" + ((codebase == null) ? "" : codebase)
-                    + "\", defaultLoader=" + defaultLoader);
+            // rmi.log.2E=Loading class: name="{0}", codebase="{1}", defaultLoader={2}
+            loaderLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.2E", //$NON-NLS-1$
+                    new Object[]{name, ((codebase == null) ? "" : codebase), //$NON-NLS-1$
+                    defaultLoader}));
         }
 
         try {
@@ -266,8 +269,9 @@
                 Class c = Class.forName(name, false, defaultLoader);
 
                 if (loaderLog.isLoggable(RMILog.BRIEF)) {
-                    loaderLog.log(RMILog.BRIEF, "Loaded class: " + name
-                            + " via default loader: " + defaultLoader);
+                    // rmi.log.2F=Loaded class: {0} via default loader: {1}
+                    loaderLog.log(RMILog.BRIEF, Messages.getString("rmi.log.2F", //$NON-NLS-1$
+                            name, defaultLoader));
                 }
                 return c;
             }
@@ -282,9 +286,8 @@
         } catch (SecurityException se) {
             if (loaderLog.isLoggable(RMILog.BRIEF)) {
                 loaderLog.log(RMILog.BRIEF,
-                        "Could not obtain classloader for codebase \""
-                        + ((codebase == null) ? "" : codebase)
-                        + "\" (access denied).");
+                        Messages.getString("rmi.log.30", //$NON-NLS-1$
+                        ((codebase == null) ? "" : codebase))); //$NON-NLS-1$
             }
             ex = se;
         }
@@ -295,36 +298,36 @@
                     Thread.currentThread().getContextClassLoader();
 
             if (loaderLog.isLoggable(RMILog.VERBOSE)) {
+                // rmi.log.31=Trying thread context classloader ({0}).
                 loaderLog.log(RMILog.VERBOSE,
-                        "Trying thread context classloader ("
-                        + curLoader + ").");
+                        Messages.getString("rmi.log.31", curLoader)); //$NON-NLS-1$
             }
 
             try {
                 c = Class.forName(name, false, curLoader);
             } catch (ClassNotFoundException cnfe1) {
                 if (loaderLog.isLoggable(RMILog.VERBOSE)) {
+                    // rmi.log.32=Could not load class {0} via thread context classloader (access to codebase loader is denied).
                     loaderLog.log(RMILog.VERBOSE,
-                            "Could not load class " + name
-                            + " via thread context classloader "
-                            + "(access to codebase loader is denied).");
-                }
-                throw new ClassNotFoundException("Could not load class " + name
-                        + "(access to loader for codebase \""
-                        + ((codebase == null) ? "" : codebase) + "\" denied).",
-                        ex);
+                            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$
+                        name, ((codebase == null) ? "" : codebase)), ex);//$NON-NLS-1$
+                        
             }
 
             if (loaderLog.isLoggable(RMILog.BRIEF)) {
-                loaderLog.log(RMILog.BRIEF, "Loaded class: " + name
-                        + " via thread context classloader.");
+                // rmi.log.34=Loaded class: {0} via thread context classloader.
+                loaderLog.log(RMILog.BRIEF, Messages.getString("rmi.log.34", name)); //$NON-NLS-1$
             }
         } else {
             c = Class.forName(name, false, codebaseLoader);
 
             if (loaderLog.isLoggable(RMILog.VERBOSE)) {
-                loaderLog.log(RMILog.VERBOSE, "Loaded class: " + name
-                        + " via " + codebaseLoader);
+                // rmi.log.35=Loaded class: {0} via {1}
+                loaderLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.35", //$NON-NLS-1$
+                        name, codebaseLoader));
             }
         }
         return c;
@@ -384,7 +387,7 @@
         if (mgr == null) {
             return Thread.currentThread().getContextClassLoader();
         }
-        mgr.checkPermission(new RuntimePermission("getClassLoader"));
+        mgr.checkPermission(new RuntimePermission("getClassLoader")); //$NON-NLS-1$
         return getClassLoader1(codebase);
     }
 
@@ -515,7 +518,7 @@
         addURLsPerms(urls, perms, true);
 
         // grant permission for ClassLoader creation
-        perms.add(new RuntimePermission("createClassLoader"));
+        perms.add(new RuntimePermission("createClassLoader")); //$NON-NLS-1$
 
         // create AccessControlContext from created Permissions
         ProtectionDomain[] domains;
@@ -575,7 +578,7 @@
                 if (!str.endsWith(File.separator)) {
                     perms.add(perm);
                 } else {
-                    perms.add(new FilePermission(str + "-", "read"));
+                    perms.add(new FilePermission(str + "-", "read")); //$NON-NLS-1$ //$NON-NLS-2$
                 }
             } else {
                 perms.add(perm);
@@ -591,7 +594,7 @@
 
                     if (host != null) {
                         perms.add(new SocketPermission(host,
-                                "connect, accept"));
+                                "connect, accept")); //$NON-NLS-1$
                     }
                 }
             }
@@ -637,10 +640,10 @@
         if (urls == null || urls.length == 0) {
             return null;
         }
-        String str = "";
+        String str = ""; //$NON-NLS-1$
 
         for (int i = 0; i < urls.length - 1; ++i) {
-            str += urls[i].toExternalForm() + " ";
+            str += urls[i].toExternalForm() + " "; //$NON-NLS-1$
         }
         return str + urls[urls.length - 1].toExternalForm();
     }
@@ -700,7 +703,7 @@
          * @return string representation of this loader
          */
         public String toString() {
-            return getClass().getName() + "[annot:\"" + annot + "\"]";
+            return getClass().getName() + "[annot:\"" + annot + "\"]"; //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 



Mime
View raw message