Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 55005 invoked from network); 6 Oct 2006 10:16:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Oct 2006 10:16:21 -0000 Received: (qmail 78893 invoked by uid 500); 6 Oct 2006 10:16:19 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 78822 invoked by uid 500); 6 Oct 2006 10:16:17 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 78565 invoked by uid 99); 6 Oct 2006 10:16:15 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Oct 2006 03:16:15 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:57843] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 1C/14-18133-3EC26254 for ; Fri, 06 Oct 2006 03:16:03 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A24ED1A9826; Fri, 6 Oct 2006 03:16:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r453541 [5/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 -0000 To: harmony-commits@incubator.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061006101600.A24ED1A9826@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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=453541&r1=453540&r2=453541 ============================================================================== --- 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:15:51 2006 @@ -15,3 +15,436 @@ # # messages for EN locale +rmi.00=URL could not be null. +rmi.01=Invalid URL "{0}":{1} +rmi.02=Non-rmi protocol in URL "{0}": {1} +rmi.03=Invalid character ('@') in URL "{0}" host part. +rmi.04=Invalid character ('?') in URL "{0}" name part. +rmi.05=Invalid character ('\#') in URL "{0}" name part. +rmi.06=Invalid port number in URL "{0}": {0} +rmi.07=Name could not be empty (URL: "{0}"). +rmi.08={0}; nested exception is:\n\t{1} +rmi.09=Unable to deserialize ActivationID: {0} +rmi.0A=Unable to serialize ActivationID: {0} +rmi.0B=Stub class initialization failed: java.rmi.activation.ActivationGroup_Stub +rmi.0C=Undeclared checked exception +rmi.0D=The default group for this JVM is inactive. +rmi.0E=An IOException occured while deserializing the object from its internal representation. +rmi.0F=A ClassNotFoundException occured while deserializing the object from its internal representation. +rmi.10=The groupID can't be null. +rmi.11=The ActivationGroup for this VM already exists. +rmi.12=Unable to create group. +rmi.13=getSystem fails. +rmi.14=The ActivationSystem for this ActivationGroup was already defined. +rmi.15=Port value out of range: {0} +rmi.16=Unable to get registry. +rmi.17=Invalid remote object: RemoteRef = null +rmi.18=Unable to create RemoteRef instance +rmi.19=There are no in-progress RMI calls in this thread. +rmi.1A=Unable to clone the object +rmi.1B=Unable to initialize RMIClassLoaderSpi instance {0}, specified in {1} property +rmi.1C=Unable to get RMIClassLoaderSpi name from resource {0} +rmi.1D=Unable to initialize RMIClassLoaderSpi instance {0}, specified in {1} resource +rmi.1E={0} Caused by: {1} +rmi.1F=RMISocketFactory has been already set. +rmi.20=RemoteRef parameter could not be null. +rmi.21=Proxy does not implement Remote interface. +rmi.22=No data in stream for class {0} +rmi.23=Illegal method from Object class: {0} +rmi.24=Unexpected exception +rmi.25=Unable to load proxy class +rmi.26=Error marshalling arguments +rmi.27=Error unmarshalling return value +rmi.28=Invalid method hash: {0} +rmi.29=Interface hash mismatch, expected: {0}, received: {1} +rmi.2A=Error marshalling return +rmi.2B=Invalid method number: {0} +rmi.2C=Error unmarshalling arguments +rmi.2D=Interface hash mismatch, expected: {0}, received: {1} +rmi.2E=This group is already registered. +rmi.2F=Group is not registered: {0} +rmi.30=Group is already active: {0} +rmi.31=No ActivationDesc for ActivationID {0} +rmi.32=No ActivationGroupDesc for ActivationGroupID {0} +rmi.33=Different incarnations of this group happened. +rmi.34=Attempt to unregister unknown group {0} +rmi.35=Exception: +rmi.36=Attempt to activate object from different group. +rmi.37=Attempt to activate object in inactive group. +rmi.38=Remote call is already closed. +rmi.39=Unknown call status response: {0} +rmi.3A=Unable to read call return header: +rmi.3B=Unknown call result response: {0} +rmi.3C=IOException occured while unmarshalling returned exception +rmi.3D=ClassNotFoundException occured while unmarshalling returned exception +rmi.3E=Remote method threw unexpected exception +rmi.3F=Not Exception type thrown: {0} +rmi.40=Unable to establish connection to server +rmi.41=Unable to write RMI protocol header +rmi.42=Failed to calculate hash for method {0} +rmi.43=Failed to calculate interface hash for class {0} +rmi.44=Failed to calculate interface hash for specified set of methods +rmi.45={0} is not an interface +rmi.46={0} is not a valid remote interface: method {1} must throw java.rmi.RemoteException +rmi.47=The specified class is not remote +rmi.48=Subprocess output stream control disabled +rmi.49=Subprocess input stream control disabled +rmi.4A=Subprocess error stream control disabled +rmi.4B=read(byte[]) returned unexpected value: {0} +rmi.4C={0} variable not found +rmi.4D={0} not found +rmi.4E=Can't create target directory: {0} +rmi.4F=Can't create file: {0} +rmi.50=Incorrect version specified. +rmi.51=Version currently unsupported. +rmi.52=Class {0} is interface, and so does not need an RMI stub. +rmi.53=Class {0} does not implement a remote interface, and so does not need an RMI stub. +rmi.54=Class {0} does not directly implement a remote interface, and so does not need an RMI stub. +rmi.55=Class not found: {0} +rmi.56=Indenter assertion failed: current indent is not empty +rmi.57=Class loading error: {0} +rmi.58=Can't write file {0} +rmi.59=Javac failed, code {0} +rmi.5A=Can't run Javac: {0} +rmi.5B=There are no in-progress RMI calls in the current thead. +rmi.5C=obj could not be null. +rmi.5D=name could not be null. +rmi.5E=There is already binding to the name {0}. +rmi.5F=Name {0} is not associated with any remote reference. +rmi.60={0} from non-local host {1} is not allowed +rmi.61={0} from unknown host is not allowed +rmi.62=Unable to create dynamic proxy stub class +rmi.63=Unable to export object: port {0} already in use +rmi.64=Unable to export object on port {0} +rmi.65=Skeleton class not found. +rmi.66=Method with hash = {0} not found. +rmi.67=Error occured while marshalling return value +rmi.68=Stub {0} not found. +rmi.69=RemoteException occured while unmarshalling arguments +rmi.6A=IOException occured while unmarshalling arguments +rmi.6B=ClassNotFoundException occured while unmarshalling arguments +rmi.6C=Error occured while unmarshalling arguments +rmi.6D=Error occured while remote method invocation +rmi.6E=RemoteException occured while remote method invocation +rmi.6F=I/O error occured while marshalling arguments +rmi.70=IOException occured while unmarshalling return value +rmi.71=ClassNotFoundException occured while unmarshalling return value +rmi.72=Unable to marshal call header +rmi.73=Instantiation failed. +rmi.74=Unable to read Object ID +rmi.75=No objects with {0} exported. +rmi.76=Dispatch call for processing +rmi.77=RemoteException occurred in server thread +rmi.78=Unable to initialize ClientDGC. +rmi.79=Unable to initialized DGC stub. +rmi.7A=getResultStream() method has already been called. +rmi.7B=Object {0} has already been exported. +rmi.7C=Object {0} is not exported. +rmi.7D=Unable to initialize DGC. +rmi.7E=Unable to serialize primitive class: {0} +rmi.7F=Unknown primitive class: {0} +rmi.80=Unable to connect to server {0} +rmi.81=HTTP proxy is not set +rmi.82=Unknown header: {0} +rmi.83=Unknown RMI protocol version: {0} +rmi.84=Unable to read RMI protocol header +rmi.85=Using protocol version {0} +rmi.86=Using singleop RMI protocol +rmi.87=Unknown message got: {0} +rmi.88=Repeated attempt to close HttpOutputStream +rmi.89=Incorrect phase: {0} +rmi.8A=Content-Length specified incorrectly: {0} +rmi.8B=Invalid Content-Length: {0} +rmi.8C=Content-Length received: {0} +rmi.8D=readSize is greater than len +rmi.8E=Unable to acknowledge protocol with server +rmi.8F={0} is not reusable. +rmi.90=Using stream RMI protocol +rmi.90=Using stream RMI protocol +rmi.91=Unknown message got: {0} +rmi.92=Unable to acknowledge protocol with server + +# log messages +rmi.log.00=ActivationID.activate: activator = {0} +rmi.log.01=ActivationID.activate:stub={0} +rmi.log.02=ActivationID.activate: deserialized_stub = {0} +rmi.log.03=<<<<<<<<< ActivationID.activate COMPLETED. +rmi.log.04=ActivationID.writeObject COMPLETED. +rmi.log.05=Activatable.[{0}, {1}] +rmi.log.06=ActivationID.readObject: +rmi.log.07=UID={0} +rmi.log.08=refType={0} +rmi.log.09=ref = {0} +rmi.log.0A=readExternal finished successfully. +rmi.log.0B=ActivationID.readObject COMPLETED. +rmi.log.0C=ActivationID.writeObject: +rmi.log.0D=activator = {0} +rmi.log.0E=Activatable >>> Ready to export object: +rmi.log.0F=aid = {0} +rmi.log.10=Activatable >>> exportObject +rmi.log.100=New call: method = [{0}], hash = {1} +rmi.log.101=New call: method = [{0}], opnum = {1}, hash = {2} +rmi.log.102=Created new call {0} +rmi.log.103=Execute call {0} +rmi.log.104=Finalize call {0} +rmi.log.105=Outbound remote call to endpoint:{0}: method:[{1}], obj:[{2}]. +rmi.log.106=$$$$$$$$$ ActivatableRef.invoke: +rmi.log.107=ref == null +rmi.log.108=aref = {0} +rmi.log.109=signal_exception = {0} +rmi.log.10A=Accepted {0} +rmi.log.10B=Return exception to the client: {0} +rmi.log.10C=Note: close operation produced exception: +rmi.log.10D=Weakly referenced {0} +rmi.log.10E=Created new VMID: {0} +rmi.log.10F=Added {0}, {1}, duration ={2} +rmi.log.11=Activatable >>> ActivatableServerRef={0} +rmi.log.110=Updated {0} +rmi.log.111=Removed {0},{1} +rmi.log.112=Removed {0} +rmi.log.113=Lease for {0}, {1} expired. +rmi.log.114=Creating socket to [{0}:{1}]. +rmi.log.115=Direct socket connections disabled, trying proxy connection to [{0}:{1}]. +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. +rmi.log.11D=Proxy configuration: +rmi.log.11E=proxy disabled, direct HTTP connections +rmi.log.11F=Inbound connection from [{0}:{1}] to port {2} detected. +rmi.log.12=Activatable >>> asr after export: {0} +rmi.log.120=Inbound connection signature: [{0}]. +rmi.log.121=Direct socket +rmi.log.122= connection from [{0}:{1}] to port {2} detected. +rmi.log.123=Connection [{0}] is closed +rmi.log.124=Got ping request +rmi.log.125=Got DGC ack request +rmi.log.126=Got call request +rmi.log.127=Unknown request got: {0} +rmi.log.128=Read 1 byte, {0} remaining. +rmi.log.129=Read {0} bytes, {1} remaining. +rmi.log.12A=Unable to read header data, couldn't find {0} +rmi.log.12B=Unable to read header data, Content-Length not specified +rmi.log.12C=Unable to read input stream data, no data found +rmi.log.12D=Header line received: [{0}]. +rmi.log.12E=Input stream data found, stream ready. +rmi.log.12F={0} found. +rmi.log.13=Activatable.exportObject: stub = {0} +rmi.log.130=Using singleop RMI protocol +rmi.log.131=Plain HTTP connections disabled, trying CGI connection. +rmi.log.132=Plain HTTP connection to [{0}:{1}] from port {2} succeeded. +rmi.log.133=Plain HTTP connection to [{0}:{1}] failed: {2}. Trying CGI connection. +rmi.log.134=CGI HTTP connection to [{0}:{1}] from port {2} succeeded. +rmi.log.135=CGI HTTP connection to [{0}:{1}] failed: {2} +rmi.log.136=Server is seeing client as {0}:{1} +rmi.log.137=Protocol version {0} is not supported. +rmi.log.138=Server is seeing us as {0}:{1} +rmi.log.139=Ping request for {0} failed. +rmi.log.13A=Unknown response to ping request for {0}:{1} +rmi.log.13B=Reusing {0}... +rmi.log.13C=Unknown protocol response: {0} +rmi.log.14=ActivationGroup.activeObject: {0}; {1} +rmi.log.15=monitor: {0} +rmi.log.16=ActivationGroup.activeObject finished. +rmi.log.17=ActivationGroup.createGroup [id={0}, desc={1}, incarnation={2} +rmi.log.18=group_CN = {0} +rmi.log.19=Ready to load ActivationGroupImpl class +rmi.log.1A=ag class = {0} +rmi.log.1B=ag = {0} +rmi.log.1C=current_AS = {0} +rmi.log.1D=ag.incarnation = {0} +rmi.log.1E=ag.monitor = {0} +rmi.log.1F=Exception in createGroup: {0} +rmi.log.20=Group created: {0} +rmi.log.21=---------- ActivationGroup.getSystem() ---------- +rmi.log.22=Activation System was got using Naming.lookup() at port {0} +rmi.log.23=current_AS.ref = {0} +rmi.log.24=---------- END -> ActivationGroup.getSystem() ---------- +rmi.log.25=Loading proxy class: interf=[{0}], codebase="{1}", defaultLoader={2} +rmi.log.26=Could not obtain classloader for codebase "{0}" (access denied). +rmi.log.27=Unable to load interface {0} via default loader {1}:{2} +rmi.log.28=Trying thread context classloader ({0}). +rmi.log.29=Unable to load interface {0} via {1} +rmi.log.2A=Could not load proxy class (access to loader for codebase "{0}" denied). +rmi.log.2B=Non-public interface {0} is loaded by another loader ({1}) then others ({2}) +rmi.log.2C=Loaded proxy class {0} via {1} +rmi.log.2D=Unable to load proxy class via both loaders ({0}, {1}) +rmi.log.2E=Loading class: name="{0}", codebase="{1}", defaultLoader={2} +rmi.log.2F=Loaded class: {0} via default loader: {1} +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} +rmi.log.37={0} connection timeout is expired +rmi.log.38=Registry created: {0} +rmi.log.39=Creating Activation System on port {0}. +rmi.log.3A=stub's ref = {0} +rmi.log.3B=URL = {0} +rmi.log.3C=Stub = {0} +rmi.log.3D=Rebind was successful. +rmi.log.3E=RmidMonitor created: {0} +rmi.log.3F=Exception in RMID: {0} +rmi.log.40=\nThe following properties were set on RMID: +rmi.log.41=RMID was shut down +rmi.log.42=Monitor option selected. +rmi.log.43=RMID instace created: {0} +rmi.log.44=Exception: {0} +rmi.log.45=Delta was saved: +rmi.log.46=Rmid.activeGroup: {0}, {1}, {2} +rmi.log.47=groupID2groupInfo_H = {0} +rmi.log.48=Rmid.activeGroup group info = {0} +rmi.log.49=ready to execute agi.active() +rmi.log.4A=Rmid.activeGroup finished. +rmi.log.4B=ActivationSystemImpl.registerObject(): +rmi.log.4C=ActivationGroupImpl.main: +rmi.log.4D=Activator stub = {0} +rmi.log.4E=aid : {0} +rmi.log.4F=System.in.available = {0} +rmi.log.50=ActivationGroupInfo = {0} +rmi.log.51=Activation desc was added. +rmi.log.52=The Rmid is going to shutdown +rmi.log.53=Exception in Rmid.shutdown: {0} +rmi.log.54=...... Done. +rmi.log.55=ois = {0} +rmi.log.56=Rmid.activeObject: {0}; {1} +rmi.log.57=agid = {0} +rmi.log.58=agi = {0} +rmi.log.59=oi= {0} +rmi.log.5A=Rmid.activeObject finished. +rmi.log.5B=ActivatorImpl.activate({0}; {1}) +rmi.log.5C=info = {0} +rmi.log.5D=New delta was generated. +rmi.log.5E=GroupInfo: id={0}; force={1} +rmi.log.5F=Group was activated. +rmi.log.60=Group was reused. +rmi.log.61=activation_instantiator = {0} +rmi.log.62=The group seems to be dead: Killing process, reactivating group. +rmi.log.63=Option was passed through '-C': {0} +rmi.log.64=args = {0} +rmi.log.65=ActivationGroup started: {0} +rmi.log.66=Agid written: {0} +rmi.log.67=Agdesc written: {0} +rmi.log.68=incarnation written: {0} +rmi.log.69=flushed +rmi.log.6A=closed +rmi.log.6B=Cannot start ActivationGroup.\n Exception: {0} +rmi.log.6C=ActivationGroupInfo.activeGroup[ActInst={0}; incarn={1}] +rmi.log.6D=ActivationGroupInfo.activeGroup finished. +rmi.log.6E=ObjectInfo.activate started. Act Inst = {0} +rmi.log.6F=Subsequent call to activate, returning cached instance. +rmi.log.70=ObjectInfo.activate completed: {0} +rmi.log.71=Delta was written. +rmi.log.72=A delta was restored: {0} +rmi.log.73=Exception in restore: {0} +rmi.log.74=agdesc = {0} +rmi.log.75=Delta: Data read: +rmi.log.76=Restore agid: {0} +rmi.log.77=Restore agi: {0} +rmi.log.78=The data were put into groupID2groupInfo_H +rmi.log.79=Trying to restore ActivationID: +rmi.log.7A=adesc = {0} +rmi.log.7B=incarnation = {0} +rmi.log.7C=: Exception: {0} +rmi.log.7D=Object was registered. +rmi.log.7E=Object was put into hashtable. +rmi.log.7F=Restore: +rmi.log.80=h0 = {0} +rmi.log.81=h1 = {0} +rmi.log.82=Restore agdesc: {0} +rmi.log.83=ActivationGroupImpl: ActivationGroupImpl.newInstance started. +rmi.log.84=ActivationGroupImpl: active object = {0} +rmi.log.85=Ready to load active class: [location={0}; name={1}] +rmi.log.86=active class = {0} +rmi.log.87=Activatable Constructor: {0} +rmi.log.88=rmt.getClass = {0} +rmi.log.89=newInstance: Remote Object = {0} +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.: +rmi.log.8F=ActiveObject: remote_object_impl = {0}; remote_object_stub={1} +rmi.log.90=ActiveObject: Failed to marshal remote stub: {0} +rmi.log.91=active object = {0} +rmi.log.92=Outbound remote call to {0} received exception: +rmi.log.93=Sent DGC ack to {0} for {1} +rmi.log.94=Using protocol version {0} +rmi.log.95=Obtaining stub class for: {0} +rmi.log.96=Loaded "static" stub for {0} +rmi.log.97=Loaded dynamic stub for {0} +rmi.log.98=Instantiated stub: {0} +rmi.log.99=Remote call from [{0}] +rmi.log.9A=Local remote call +rmi.log.9B={0}: method:[{1}], class:[{2}]. +rmi.log.9C=from {0} +rmi.log.9D=locally +rmi.log.9E=Exception thrown while calling [{0}] method of {1} class requested {2}: +rmi.log.9F=Strongly referenced {0} + + +# console messages +rmi.console.00=CurAG = {0} +rmi.console.02=Insufficient arguments: port should be specified. +rmi.console.03=Malformed port number. +rmi.console.04=Insufficient arguments: log folder should be specified. +rmi.console.05=Illegal option: {0} +rmi.console.06=Cannot create log folder: {0} +rmi.console.07=StreamPipe error: +rmi.console.08=NOTE: Using compiler class: +rmi.console.09=NOTE: Using compiler executable: {0} +rmi.console.0A=NOTE: Using Eclipse Compiler +rmi.console.0B=NOTE: Eclipse Compiler class not found: {0} +rmi.console.0C=NOTE: Using JAVA_HOME Javac compiler +rmi.console.0D=NOTE: JAVA_HOME Javac compiler not found: {0} +rmi.console.0E=\nUsage: rmid +rmi.console.0F=\n\nwhere include: +rmi.console.10=\n-port Specify port for rmid to use +rmi.console.11=\n-log Specify directory in which rmid writes log +rmi.console.12=\n-stop Stop current invocation of rmid (for specified port) +rmi.console.13=\n-C Pass argument to each child process (activation group) +rmi.console.14=\n-J Pass argument to the java interpreter +rmi.console.15=\n-help Prints this help message +rmi.console.16=\n------------------ Nonstandard options ------------------ +rmi.console.17=\n-monitor Starts rmid with monitoring on +rmi.console.18=RMIC Error: {0} +rmi.console.19=RMIC Error: Unexpected exception:{0} +rmi.console.1A=WARNING: {0} +rmi.console.1B=Invalid port number {0} +rmi.console.1C=Usage: rmic +rmi.console.1D=Options: +rmi.console.1E=Create stubs/skeletons for 1.1 stub protocol version only +rmi.console.1F=(default) Create stubs for 1.2 stub protocol version only +rmi.console.20=Create stubs/skeletons compatible with both v1.1 and v1.2 +rmi.console.21=Generate class files for the specified VM version +rmi.console.22=Do not delete generated source files +rmi.console.23=\ \ \ \ \ (the same as " +rmi.console.24=\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Generate debug information +rmi.console.25=\ \ \ \ \ \ \ \ \ \ \ \ Do not notify about warnings +rmi.console.26=Check run: do not write compiled classes +rmi.console.27=\ \ \ \ \ \ \ \ \ \ \ Print detailed compilation log +rmi.console.28=\ Target directory for generated files +rmi.console.29=\ Input class files location +rmi.console.2A=\ (the same as " +rmi.console.2B=\ Override location of bootstrap class files +rmi.console.2C=\ Override location of installed extensions +rmi.console.2D= Pass option to JVM +rmi.console.2E= Pass -X option to JVM +rmi.console.2F=You should specify at most one of " + +rmi.console.31=" (default), " +rmi.console.32=Option %s requires a parameter +rmi.console.33=Option %s must be immediately (without a space) followed by a JVM option + +rmi.console.35=Option %s requires two parameters +rmi.console.36=Unknown option: %s +rmi.console.37=No classes to compile specified +rmi.console.38=Option %s must only be used with {0} or {1} +rmi.console.39=Option %s must only be used with {0} +rmi.console.3A=Option %s must only be used with {0} +rmi.console.3B=%s is specified. For proper operation the same %s should be specified in VM arguments. This is a limitation of current RMIC implementation. Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl.java Fri Oct 6 03:15:51 2006 @@ -38,6 +38,7 @@ import java.rmi.registry.Registry; import org.apache.harmony.rmi.common.RMIUtil; +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; @@ -72,7 +73,7 @@ */ public static void main(String[] args) throws Exception { String usage = - "Usage: java org.apache.harmony.rmi.registry.RegistryImpl "; + "Usage: java org.apache.harmony.rmi.registry.RegistryImpl "; //$NON-NLS-1$ int port = REGISTRY_PORT; if (args.length > 1) { @@ -82,7 +83,8 @@ try { port = Integer.parseInt(args[0]); } catch (NumberFormatException nfe) { - System.out.println("Invalid port number " + args[0]); + // rmi.console.1B=Invalid port number {0} + System.out.println(Messages.getString("rmi.console.1B", args[0])); //$NON-NLS-1$ System.out.println(usage); System.exit(-1); } @@ -141,13 +143,15 @@ public void rebind(String name, Remote obj) throws RemoteException, AccessException { if (name == null) { - throw new NullPointerException("name could not be null."); + // rmi.5D=name could not be null. + throw new NullPointerException(Messages.getString("rmi.5D")); //$NON-NLS-1$ } if (obj == null) { - throw new NullPointerException("obj could not be null."); + // rmi.5C=obj could not be null. + throw new NullPointerException(Messages.getString("rmi.5C")); //$NON-NLS-1$ } - checkAccess("RegistryImpl.rebind"); + checkAccess("RegistryImpl.rebind"); //$NON-NLS-1$ table.put(name, obj); } @@ -157,18 +161,20 @@ public void bind(String name, Remote obj) throws RemoteException, AlreadyBoundException, AccessException { if (name == null) { - throw new NullPointerException("name could not be null."); + // rmi.5D=name could not be null. + throw new NullPointerException(Messages.getString("rmi.5D")); //$NON-NLS-1$ } if (obj == null) { - throw new NullPointerException("obj could not be null."); + // rmi.5C=obj could not be null. + throw new NullPointerException(Messages.getString("rmi.5C")); //$NON-NLS-1$ } if (table.containsKey(name)) { - throw new AlreadyBoundException( - "There is already binding to the name " + name + "."); + // rmi.5E=There is already binding to the name {0}. + throw new AlreadyBoundException(Messages.getString("rmi.5E", name)); //$NON-NLS-1$ } - checkAccess("RegistryImpl.bind"); + checkAccess("RegistryImpl.bind"); //$NON-NLS-1$ table.put(name, obj); } @@ -178,13 +184,15 @@ public Remote lookup(String name) throws RemoteException, NotBoundException, AccessException { if (name == null) { - throw new NullPointerException("name could not be null."); + // rmi.5D=name could not be null. + throw new NullPointerException(Messages.getString("rmi.5D")); //$NON-NLS-1$ } Remote ref = (Remote) table.get(name); if (ref == null) { - throw new NotBoundException("Name " + name - + " is not associated with any remote reference."); + // rmi.5F=Name {0} is not associated with any remote reference. + throw new NotBoundException(Messages.getString("rmi.5F", name)); //$NON-NLS-1$ + } return ref; } @@ -195,13 +203,14 @@ public void unbind(String name) throws RemoteException, NotBoundException, AccessException { if (name == null) { - throw new NullPointerException("name could not be null."); + // rmi.5D=name could not be null. + throw new NullPointerException(Messages.getString("rmi.5D")); //$NON-NLS-1$ } - checkAccess("RegistryImpl.unbind"); + checkAccess("RegistryImpl.unbind"); //$NON-NLS-1$ if (table.remove(name) == null) { - throw new NotBoundException("Name " + name - + " is not associated with any remote reference."); + // rmi.5F=Name {0} is not associated with any remote reference. + throw new NotBoundException(Messages.getString("rmi.5F", name)); //$NON-NLS-1$ } } @@ -234,13 +243,12 @@ try { if (!RMIUtil.isLocalHost(hostName)) { - throw new AccessException(registryMethod - + " from non-local host " + hostName - + " is not allowed"); + // rmi.60={0} from non-local host {1} is not allowed + throw new AccessException(Messages.getString("rmi.60", registryMethod, hostName)); //$NON-NLS-1$ } } catch (UnknownHostException uhe) { - throw new AccessException(registryMethod - + " from unknown host is not allowed", uhe); + // rmi.61={0} from unknown host is not allowed + throw new AccessException(Messages.getString("rmi.61", registryMethod), uhe); //$NON-NLS-1$ } } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl_Skel.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl_Skel.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl_Skel.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl_Skel.java Fri Oct 6 03:15:51 2006 @@ -10,17 +10,19 @@ */ package org.apache.harmony.rmi.registry; +import org.apache.harmony.rmi.internal.nls.Messages; + public final class RegistryImpl_Skel implements java.rmi.server.Skeleton { private static final long interfaceHash = 4905912898345647071L; private static final java.rmi.server.Operation[] operations = { - new java.rmi.server.Operation("void bind(java.lang.String, java.rmi.Remote)"), - new java.rmi.server.Operation("java.lang.String list()[]"), - new java.rmi.server.Operation("java.rmi.Remote lookup(java.lang.String)"), - new java.rmi.server.Operation("void rebind(java.lang.String, java.rmi.Remote)"), - new java.rmi.server.Operation("void unbind(java.lang.String)") + new java.rmi.server.Operation("void bind(java.lang.String, java.rmi.Remote)"), //$NON-NLS-1$ + new java.rmi.server.Operation("java.lang.String list()[]"), //$NON-NLS-1$ + new java.rmi.server.Operation("java.rmi.Remote lookup(java.lang.String)"), //$NON-NLS-1$ + new java.rmi.server.Operation("void rebind(java.lang.String, java.rmi.Remote)"), //$NON-NLS-1$ + new java.rmi.server.Operation("void unbind(java.lang.String)") //$NON-NLS-1$ }; public java.rmi.server.Operation[] getOperations() { @@ -40,12 +42,12 @@ } else if (hash == 7305022919901907578L) { opnum = 4; } else { - throw new java.rmi.UnmarshalException("Invalid method hash: " + hash); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.28", hash)); //$NON-NLS-1$ } } else { if (hash != interfaceHash) { throw new java.rmi.server.SkeletonMismatchException( - "Interface hash mismatch, expected: " + interfaceHash + ", received: " + hash); + Messages.getString("rmi.29", interfaceHash, hash)); //$NON-NLS-1$ } } @@ -63,9 +65,9 @@ $param_String_1 = (java.lang.String) in.readObject(); $param_Remote_2 = (java.rmi.Remote) in.readObject(); } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } catch (java.lang.ClassNotFoundException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } finally { call.releaseInputStream(); } @@ -75,7 +77,7 @@ try { call.getResultStream(true); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling return", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.2A"), e); //$NON-NLS-1$ } break; @@ -91,7 +93,7 @@ java.io.ObjectOutput out = call.getResultStream(true); out.writeObject($result); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling return", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.2A"), e); //$NON-NLS-1$ } break; @@ -105,9 +107,9 @@ java.io.ObjectInput in = call.getInputStream(); $param_String_1 = (java.lang.String) in.readObject(); } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } catch (java.lang.ClassNotFoundException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } finally { call.releaseInputStream(); } @@ -118,7 +120,7 @@ java.io.ObjectOutput out = call.getResultStream(true); out.writeObject($result); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling return", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.2A"), e); //$NON-NLS-1$ } break; @@ -134,9 +136,9 @@ $param_String_1 = (java.lang.String) in.readObject(); $param_Remote_2 = (java.rmi.Remote) in.readObject(); } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } catch (java.lang.ClassNotFoundException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } finally { call.releaseInputStream(); } @@ -146,7 +148,7 @@ try { call.getResultStream(true); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling return", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.2A"), e); //$NON-NLS-1$ } break; @@ -160,9 +162,9 @@ java.io.ObjectInput in = call.getInputStream(); $param_String_1 = (java.lang.String) in.readObject(); } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } catch (java.lang.ClassNotFoundException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } finally { call.releaseInputStream(); } @@ -172,14 +174,14 @@ try { call.getResultStream(true); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling return", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.2A"), e); //$NON-NLS-1$ } break; } default: - throw new java.rmi.UnmarshalException("Invalid method number: " + opnum); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2B", opnum)); //$NON-NLS-1$ } } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl_Stub.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl_Stub.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl_Stub.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/registry/RegistryImpl_Stub.java Fri Oct 6 03:15:51 2006 @@ -10,6 +10,8 @@ */ package org.apache.harmony.rmi.registry; +import org.apache.harmony.rmi.internal.nls.Messages; + public final class RegistryImpl_Stub extends java.rmi.server.RemoteStub implements java.rmi.registry.Registry, java.rmi.Remote { @@ -21,11 +23,11 @@ private static boolean useNewInvoke; private static final java.rmi.server.Operation[] operations = { - new java.rmi.server.Operation("void bind(java.lang.String, java.rmi.Remote)"), - new java.rmi.server.Operation("java.lang.String list()[]"), - new java.rmi.server.Operation("java.rmi.Remote lookup(java.lang.String)"), - new java.rmi.server.Operation("void rebind(java.lang.String, java.rmi.Remote)"), - new java.rmi.server.Operation("void unbind(java.lang.String)") + new java.rmi.server.Operation("void bind(java.lang.String, java.rmi.Remote)"), //$NON-NLS-1$ + new java.rmi.server.Operation("java.lang.String list()[]"), //$NON-NLS-1$ + new java.rmi.server.Operation("java.rmi.Remote lookup(java.lang.String)"), //$NON-NLS-1$ + new java.rmi.server.Operation("void rebind(java.lang.String, java.rmi.Remote)"), //$NON-NLS-1$ + new java.rmi.server.Operation("void unbind(java.lang.String)") //$NON-NLS-1$ }; private static java.lang.reflect.Method $method_bind_0; @@ -36,13 +38,13 @@ static { try { - java.rmi.server.RemoteRef.class.getMethod("invoke", new java.lang.Class[] {java.rmi.Remote.class, java.lang.reflect.Method.class, java.lang.Object[].class, long.class}); + java.rmi.server.RemoteRef.class.getMethod("invoke", new java.lang.Class[] {java.rmi.Remote.class, java.lang.reflect.Method.class, java.lang.Object[].class, long.class}); //$NON-NLS-1$ - $method_bind_0 = java.rmi.registry.Registry.class.getMethod("bind", new java.lang.Class[] {java.lang.String.class, java.rmi.Remote.class}); - $method_list_1 = java.rmi.registry.Registry.class.getMethod("list", new java.lang.Class[] {}); - $method_lookup_2 = java.rmi.registry.Registry.class.getMethod("lookup", new java.lang.Class[] {java.lang.String.class}); - $method_rebind_3 = java.rmi.registry.Registry.class.getMethod("rebind", new java.lang.Class[] {java.lang.String.class, java.rmi.Remote.class}); - $method_unbind_4 = java.rmi.registry.Registry.class.getMethod("unbind", new java.lang.Class[] {java.lang.String.class}); + $method_bind_0 = java.rmi.registry.Registry.class.getMethod("bind", new java.lang.Class[] {java.lang.String.class, java.rmi.Remote.class}); //$NON-NLS-1$ + $method_list_1 = java.rmi.registry.Registry.class.getMethod("list", new java.lang.Class[] {}); //$NON-NLS-1$ + $method_lookup_2 = java.rmi.registry.Registry.class.getMethod("lookup", new java.lang.Class[] {java.lang.String.class}); //$NON-NLS-1$ + $method_rebind_3 = java.rmi.registry.Registry.class.getMethod("rebind", new java.lang.Class[] {java.lang.String.class, java.rmi.Remote.class}); //$NON-NLS-1$ + $method_unbind_4 = java.rmi.registry.Registry.class.getMethod("unbind", new java.lang.Class[] {java.lang.String.class}); //$NON-NLS-1$ useNewInvoke = true; } catch (java.lang.NoSuchMethodException e) { @@ -72,7 +74,7 @@ out.writeObject($param_String_1); out.writeObject($param_Remote_2); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling arguments", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.26"), e); //$NON-NLS-1$ } ref.invoke(call); @@ -86,7 +88,7 @@ } catch (java.rmi.AlreadyBoundException e) { throw e; } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("Undeclared checked exception", e); + throw new java.rmi.UnexpectedException(Messages.getString("rmi.0C"), e); //$NON-NLS-1$ } } @@ -108,9 +110,9 @@ java.io.ObjectInput in = call.getInputStream(); $result = (java.lang.String[]) in.readObject(); } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling return value", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.27"), e); //$NON-NLS-1$ } catch (java.lang.ClassNotFoundException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling return value", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.27"), e); //$NON-NLS-1$ } finally { ref.done(call); } @@ -122,7 +124,7 @@ } catch (java.rmi.RemoteException e) { throw e; } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("Undeclared checked exception", e); + throw new java.rmi.UnexpectedException(Messages.getString("rmi.0C"), e); //$NON-NLS-1$ } } @@ -140,7 +142,7 @@ java.io.ObjectOutput out = call.getOutputStream(); out.writeObject($param_String_1); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling arguments", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.26"), e); //$NON-NLS-1$ } ref.invoke(call); @@ -151,9 +153,9 @@ java.io.ObjectInput in = call.getInputStream(); $result = (java.rmi.Remote) in.readObject(); } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling return value", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.27"), e); //$NON-NLS-1$ } catch (java.lang.ClassNotFoundException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling return value", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.27"), e); //$NON-NLS-1$ } finally { ref.done(call); } @@ -167,7 +169,7 @@ } catch (java.rmi.NotBoundException e) { throw e; } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("Undeclared checked exception", e); + throw new java.rmi.UnexpectedException(Messages.getString("rmi.0C"), e); //$NON-NLS-1$ } } @@ -185,7 +187,7 @@ out.writeObject($param_String_1); out.writeObject($param_Remote_2); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling arguments", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.26"), e); //$NON-NLS-1$ } ref.invoke(call); @@ -197,7 +199,7 @@ } catch (java.rmi.RemoteException e) { throw e; } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("Undeclared checked exception", e); + throw new java.rmi.UnexpectedException(Messages.getString("rmi.0C"), e); //$NON-NLS-1$ } } @@ -214,7 +216,7 @@ java.io.ObjectOutput out = call.getOutputStream(); out.writeObject($param_String_1); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling arguments", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.26"), e); //$NON-NLS-1$ } ref.invoke(call); @@ -228,7 +230,7 @@ } catch (java.rmi.NotBoundException e) { throw e; } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("Undeclared checked exception", e); + throw new java.rmi.UnexpectedException(Messages.getString("rmi.0C"), e); //$NON-NLS-1$ } } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/ActivatableRef.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/ActivatableRef.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/ActivatableRef.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/ActivatableRef.java Fri Oct 6 03:15:51 2006 @@ -40,6 +40,7 @@ import org.apache.harmony.rmi.common.RMILog; import org.apache.harmony.rmi.common.RMIUtil; +import org.apache.harmony.rmi.internal.nls.Messages; /** @@ -93,12 +94,12 @@ throws StubNotFoundException { String cn = desc.getClassName(); - String stubName = ""; + String stubName = ""; //$NON-NLS-1$ try { Class cl = RMIClassLoader.loadClass(desc.getLocation(), cn); Class rcl = RMIUtil.getRemoteClass(cl); - stubName = rcl.getName() + "_Stub"; + stubName = rcl.getName() + "_Stub"; //$NON-NLS-1$ Class stubClass = RMIClassLoader.loadClass((String) null, stubName); Constructor constructor = stubClass.getConstructor(new Class[] { RemoteRef.class }); RemoteStub stub = (RemoteStub) constructor.newInstance(new Object[] { @@ -107,7 +108,8 @@ return stub; } catch (Exception ex) { - throw new StubNotFoundException("Stub " + stubName + " not found.", + // rmi.68=Stub {0} not found. + throw new StubNotFoundException(Messages.getString("rmi.68", stubName), //$NON-NLS-1$ //$NON-NLS-2$ ex); } } @@ -117,7 +119,7 @@ * The getRefClass method returns "ActivatableRef" String. */ public String getRefClass(ObjectOutput objectoutput) { - return "ActivatableRef"; + return "ActivatableRef"; //$NON-NLS-1$ } /** @@ -129,7 +131,7 @@ out.writeObject(id); if (ref == null) { - out.writeUTF(""); + out.writeUTF(""); //$NON-NLS-1$ } else { out.writeUTF(ref.getRefClass(out)); ref.writeExternal(out); @@ -145,16 +147,17 @@ String s = in.readUTF(); - if (s.equals("")) { + if (s.equals("")) { //$NON-NLS-1$ return; } - Class extRefTypeClass = Class.forName(RemoteRef.packagePrefix +"."+ s); + Class extRefTypeClass = Class.forName(RemoteRef.packagePrefix +"."+ s); //$NON-NLS-1$ try { ref = (RemoteRef)extRefTypeClass.newInstance(); } catch(Throwable t) { - throw new ClassNotFoundException("Instantiation failed.", t); + // rmi.73=Instantiation failed. + throw new ClassNotFoundException(Messages.getString("rmi.73"), t); //$NON-NLS-1$ } ref.readExternal(in); } @@ -168,16 +171,20 @@ Exception signal_exception = null; RemoteRef rref; - rlog.log(RMILog.VERBOSE, "$$$$$$$$$ ActivatableRef.invoke: "+obj+", "+method+";"); + // rmi.log.106=$$$$$$$$$ ActivatableRef.invoke: + rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.106")+obj+", "+method+";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if(ref == null) { - rlog.log(RMILog.VERBOSE, "ref == null"); + // rmi.log.107=ref == null + rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.107")); //$NON-NLS-1$ RemoteStub stub = (RemoteStub)id.activate(false); //ToDo Check whether it returns Remote or RemoteStub - rlog.log(RMILog.VERBOSE, "stub = "+stub); + // rmi.log.3C=Stub = {0} + rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.3C", stub)); //$NON-NLS-1$ ActivatableRef aref = (ActivatableRef)stub.getRef(); - rlog.log(RMILog.VERBOSE, "aref = "+aref); + // rmi.log.108=aref = {0} + rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.108", aref)); //$NON-NLS-1$ ref = aref.ref; // Global variable stored for next calls rref = aref.ref; // local variable @@ -203,7 +210,8 @@ signal_exception = t; } - rlog.log(RMILog.VERBOSE, "signal_exception = "+signal_exception); + // rmi.log.109=signal_exception = {0} + rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.109", signal_exception)); //$NON-NLS-1$ if (signal_exception == null) { RemoteStub stub = (RemoteStub)id.activate(true); Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/ActivatableServerRef.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/ActivatableServerRef.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/ActivatableServerRef.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/ActivatableServerRef.java Fri Oct 6 03:15:51 2006 @@ -77,7 +77,7 @@ * rules should be applied to this remote reference. */ public String getRefClass(ObjectOutput out) { - return "ActivatableServerRef"; + return "ActivatableServerRef"; //$NON-NLS-1$ } /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastRef.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastRef.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastRef.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastRef.java Fri Oct 6 03:15:51 2006 @@ -41,6 +41,7 @@ import org.apache.harmony.rmi.client.ClientConnectionManager; import org.apache.harmony.rmi.client.ClientRemoteCall; import org.apache.harmony.rmi.common.RMILog; +import org.apache.harmony.rmi.internal.nls.Messages; import org.apache.harmony.rmi.server.RemoteRefBase; import org.apache.harmony.rmi.transport.Endpoint; import org.apache.harmony.rmi.transport.RMIObjectInputStream; @@ -120,8 +121,9 @@ logClientCall(obj, m.toString()); if (clientRefLog.isLoggable(RMILog.BRIEF)) { - clientRefLog.log(RMILog.BRIEF, "New call: method = [" + m - + "], hash = " + h); + // rmi.log.100=New call: method = [{0}], hash = {1} + clientRefLog.log(RMILog.BRIEF, Messages.getString("rmi.log.100", //$NON-NLS-1$ + m, h)); } // initiate a new call @@ -142,8 +144,8 @@ } } } catch (IOException ioe) { - throw new MarshalException("I/O error occured while " - + "marshalling arguments", ioe); + // rmi.6F=I/O error occured while marshalling arguments + throw new MarshalException(Messages.getString("rmi.6F"), ioe); //$NON-NLS-1$ } // execute the call @@ -158,12 +160,11 @@ try { toReturn = oin.readRMIObject(m.getReturnType(), null); } catch (IOException ioe) { - throw new UnmarshalException("IOException occured while " - + "unmarshalling return value", ioe); + // rmi.70=IOException occured while unmarshalling return value + throw new UnmarshalException(Messages.getString("rmi.70"), ioe); //$NON-NLS-1$ } catch (ClassNotFoundException cnfe) { - throw new UnmarshalException( - "ClassNotFoundException occured " - + "while unmarshalling return value", cnfe); + // rmi.71=ClassNotFoundException occured while unmarshalling return value + throw new UnmarshalException(Messages.getString("rmi.71"), cnfe); //$NON-NLS-1$ } } } catch (IOException ioe) { @@ -178,7 +179,7 @@ * @see RemoteRef.getRefClass(ObjectOutput) */ public String getRefClass(ObjectOutput out) { - return "UnicastRef"; + return "UnicastRef"; //$NON-NLS-1$ } /** @@ -218,9 +219,9 @@ throws RemoteException { if (opnum != -1) { if (clientRefLog.isLoggable(RMILog.BRIEF)) { - clientRefLog.log(RMILog.BRIEF, "New call: method = [" - + op[opnum].toString() + "], opnum = " + opnum - + ", hash = " + hash); + // rmi.log.101=New call: method = [{0}], opnum = {1}, hash = {2} + clientRefLog.log(RMILog.BRIEF, Messages.getString("rmi.log.101", //$NON-NLS-1$ + new Object[]{op[opnum].toString(), opnum, hash})); } logClientCall(obj, op[opnum].toString()); } @@ -228,7 +229,8 @@ RemoteCall call = new ClientRemoteCall(conn); if (clientRefLog.isLoggable(RMILog.VERBOSE)) { - clientRefLog.log(RMILog.VERBOSE, "Created new call " + call); + //rmi.log.102=Created new call {0} + clientRefLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.102", call)); //$NON-NLS-1$ } try { @@ -243,7 +245,8 @@ return call; } catch (IOException ioe) { done(call); - throw new MarshalException("Unable to marshal call header", ioe); + // rmi.72=Unable to marshal call header + throw new MarshalException(Messages.getString("rmi.72"), ioe); //$NON-NLS-1$ } } @@ -252,7 +255,8 @@ */ public void invoke(RemoteCall call) throws Exception { if (clientRefLog.isLoggable(RMILog.VERBOSE)) { - clientRefLog.log(RMILog.VERBOSE, "Execute call " + call); + // rmi.log.103=Execute call {0} + clientRefLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.103", call)); //$NON-NLS-1$ } call.releaseOutputStream(); call.executeCall(); @@ -263,7 +267,8 @@ */ public void done(RemoteCall call) throws RemoteException { if (clientRefLog.isLoggable(RMILog.VERBOSE)) { - clientRefLog.log(RMILog.VERBOSE, "Finalize call " + call); + // rmi.log.104=Finalize call {0} + clientRefLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.104", call)); //$NON-NLS-1$ } try { @@ -275,9 +280,9 @@ // Logs remote method call on client side. private void logClientCall(Remote obj, String m) { if (clientCallsLog.isLoggable(RMILog.VERBOSE)) { - clientCallsLog.log(RMILog.VERBOSE, - "Outbound remote call to endpoint:" + ep + ": method:[" + m - + "], obj:[" + obj + "]."); + // rmi.log.105=Outbound remote call to endpoint:{0}: method:[{1}], obj:[{2}]. + clientCallsLog.log(RMILog.VERBOSE,Messages.getString("rmi.log.105", //$NON-NLS-1$ + new Object[]{ ep, m, obj})); } } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastRef2.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastRef2.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastRef2.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastRef2.java Fri Oct 6 03:15:51 2006 @@ -91,7 +91,7 @@ * @see RemoteRef.getRefClass(ObjectOutput) */ public String getRefClass(ObjectOutput out) { - return "UnicastRef2"; + return "UnicastRef2"; //$NON-NLS-1$ } /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastServerRef.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastServerRef.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastServerRef.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastServerRef.java Fri Oct 6 03:15:51 2006 @@ -57,6 +57,7 @@ import org.apache.harmony.rmi.common.RMILog; import org.apache.harmony.rmi.common.RMIProperties; import org.apache.harmony.rmi.common.RMIUtil; +import org.apache.harmony.rmi.internal.nls.Messages; import org.apache.harmony.rmi.server.RMIReference; import org.apache.harmony.rmi.server.ServerConnectionManager; import org.apache.harmony.rmi.transport.Endpoint; @@ -199,8 +200,8 @@ String host = ServerConnectionManager.getClientHost(); if (host == null) { - throw new ServerNotActiveException( - "There are no in-progress RMI calls in the current thead."); + // rmi.5B=There are no in-progress RMI calls in the current thead. + throw new ServerNotActiveException(Messages.getString("rmi.5B")); //$NON-NLS-1$ } return host; } @@ -209,7 +210,7 @@ * @see RemoteRef.getRefClass(ObjectOutput) */ public String getRefClass(ObjectOutput out) { - return "UnicastServerRef"; + return "UnicastServerRef"; //$NON-NLS-1$ } /** @@ -265,8 +266,9 @@ boolean isProxyStub = false; if (serverRefLog.isLoggable(RMILog.VERBOSE)) { - serverRefLog.log(RMILog.VERBOSE, "Obtaining stub class for: " - + remoteClass.getName()); + // rmi.log.95=Obtaining stub class for: {0} + serverRefLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.95", //$NON-NLS-1$ + remoteClass.getName())); } Class stubClass = null; @@ -274,9 +276,10 @@ // load stub class statically generated by rmic stubClass = loadStubClass(remoteClass, !useProxyStubs); + // rmi.log.96=Loaded "static" stub for {0} if (serverRefLog.isLoggable(RMILog.VERBOSE)) { - serverRefLog.log(RMILog.VERBOSE, "Loaded \"static\" stub for " - + remoteClass.getName()); + serverRefLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.96", //$NON-NLS-1$ + remoteClass.getName())); } } @@ -290,13 +293,14 @@ // obj.getClass().getClassLoader()); if (serverRefLog.isLoggable(RMILog.VERBOSE)) { - serverRefLog.log(RMILog.VERBOSE, "Loaded dynamic stub for " - + remoteClass.getName()); + // rmi.log.97=Loaded dynamic stub for {0} + serverRefLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.97", //$NON-NLS-1$ + remoteClass.getName())); } isProxyStub = true; } catch (Exception ex) { - throw new StubNotFoundException( - "Unable to create dynamic proxy stub class", ex); + // rmi.62=Unable to create dynamic proxy stub class + throw new StubNotFoundException(Messages.getString("rmi.62"), ex); //$NON-NLS-1$ } } @@ -333,7 +337,8 @@ } if (serverRefLog.isLoggable(RMILog.VERBOSE)) { - serverRefLog.log(RMILog.VERBOSE, "Instantiated stub: " + stub); + // rmi.log.98=Instantiated stub: {0} + serverRefLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.98", stub)); //$NON-NLS-1$ } if (startListen) { @@ -341,11 +346,13 @@ mgr = ServerConnectionManager.getMgr(ep); } } catch (BindException be) { - throw new ExportException("Unable to export object: port " - + ep.getPort() + " already in use", be); + // rmi.63=Unable to export object: port {0} already in use + throw new ExportException(Messages.getString("rmi.63", //$NON-NLS-1$ + ep.getPort()), be); } catch (Exception ex) { - throw new ExportException("Unable to export object on port " - + ep.getPort(), ex); + // rmi.64=Unable to export object on port {0} + throw new ExportException(Messages.getString("rmi.64", //$NON-NLS-1$ + ep.getPort()), ex); } return stub; } @@ -389,7 +396,8 @@ if (op != -1) { // Using 1.1. RMI protocol version if (skel == null) { - throw new UnmarshalException("Skeleton class not found."); + // rmi.65=Skeleton class not found. + throw new UnmarshalException(Messages.getString("rmi.65")); //$NON-NLS-1$ } String m = skel.getOperations()[op].toString(); logServerCall(m); @@ -414,8 +422,8 @@ Method m = (Method) remoteMethods.get(new Long(h)); if (m == null) { - throw new UnmarshalException("Method with hash = " + h - + " not found."); + // rmi.66=Method with hash = {0} not found. + throw new UnmarshalException(Messages.getString("rmi.66", h)); //$NON-NLS-1$ } logServerCall(m.toString()); Object[] params = readParams(m, oin); @@ -447,8 +455,8 @@ } oout.flush(); } catch (Error er) { - throw new ServerError( - "Error occured while marshalling return value", er); + // rmi.67=Error occured while marshalling return value + throw new ServerError(Messages.getString("rmi.67"), er); //$NON-NLS-1$ } } @@ -467,7 +475,7 @@ */ protected Class loadStubClass(Class c, boolean throwException) throws StubNotFoundException { - String stubName = c.getName() + "_Stub"; + String stubName = c.getName() + "_Stub"; //$NON-NLS-1$ ClassLoader cl = c.getClassLoader(); try { @@ -478,8 +486,8 @@ } } catch (ClassNotFoundException cnfe) { if (throwException) { - throw new StubNotFoundException( - "Stub " + stubName + " not found.", cnfe); + // rmi.68=Stub {0} not found. + throw new StubNotFoundException(Messages.getString("rmi.68", stubName), cnfe); //$NON-NLS-1$ } } return null; @@ -494,7 +502,7 @@ * skel loading or instantiating */ protected Skeleton getSkelInstance(Class c) { - String skelName = c.getName() + "_Skel"; + String skelName = c.getName() + "_Skel"; //$NON-NLS-1$ ClassLoader cl = c.getClassLoader(); try { @@ -539,18 +547,17 @@ paramTypes[i].getClassLoader()); } } catch (RemoteException re) { - throw new ServerException( - "RemoteException occured while unmarshalling arguments", - re); + // rmi.69=RemoteException occured while unmarshalling arguments + throw new ServerException(Messages.getString("rmi.69"), re); //$NON-NLS-1$ } catch (IOException ioe) { - throw new UnmarshalException( - "IOException occured while unmarshalling arguments", ioe); + // rmi.6A=IOException occured while unmarshalling arguments + throw new UnmarshalException(Messages.getString("rmi.6A"), ioe); //$NON-NLS-1$ } catch (ClassNotFoundException cnfe) { - throw new UnmarshalException("ClassNotFoundException occured while " - + "unmarshalling arguments", cnfe); + // rmi.6B=ClassNotFoundException occured while unmarshalling arguments + throw new UnmarshalException(Messages.getString("rmi.6B"), cnfe); //$NON-NLS-1$ } catch (Error er) { - throw new ServerError( - "Error occured while unmarshalling arguments", er); + // rmi.6C=Error occured while unmarshalling arguments + throw new ServerError(Messages.getString("rmi.6C"), er); //$NON-NLS-1$ } return params; } @@ -569,11 +576,11 @@ logServerException(m, t); if (t instanceof Error) { - preparedEx = new ServerError( - "Error occured while remote method invocation", (Error) t); + // rmi.6D=Error occured while remote method invocation + preparedEx = new ServerError(Messages.getString("rmi.6D"), (Error) t); //$NON-NLS-1$ } else if (t instanceof RemoteException) { - preparedEx = new ServerException("RemoteException occured " - + "while remote method invocation", + // rmi.6E=RemoteException occured while remote method invocation + preparedEx = new ServerException(Messages.getString("rmi.6E"), //$NON-NLS-1$ (RemoteException) t); } else { preparedEx = t; @@ -597,13 +604,15 @@ String client = ServerConnectionManager.getClientHost(); if (client != null) { - client = "Remote call from [" + client + "]"; + // rmi.log.99=Remote call from [{0}] + client = Messages.getString("rmi.log.99", client); //$NON-NLS-1$ //$NON-NLS-2$ } else { - client = "Local remote call"; + // rmi.log.9A=Local remote call + client = Messages.getString("rmi.log.9A"); //$NON-NLS-1$ } - serverCallsLog.log(RMILog.VERBOSE, - client + ": method:[" + m + "], class:[" - + implClassName + "]."); + // rmi.log.9B={0}: method:[{1}], class:[{2}]. + serverCallsLog.log(RMILog.VERBOSE,Messages.getString("rmi.log.9B", //$NON-NLS-1$ + new Object[]{client, m, implClassName})); } } @@ -613,13 +622,15 @@ String client = ServerConnectionManager.getClientHost(); if (client != null) { - client = "from " + client; + // rmi.log.9C=from {0} + client = Messages.getString("rmi.log.9C", client); //$NON-NLS-1$ } else { - client = "locally"; + // rmi.log.9D=locally + client = Messages.getString("rmi.log.9D"); //$NON-NLS-1$ } - String logMsg = "Exception thrown while calling [" + m - + "] method of " + implClassName - + " class requested " + client + ":"; + // rmi.log.9E=Exception thrown while calling [{0}] method of {1} class requested {2}: + String logMsg = Messages.getString("rmi.log.9E", //$NON-NLS-1$ + new Object[]{m, implClassName, client}); if (printST) { synchronized (System.err) { @@ -629,10 +640,9 @@ } if (serverCallsLog.isLoggable(RMILog.BRIEF)) { - serverCallsLog.log(RMILog.BRIEF, - "Exception thrown while calling [" + m + "] method of " - + implClassName + " class requested " - + client + ":", t); + // rmi.log.9E=Exception thrown while calling [{0}] method of {1} class requested {2}: + serverCallsLog.log(RMILog.BRIEF,Messages.getString("rmi.log.9E", //$NON-NLS-1$ + new Object[]{ m, implClassName, client}), t); } } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastServerRef2.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastServerRef2.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastServerRef2.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/remoteref/UnicastServerRef2.java Fri Oct 6 03:15:51 2006 @@ -82,6 +82,6 @@ * @see RemoteRef.getRefClass(ObjectOutput) */ public String getRefClass(ObjectOutput out) { - return "UnicastServerRef2"; + return "UnicastServerRef2"; //$NON-NLS-1$ } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ClientDGC.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ClientDGC.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ClientDGC.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ClientDGC.java Fri Oct 6 03:15:51 2006 @@ -47,6 +47,7 @@ import org.apache.harmony.rmi.common.GetLongPropAction; import org.apache.harmony.rmi.common.InterruptThreadAction; import org.apache.harmony.rmi.common.RMIProperties; +import org.apache.harmony.rmi.internal.nls.Messages; import org.apache.harmony.rmi.remoteref.UnicastRef; import org.apache.harmony.rmi.transport.Endpoint; @@ -102,7 +103,7 @@ // Thread detecting object which were garbage-collected. private static Thread roDetector = (Thread) AccessController.doPrivileged( new CreateThreadAction(new RemovedObjectsDetector(), - "RemovedObjectsDetector", true)); + "RemovedObjectsDetector", true)); //$NON-NLS-1$ // Timer handling events waiting for DGC ack messages. private static final Timer dgcAckTimer = @@ -122,9 +123,10 @@ // Initialize DGC implementation stub-class. try { dgcStubClass = Class.forName( - "org.apache.harmony.rmi.server.DGCImpl_Stub"); + "org.apache.harmony.rmi.server.DGCImpl_Stub"); //$NON-NLS-1$ } catch (Exception ex) { - throw new Error("Unable to initialize ClientDGC.", ex); + // rmi.78=Unable to initialize ClientDGC. + throw new Error(Messages.getString("rmi.78"), ex); //$NON-NLS-1$ } // Start the thread detecting garbage-collected objects. @@ -150,7 +152,7 @@ if (lRenewer == null) { (lRenewer = (Thread) AccessController.doPrivileged( new CreateThreadAction(new LeaseRenewer(), - "LeaseRenewer", true))).start(); + "LeaseRenewer", true))).start(); //$NON-NLS-1$ } } @@ -324,7 +326,8 @@ new Class[] { RemoteRef.class }).newInstance( new Object[] { new UnicastRef(ep, DGC_ID) }); } catch (Exception ex) { - throw new Error("Unable to initialized DGC stub.", ex); + // rmi.79=Unable to initialized DGC stub. + throw new Error(Messages.getString("rmi.79"), ex); //$NON-NLS-1$ } } @@ -405,7 +408,7 @@ if (cleanCaller == null) { (cleanCaller = ((Thread) AccessController.doPrivileged( new CreateThreadAction(new CleanCaller(this), - "CleanCaller for " + ep, true)))).start(); + "CleanCaller for " + ep, true)))).start(); //$NON-NLS-1$ } else { AccessController.doPrivileged( new InterruptThreadAction(cleanCaller)); Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl.java Fri Oct 6 03:15:51 2006 @@ -39,6 +39,7 @@ import org.apache.harmony.rmi.common.GetLongPropAction; import org.apache.harmony.rmi.common.RMILog; import org.apache.harmony.rmi.common.RMIProperties; +import org.apache.harmony.rmi.internal.nls.Messages; /** @@ -91,7 +92,8 @@ vmid = new VMID(); if (dgcLog.isLoggable(RMILog.VERBOSE)) { - dgcLog.log(RMILog.VERBOSE, "Created new VMID: " + vmid); + // rmi.log.10E=Created new VMID: {0} + dgcLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.10E", vmid)); //$NON-NLS-1$ } } long duration = lease.getValue(); @@ -115,15 +117,16 @@ if (expTracker == null) { (expTracker = (Thread) AccessController.doPrivileged( new CreateThreadAction(new ExpirationTracker(), - "ExpirationTracker", true))).start(); + "ExpirationTracker", true))).start(); //$NON-NLS-1$ } for (int i = 0; i < ids.length; ++i) { s.add(ids[i]); if (dgcLog.isLoggable(RMILog.VERBOSE)) { - dgcLog.log(RMILog.VERBOSE, "Added " + ids[i] - + ", " + vmid + ", duration = " + duration); + // rmi.log.10F=Added {0}, {1}, duration ={2} + dgcLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.10F", //$NON-NLS-1$ + new Object[]{ids[i], vmid, duration})); } } @@ -144,7 +147,8 @@ } if (dgcLog.isLoggable(RMILog.VERBOSE)) { - dgcLog.log(RMILog.VERBOSE, "Updated " + vmid); + // rmi.log.110=Updated {0} + dgcLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.110", vmid)); //$NON-NLS-1$ } return l; } @@ -169,8 +173,9 @@ s.remove(ids[i]); if (dgcLog.isLoggable(RMILog.VERBOSE)) { - dgcLog.log(RMILog.VERBOSE, "Removed " + ids[i] - + ", " + vmid); + // rmi.log.111=Removed {0},{1} + dgcLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.111", //$NON-NLS-1$ + ids[i], vmid)); } } } @@ -189,7 +194,8 @@ vmidTable.remove(vmid); if (dgcLog.isLoggable(RMILog.VERBOSE)) { - dgcLog.log(RMILog.VERBOSE, "Removed " + vmid); + // rmi.log.112=Removed {0} + dgcLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.112", vmid)); //$NON-NLS-1$ } } } @@ -242,8 +248,8 @@ if (info != null && dgcLog.isLoggable(RMILog.VERBOSE)) { - dgcLog.log(RMILog.VERBOSE, "Lease for " - + info.id + ", " + vmid + " expired."); + dgcLog.log(RMILog.VERBOSE, Messages.getString("rmi.log.113", //$NON-NLS-1$ + info.id, vmid)); } } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl_Skel.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl_Skel.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl_Skel.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl_Skel.java Fri Oct 6 03:15:51 2006 @@ -10,14 +10,16 @@ */ package org.apache.harmony.rmi.server; +import org.apache.harmony.rmi.internal.nls.Messages; + public final class DGCImpl_Skel implements java.rmi.server.Skeleton { private static final long interfaceHash = -669196253586618813L; private static final java.rmi.server.Operation[] operations = { - new java.rmi.server.Operation("void clean(java.rmi.server.ObjID[], long, java.rmi.dgc.VMID, boolean)"), - new java.rmi.server.Operation("java.rmi.dgc.Lease dirty(java.rmi.server.ObjID[], long, java.rmi.dgc.Lease)") + new java.rmi.server.Operation("void clean(java.rmi.server.ObjID[], long, java.rmi.dgc.VMID, boolean)"), //$NON-NLS-1$ + new java.rmi.server.Operation("java.rmi.dgc.Lease dirty(java.rmi.server.ObjID[], long, java.rmi.dgc.Lease)") //$NON-NLS-1$ }; public java.rmi.server.Operation[] getOperations() { @@ -26,8 +28,9 @@ public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall call, int opnum, long hash) throws java.lang.Exception { if (hash != interfaceHash) { + // rmi.2D=Interface hash mismatch, expected: {0}, received: {1} throw new java.rmi.server.SkeletonMismatchException( - "Interface hash mismatch, expected: " + interfaceHash + ", received: " + hash); + Messages.getString("rmi.2D", interfaceHash, hash)); //$NON-NLS-1$ } org.apache.harmony.rmi.server.DGCImpl server = (org.apache.harmony.rmi.server.DGCImpl) obj; @@ -48,9 +51,11 @@ $param_VMID_3 = (java.rmi.dgc.VMID) in.readObject(); $param_boolean_4 = in.readBoolean(); } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + // rmi.2C=Error unmarshalling arguments + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } catch (java.lang.ClassNotFoundException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + // rmi.2C=Error unmarshalling arguments + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } finally { call.releaseInputStream(); } @@ -60,7 +65,8 @@ try { call.getResultStream(true); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling return", e); + // rmi.2A=Error marshalling return + throw new java.rmi.MarshalException(Messages.getString("rmi.2A"), e); //$NON-NLS-1$ } break; @@ -78,9 +84,11 @@ $param_long_2 = in.readLong(); $param_Lease_3 = (java.rmi.dgc.Lease) in.readObject(); } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + // rmi.2C=Error unmarshalling arguments + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } catch (java.lang.ClassNotFoundException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling arguments", e); + // rmi.2C=Error unmarshalling arguments + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2C"), e); //$NON-NLS-1$ } finally { call.releaseInputStream(); } @@ -91,14 +99,16 @@ java.io.ObjectOutput out = call.getResultStream(true); out.writeObject($result); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling return", e); + // rmi.2A=Error marshalling return + throw new java.rmi.MarshalException(Messages.getString("rmi.2A"), e); //$NON-NLS-1$ } break; } default: - throw new java.rmi.UnmarshalException("Invalid method number: " + opnum); + // rmi.2B=Invalid method number: {0} + throw new java.rmi.UnmarshalException(Messages.getString("rmi.2B", opnum)); //$NON-NLS-1$ } } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl_Stub.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl_Stub.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl_Stub.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/DGCImpl_Stub.java Fri Oct 6 03:15:51 2006 @@ -10,6 +10,8 @@ */ package org.apache.harmony.rmi.server; +import org.apache.harmony.rmi.internal.nls.Messages; + public final class DGCImpl_Stub extends java.rmi.server.RemoteStub implements java.rmi.dgc.DGC { @@ -17,8 +19,8 @@ private static final long interfaceHash = -669196253586618813L; private static final java.rmi.server.Operation[] operations = { - new java.rmi.server.Operation("void clean(java.rmi.server.ObjID[], long, java.rmi.dgc.VMID, boolean)"), - new java.rmi.server.Operation("java.rmi.dgc.Lease dirty(java.rmi.server.ObjID[], long, java.rmi.dgc.Lease)") + new java.rmi.server.Operation("void clean(java.rmi.server.ObjID[], long, java.rmi.dgc.VMID, boolean)"), //$NON-NLS-1$ + new java.rmi.server.Operation("java.rmi.dgc.Lease dirty(java.rmi.server.ObjID[], long, java.rmi.dgc.Lease)") //$NON-NLS-1$ }; public DGCImpl_Stub() { @@ -42,7 +44,7 @@ out.writeObject($param_VMID_3); out.writeBoolean($param_boolean_4); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling arguments", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.26"), e); //$NON-NLS-1$ } ref.invoke(call); @@ -53,7 +55,7 @@ } catch (java.rmi.RemoteException e) { throw e; } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("Undeclared checked exception", e); + throw new java.rmi.UnexpectedException(Messages.getString("rmi.0C"), e); //$NON-NLS-1$ } } @@ -69,7 +71,7 @@ out.writeLong($param_long_2); out.writeObject($param_Lease_3); } catch (java.io.IOException e) { - throw new java.rmi.MarshalException("Error marshalling arguments", e); + throw new java.rmi.MarshalException(Messages.getString("rmi.26"), e); //$NON-NLS-1$ } ref.invoke(call); @@ -80,9 +82,9 @@ java.io.ObjectInput in = call.getInputStream(); $result = (java.rmi.dgc.Lease) in.readObject(); } catch (java.io.IOException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling return value", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.27"), e); //$NON-NLS-1$ } catch (java.lang.ClassNotFoundException e) { - throw new java.rmi.UnmarshalException("Error unmarshalling return value", e); + throw new java.rmi.UnmarshalException(Messages.getString("rmi.27"), e); //$NON-NLS-1$ } finally { ref.done(call); } @@ -93,7 +95,7 @@ } catch (java.rmi.RemoteException e) { throw e; } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("Undeclared checked exception", e); + throw new java.rmi.UnexpectedException(Messages.getString("rmi.0C"), e); //$NON-NLS-1$ } } } Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ExportManager.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ExportManager.java?view=diff&rev=453541&r1=453540&r2=453541 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ExportManager.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/org/apache/harmony/rmi/server/ExportManager.java Fri Oct 6 03:15:51 2006 @@ -33,6 +33,7 @@ import org.apache.harmony.rmi.common.CreateThreadAction; import org.apache.harmony.rmi.common.InterruptThreadAction; +import org.apache.harmony.rmi.internal.nls.Messages; import org.apache.harmony.rmi.remoteref.UnicastServerRef; @@ -62,7 +63,8 @@ new RMIReference(dgcImpl), ClientDGC.DGC_ID, dgcRef, null); exportedObjs.add(dgcInfo); } catch (Exception ex) { - throw new Error("Unable to initialize DGC.", ex); + // rmi.7D=Unable to initialize DGC. + throw new Error(Messages.getString("rmi.7D"), ex); //$NON-NLS-1$ } } @@ -141,8 +143,8 @@ boolean isSystem) throws RemoteException { if (isExported(obj)) { - throw new ExportException( - "Object " + obj + " has already been exported."); + // rmi.7B=Object {0} has already been exported. + throw new ExportException(Messages.getString("rmi.7B", obj)); //$NON-NLS-1$ } Remote stub = sref.exportObject(obj, null, useProxyStubs, startListen, isSystem); @@ -154,7 +156,7 @@ if (scav == null) { (scav = (Thread) AccessController.doPrivileged( new CreateThreadAction(new Scavenger(), - "Scavenger", false))).start(); + "Scavenger", false))).start(); //$NON-NLS-1$ } if (isSystem) { @@ -187,8 +189,8 @@ RMIObjectInfo info = exportedObjs.getByRef(ref); if (info == null) { - throw new NoSuchObjectException( - "Object " + obj + " is not exported."); + // rmi.7C=Object {0} is not exported. + throw new NoSuchObjectException(Messages.getString("rmi.7C", obj)); //$NON-NLS-1$ } boolean succeeded = info.sref.unexportObject(force); @@ -220,8 +222,8 @@ RMIObjectInfo info = exportedObjs.getByRef(new RMIReference(obj)); if (info == null) { - throw new NoSuchObjectException( - "Object " + obj + " is not exported."); + // rmi.7C=Object {0} is not exported. + throw new NoSuchObjectException(Messages.getString("rmi.7C", obj)); //$NON-NLS-1$ } return info.stub; } @@ -259,7 +261,7 @@ if (scav == null) { (scav = (Thread) AccessController.doPrivileged( new CreateThreadAction(new Scavenger(), - "Scavenger", false))).start(); + "Scavenger", false))).start(); //$NON-NLS-1$ } } }