Index: modules/rmi/make/patternset.txt =================================================================== --- modules/rmi/make/patternset.txt.orig 2006-05-08 18:20:30.000000000 +0100 +++ modules/rmi/make/patternset.txt 2006-05-17 15:00:13.000000000 +0100 @@ -13,3 +13,18 @@ # limitations under the License. java/rmi/* +java/rmi/dgc/* +java/rmi/activation/* +java/rmi/server/* +java/rmi/registry/* + +org/apache/harmony/rmi/internal/dgc/* +org/apache/harmony/rmi/internal/dgc/client/* +org/apache/harmony/rmi/internal/dgc/server/* +org/apache/harmony/rmi/internal/transport/* +org/apache/harmony/rmi/internal/transport/http/* +org/apache/harmony/rmi/internal/transport/jrmp/* +org/apache/harmony/rmi/internal/utils/* +org/apache/harmony/rmi/internal/runtime/* +org/apache/harmony/rmi/internal/server/* +org/apache/harmony/rmi/internal/registry/* Index: make/properties.xml =================================================================== --- make/properties.xml.orig 2006-05-08 18:20:31.000000000 +0100 +++ make/properties.xml 2006-05-17 14:59:19.000000000 +0100 @@ -19,6 +19,9 @@ + + + @@ -94,6 +97,11 @@ +Harmony module implementation properties: + + hy.rmi.module = ${hy.rmi.module} + + Harmony javac properties: hy.javac.target = ${hy.javac.target} @@ -157,7 +165,13 @@ - + + + + + + + Index: make/build-java.xml =================================================================== --- make/build-java.xml.orig 2006-05-09 08:38:41.000000000 +0100 +++ make/build-java.xml 2006-05-17 14:59:19.000000000 +0100 @@ -98,7 +98,7 @@ - + Index: modules/rmi/src/main/java/java/rmi/registry/LocateRegistry.java =================================================================== --- modules/rmi/src/main/java/java/rmi/registry/LocateRegistry.java.orig 2006-05-16 15:24:10.000000000 +0100 +++ modules/rmi/src/main/java/java/rmi/registry/LocateRegistry.java 2006-05-17 14:59:19.000000000 +0100 @@ -19,7 +19,7 @@ import java.rmi.server.RMIClientSocketFactory; import java.rmi.server.RMIServerSocketFactory; -import ar.org.fitc.rmi.registry.RegistryImpl; +import org.apache.harmony.rmi.internal.registry.RegistryImpl; /** * @ar.org.fitc.spec_ref Index: modules/rmi/src/main/java/java/rmi/server/ObjID.java =================================================================== --- modules/rmi/src/main/java/java/rmi/server/ObjID.java.orig 2006-05-16 15:24:10.000000000 +0100 +++ modules/rmi/src/main/java/java/rmi/server/ObjID.java 2006-05-17 14:59:19.000000000 +0100 @@ -21,7 +21,7 @@ import java.io.Serializable; import java.security.SecureRandom; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /** * @ar.org.fitc.spec_ref Index: modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java =================================================================== --- modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java.orig 2006-05-16 15:24:10.000000000 +0100 +++ modules/rmi/src/main/java/java/rmi/server/RMIClassLoader.java 2006-05-17 14:59:19.000000000 +0100 @@ -24,8 +24,8 @@ import java.net.MalformedURLException; import java.net.URL; -import ar.org.fitc.rmi.runtime.RMIDefaultClassLoaderSpi; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.runtime.RMIDefaultClassLoaderSpi; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /** * @ar.org.fitc.spec_ref Index: modules/rmi/src/main/java/java/rmi/server/RMISocketFactory.java =================================================================== --- modules/rmi/src/main/java/java/rmi/server/RMISocketFactory.java.orig 2006-05-16 15:24:10.000000000 +0100 +++ modules/rmi/src/main/java/java/rmi/server/RMISocketFactory.java 2006-05-17 14:59:19.000000000 +0100 @@ -19,7 +19,7 @@ import java.net.ServerSocket; import java.net.Socket; -import ar.org.fitc.rmi.transport.RMIDefaultSocketFactory; +import org.apache.harmony.rmi.internal.transport.RMIDefaultSocketFactory; /** * @ar.org.fitc.spec_ref Index: modules/rmi/src/main/java/java/rmi/server/RemoteObject.java =================================================================== --- modules/rmi/src/main/java/java/rmi/server/RemoteObject.java.orig 2006-05-16 15:24:10.000000000 +0100 +++ modules/rmi/src/main/java/java/rmi/server/RemoteObject.java 2006-05-17 14:59:19.000000000 +0100 @@ -23,12 +23,12 @@ import java.rmi.NoSuchObjectException; import java.rmi.Remote; -import ar.org.fitc.rmi.runtime.RemoteReferenceManager; -import ar.org.fitc.rmi.server.ReferenceTypes; -import ar.org.fitc.rmi.server.UnicastRemoteRef2Impl; -import ar.org.fitc.rmi.server.UnicastRemoteRefImpl; -import ar.org.fitc.rmi.server.UnicastServerRef2Impl; -import ar.org.fitc.rmi.server.UnicastServerRefImpl; +import org.apache.harmony.rmi.internal.runtime.RemoteReferenceManager; +import org.apache.harmony.rmi.internal.server.ReferenceTypes; +import org.apache.harmony.rmi.internal.server.UnicastRemoteRef2Impl; +import org.apache.harmony.rmi.internal.server.UnicastRemoteRefImpl; +import org.apache.harmony.rmi.internal.server.UnicastServerRef2Impl; +import org.apache.harmony.rmi.internal.server.UnicastServerRefImpl; /** * @ar.org.fitc.spec_ref Index: modules/rmi/src/main/java/java/rmi/server/RemoteObjectInvocationHandler.java =================================================================== --- modules/rmi/src/main/java/java/rmi/server/RemoteObjectInvocationHandler.java.orig 2006-05-16 15:24:10.000000000 +0100 +++ modules/rmi/src/main/java/java/rmi/server/RemoteObjectInvocationHandler.java 2006-05-17 14:59:19.000000000 +0100 @@ -20,7 +20,7 @@ import java.lang.reflect.Proxy; import java.rmi.Remote; import java.rmi.UnexpectedException; -import ar.org.fitc.rmi.utils.MethodHashGenerator; +import org.apache.harmony.rmi.internal.utils.MethodHashGenerator; /** * @ar.org.fitc.spec_ref Index: modules/rmi/src/main/java/java/rmi/server/RemoteRef.java =================================================================== --- modules/rmi/src/main/java/java/rmi/server/RemoteRef.java.orig 2006-05-16 15:24:10.000000000 +0100 +++ modules/rmi/src/main/java/java/rmi/server/RemoteRef.java 2006-05-17 14:59:19.000000000 +0100 @@ -29,7 +29,7 @@ static final long serialVersionUID = 3632638527362204081L; - static final String packagePrefix = "ar.org.fitc.rmi.server"; + static final String packagePrefix = "org.apache.harmony.rmi.internal.server"; /** * @ar.org.fitc.spec_ref Index: modules/rmi/src/main/java/java/rmi/server/RemoteServer.java =================================================================== --- modules/rmi/src/main/java/java/rmi/server/RemoteServer.java.orig 2006-05-16 15:24:10.000000000 +0100 +++ modules/rmi/src/main/java/java/rmi/server/RemoteServer.java 2006-05-17 14:59:19.000000000 +0100 @@ -21,9 +21,9 @@ import java.util.logging.Logger; import java.util.logging.LoggingPermission; -import ar.org.fitc.rmi.transport.TransportManager; -import ar.org.fitc.rmi.utils.PrintStreamHandler; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.transport.TransportManager; +import org.apache.harmony.rmi.internal.utils.PrintStreamHandler; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /** * @ar.org.fitc.spec_ref @@ -43,7 +43,7 @@ // Initialize loggers static { - logger = Logger.getLogger("ar.org.fitc.rmi.server"); + logger = Logger.getLogger("org.apache.harmony.rmi.internal.server"); logger.setUseParentHandlers(false); logger.setLevel(Level.ALL); @@ -59,9 +59,9 @@ } // Implementation-specific logger to log server information - serverLog = Logger.getLogger("ar.org.fitc.rmi.server.log"); + serverLog = Logger.getLogger("org.apache.harmony.rmi.internal.server.log"); propertyValue = - PropertiesReader.readString("ar.org.fitc.rmi.server.log"); + PropertiesReader.readString("org.apache.harmony.rmi.internal.server.log"); if (propertyValue != null && propertyValue.equalsIgnoreCase("true")) { Index: modules/rmi/src/main/java/java/rmi/server/UnicastRemoteObject.java =================================================================== --- modules/rmi/src/main/java/java/rmi/server/UnicastRemoteObject.java.orig 2006-05-16 15:24:10.000000000 +0100 +++ modules/rmi/src/main/java/java/rmi/server/UnicastRemoteObject.java 2006-05-17 14:59:19.000000000 +0100 @@ -22,13 +22,13 @@ import java.rmi.RemoteException; import java.rmi.NoSuchObjectException; -import ar.org.fitc.rmi.runtime.RemoteReferenceManager; -import ar.org.fitc.rmi.server.UnicastRemoteRef2Impl; -import ar.org.fitc.rmi.server.UnicastRemoteRefImpl; -import ar.org.fitc.rmi.server.UnicastServerRef2Impl; -import ar.org.fitc.rmi.server.UnicastServerRefImpl; -import ar.org.fitc.rmi.transport.Endpoint; -import ar.org.fitc.rmi.transport.TransportManager; +import org.apache.harmony.rmi.internal.runtime.RemoteReferenceManager; +import org.apache.harmony.rmi.internal.server.UnicastRemoteRef2Impl; +import org.apache.harmony.rmi.internal.server.UnicastRemoteRefImpl; +import org.apache.harmony.rmi.internal.server.UnicastServerRef2Impl; +import org.apache.harmony.rmi.internal.server.UnicastServerRefImpl; +import org.apache.harmony.rmi.internal.transport.Endpoint; +import org.apache.harmony.rmi.internal.transport.TransportManager; /** * @ar.org.fitc.spec_ref Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/DGCScheduledGC.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/DGCScheduledGC.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/DGCScheduledGC.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,12 +13,12 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.dgc; +package org.apache.harmony.rmi.internal.dgc; import java.util.Timer; import java.util.TimerTask; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /* * NOTE: @@ -51,7 +51,7 @@ static { gcInterval = PropertiesReader.readLong( - "ar.org.fitc.rmi.dgc.gcInterval", 60000); + "org.apache.harmony.rmi.internal.dgc.gcInterval", 60000); } /** Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DGCClient.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DGCClient.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DGCClient.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.dgc.client; +package org.apache.harmony.rmi.internal.dgc.client; import java.lang.ref.WeakReference; import java.lang.reflect.InvocationHandler; @@ -32,11 +32,11 @@ import java.util.Timer; import java.util.WeakHashMap; -import ar.org.fitc.rmi.dgc.DGCScheduledGC; -import ar.org.fitc.rmi.transport.Endpoint; -import ar.org.fitc.rmi.transport.TransportManager; -import ar.org.fitc.rmi.utils.Pair; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.dgc.DGCScheduledGC; +import org.apache.harmony.rmi.internal.transport.Endpoint; +import org.apache.harmony.rmi.internal.transport.TransportManager; +import org.apache.harmony.rmi.internal.utils.Pair; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DGCQueuePoll.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DGCQueuePoll.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DGCQueuePoll.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.dgc.client; +package org.apache.harmony.rmi.internal.dgc.client; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; @@ -24,8 +24,8 @@ import java.util.Hashtable; import java.util.Map; -import ar.org.fitc.rmi.transport.Endpoint; -import ar.org.fitc.rmi.utils.Pair; +import org.apache.harmony.rmi.internal.transport.Endpoint; +import org.apache.harmony.rmi.internal.utils.Pair; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DirtyRetryTask.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DirtyRetryTask.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DirtyRetryTask.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,14 +13,14 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.dgc.client; +package org.apache.harmony.rmi.internal.dgc.client; import java.rmi.server.ObjID; import java.util.Timer; import java.util.TimerTask; -import ar.org.fitc.rmi.transport.Endpoint; -import ar.org.fitc.rmi.utils.Pair; +import org.apache.harmony.rmi.internal.transport.Endpoint; +import org.apache.harmony.rmi.internal.utils.Pair; /** * When scheduled dirty calls fail, the dirty retry process uses instances of Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DirtyTask.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DirtyTask.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/client/DirtyTask.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.dgc.client; +package org.apache.harmony.rmi.internal.dgc.client; import java.rmi.server.ObjID; import java.util.HashMap; @@ -24,8 +24,8 @@ import java.util.Timer; import java.util.TimerTask; -import ar.org.fitc.rmi.transport.Endpoint; -import ar.org.fitc.rmi.utils.Pair; +import org.apache.harmony.rmi.internal.transport.Endpoint; +import org.apache.harmony.rmi.internal.utils.Pair; /** * This class groups all the references with the same granted lease time. A Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/server/DGCData.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/server/DGCData.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/server/DGCData.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.dgc.server; +package org.apache.harmony.rmi.internal.dgc.server; import java.lang.ref.WeakReference; import java.rmi.Remote; @@ -66,7 +66,7 @@ private int dgcCount; /** - * Creates a {@link ar.org.fitc.rmi.dgc.server.DGCData} + * Creates a {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} * * @param objID * the {@link ObjID} for this Object. Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/server/DGCDataTable.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/server/DGCDataTable.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/server/DGCDataTable.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.dgc.server; +package org.apache.harmony.rmi.internal.dgc.server; import java.lang.ref.WeakReference; import java.rmi.Remote; @@ -25,7 +25,7 @@ import java.util.Hashtable; import java.util.Map; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /* * NOTE: @@ -37,7 +37,7 @@ * A table implementation that groups all the exported objects to be eventually * Garbage Collected. It provides the the functionality needed by the * Distributed Garbage Collector to the - * {@link ar.org.fitc.rmi.dgc.server.DGCImpl} class. + * {@link org.apache.harmony.rmi.internal.dgc.server.DGCImpl} class. * * @author Gustavo Petri */ @@ -45,13 +45,13 @@ /** * Mapping from {@link java.rmi.server.ObjID} to it's corresponding - * {@link ar.org.fitc.rmi.dgc.server.DGCData} information. + * {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} information. */ private Map objIdIndex; /** * Mapping from a {@link java.lang.ref.WeakReference} to the - * {@link ar.org.fitc.rmi.dgc.server.DGCData} of it's referee. Used for + * {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} of it's referee. Used for * clean up after the object has actually been collected. */ private Map, DGCData> weakRefIndex; @@ -79,13 +79,13 @@ } /** - * Returns the {@link ar.org.fitc.rmi.dgc.server.DGCData} corresponding to + * Returns the {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} corresponding to * the given {@link java.rmi.server.ObjID} * * @param objID * Object Identifier for which the - * {@link ar.org.fitc.rmi.dgc.server.DGCData} is needed. - * @return the {@link ar.org.fitc.rmi.dgc.server.DGCData} for the given + * {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} is needed. + * @return the {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} for the given * {@link java.rmi.server.ObjID} */ public final DGCData getByObjID(ObjID objID) { @@ -93,13 +93,13 @@ } /** - * Returns the {@link ar.org.fitc.rmi.dgc.server.DGCData} corresponding to + * Returns the {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} corresponding to * the Object refereed by the given {@link java.lang.ref.WeakReference} * * @param wRef * WeakReference for the object whichs - * {@link ar.org.fitc.rmi.dgc.server.DGCData} is needed. - * @return the {@link ar.org.fitc.rmi.dgc.server.DGCData} for the Object + * {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} is needed. + * @return the {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} for the Object * refereed by the given {@link java.rmi.server.ObjID} */ public final DGCData getByWeakRef(WeakReference wRef) { @@ -184,10 +184,10 @@ /** * Returns the {@link java.rmi.server.ObjID} to - * {@link ar.org.fitc.rmi.dgc.server.DGCData} map. + * {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} map. * * @return the {@link java.rmi.server.ObjID} to - * {@link ar.org.fitc.rmi.dgc.server.DGCData} map. + * {@link org.apache.harmony.rmi.internal.dgc.server.DGCData} map. */ public final Map getObjIDMap() { return objIdIndex; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/server/DGCImpl.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/server/DGCImpl.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/dgc/server/DGCImpl.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.dgc.server; +package org.apache.harmony.rmi.internal.dgc.server; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; @@ -29,10 +29,10 @@ import java.util.Timer; import java.util.TimerTask; -import ar.org.fitc.rmi.dgc.DGCScheduledGC; -import ar.org.fitc.rmi.runtime.RemoteReferenceManager; -import ar.org.fitc.rmi.utils.Pair; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.dgc.DGCScheduledGC; +import org.apache.harmony.rmi.internal.runtime.RemoteReferenceManager; +import org.apache.harmony.rmi.internal.utils.Pair; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /* * NOTE: @@ -73,7 +73,7 @@ /** * Interval used to check if the lease times of the Garbage Collector had - * expired Specifed by the ar.org.fitc.rmi.dgc.checkInterval + * expired Specifed by the org.apache.harmony.rmi.internal.dgc.checkInterval */ private static long checkInterval; @@ -88,7 +88,7 @@ */ static { checkInterval = PropertiesReader.readLong( - "ar.org.fitc.rmi.dgc.checkInterval", 300000); + "org.apache.harmony.rmi.internal.dgc.checkInterval", 300000); leaseProperty = PropertiesReader.readLong( "java.rmi.dgc.leaseValue", 600000); Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/registry/RegistryImpl.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/registry/RegistryImpl.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/registry/RegistryImpl.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.registry; +package org.apache.harmony.rmi.internal.registry; import java.net.InetAddress; import java.net.NetworkInterface; @@ -37,13 +37,13 @@ import java.util.Map; import java.util.Set; -import ar.org.fitc.rmi.runtime.RemoteReferenceManager; -import ar.org.fitc.rmi.server.UnicastRemoteRef2Impl; -import ar.org.fitc.rmi.server.UnicastRemoteRefImpl; -import ar.org.fitc.rmi.server.UnicastServerRef2Impl; -import ar.org.fitc.rmi.server.UnicastServerRefImpl; -import ar.org.fitc.rmi.transport.Endpoint; -import ar.org.fitc.rmi.transport.TransportManager; +import org.apache.harmony.rmi.internal.runtime.RemoteReferenceManager; +import org.apache.harmony.rmi.internal.server.UnicastRemoteRef2Impl; +import org.apache.harmony.rmi.internal.server.UnicastRemoteRefImpl; +import org.apache.harmony.rmi.internal.server.UnicastServerRef2Impl; +import org.apache.harmony.rmi.internal.server.UnicastServerRefImpl; +import org.apache.harmony.rmi.internal.transport.Endpoint; +import org.apache.harmony.rmi.internal.transport.TransportManager; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/registry/RegistryImpl_Stub.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/registry/RegistryImpl_Stub.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/registry/RegistryImpl_Stub.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.registry; +package org.apache.harmony.rmi.internal.registry; import java.lang.reflect.Method; import java.rmi.AccessException; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/runtime/RMIDefaultClassLoaderSpi.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/runtime/RMIDefaultClassLoaderSpi.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/runtime/RMIDefaultClassLoaderSpi.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.runtime; +package org.apache.harmony.rmi.internal.runtime; import java.io.IOException; import java.lang.ref.WeakReference; @@ -27,8 +27,8 @@ import java.util.Arrays; import java.util.HashMap; -import ar.org.fitc.rmi.utils.Pair; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.utils.Pair; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /** * This is the default RMI implementation of the Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/runtime/RemoteReferenceManager.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/runtime/RemoteReferenceManager.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/runtime/RemoteReferenceManager.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.runtime; +package org.apache.harmony.rmi.internal.runtime; import java.lang.reflect.Constructor; import java.lang.reflect.Proxy; @@ -31,12 +31,12 @@ import java.util.Set; import java.util.WeakHashMap; -import ar.org.fitc.rmi.dgc.server.DGCImpl; -import ar.org.fitc.rmi.server.UnicastServerRefImpl; -import ar.org.fitc.rmi.transport.TransportManager; -import ar.org.fitc.rmi.utils.Pair; -import ar.org.fitc.rmi.utils.PropertiesReader; -import ar.org.fitc.rmi.utils.RemoteUtils; +import org.apache.harmony.rmi.internal.dgc.server.DGCImpl; +import org.apache.harmony.rmi.internal.server.UnicastServerRefImpl; +import org.apache.harmony.rmi.internal.transport.TransportManager; +import org.apache.harmony.rmi.internal.utils.Pair; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.utils.RemoteUtils; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/ReferenceTypes.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/ReferenceTypes.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/ReferenceTypes.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.server; +package org.apache.harmony.rmi.internal.server; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastRemoteRef2Impl.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastRemoteRef2Impl.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastRemoteRef2Impl.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.server; +package org.apache.harmony.rmi.internal.server; import java.io.IOException; import java.io.ObjectInput; @@ -21,8 +21,8 @@ import java.rmi.server.ObjID; import java.rmi.server.RMIClientSocketFactory; -import ar.org.fitc.rmi.dgc.client.DGCClient; -import ar.org.fitc.rmi.transport.Endpoint; +import org.apache.harmony.rmi.internal.dgc.client.DGCClient; +import org.apache.harmony.rmi.internal.transport.Endpoint; /** * This class is the implementation of the RemoteRef interface Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastRemoteRefImpl.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastRemoteRefImpl.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastRemoteRefImpl.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.server; +package org.apache.harmony.rmi.internal.server; import java.io.IOException; import java.io.ObjectInput; @@ -27,9 +27,9 @@ import java.rmi.server.RemoteObject; import java.rmi.server.RemoteRef; -import ar.org.fitc.rmi.dgc.client.DGCClient; -import ar.org.fitc.rmi.transport.Endpoint; -import ar.org.fitc.rmi.transport.TransportManager; +import org.apache.harmony.rmi.internal.dgc.client.DGCClient; +import org.apache.harmony.rmi.internal.transport.Endpoint; +import org.apache.harmony.rmi.internal.transport.TransportManager; /** * This class is the implementation of the RemoteRef interface Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastServerRef2Impl.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastServerRef2Impl.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastServerRef2Impl.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.server; +package org.apache.harmony.rmi.internal.server; import java.io.IOException; import java.io.ObjectInput; @@ -21,7 +21,7 @@ import java.rmi.Remote; import java.rmi.server.ObjID; -import ar.org.fitc.rmi.transport.Endpoint; +import org.apache.harmony.rmi.internal.transport.Endpoint; /** * This class is the implementation of the ServerRef interface Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastServerRefImpl.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastServerRefImpl.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/server/UnicastServerRefImpl.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.server; +package org.apache.harmony.rmi.internal.server; import java.io.IOException; import java.io.ObjectInput; @@ -38,10 +38,10 @@ import java.util.logging.Level; import java.util.logging.Logger; -import ar.org.fitc.rmi.transport.Endpoint; -import ar.org.fitc.rmi.transport.TransportManager; -import ar.org.fitc.rmi.utils.MethodHashGenerator; -import ar.org.fitc.rmi.utils.RemoteUtils; +import org.apache.harmony.rmi.internal.transport.Endpoint; +import org.apache.harmony.rmi.internal.transport.TransportManager; +import org.apache.harmony.rmi.internal.utils.MethodHashGenerator; +import org.apache.harmony.rmi.internal.utils.RemoteUtils; /* * NOTE: @@ -268,7 +268,7 @@ * The message to be logged */ private void logCall(String msg) { - Logger logger = Logger.getLogger("ar.org.fitc.rmi.server"); + Logger logger = Logger.getLogger("org.apache.harmony.rmi.internal.server"); try { logger.log(Level.FINER, "RMI " + TransportManager.getTransportManager() @@ -287,7 +287,7 @@ * The exception or error to be logged */ private void logException(Throwable e) { - Logger logger = Logger.getLogger("ar.org.fitc.rmi.server"); + Logger logger = Logger.getLogger("org.apache.harmony.rmi.internal.server"); try { logger.log(Level.FINE, "RMI " + TransportManager.getTransportManager() Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/AbstractClientConnection.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/AbstractClientConnection.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/AbstractClientConnection.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -27,8 +27,8 @@ import java.rmi.server.UID; import java.util.WeakHashMap; -import ar.org.fitc.rmi.transport.jrmp.ClientProtocolHandler; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.transport.jrmp.ClientProtocolHandler; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /* * NOTE: @@ -38,7 +38,7 @@ /** * Encapsulates the Client events occurring in the JRMP protocol. It creates a - * socket for the specified {@link ar.org.fitc.rmi.transport.Endpoint}, it + * socket for the specified {@link org.apache.harmony.rmi.internal.transport.Endpoint}, it * sends all the parameters in the apropriate order and it waits for the * results. * @@ -52,20 +52,20 @@ static protected int clientConnectionCounter = 0; /** - * The table for storing the {@link ar.org.fitc.rmi.transport.Endpoint} and + * The table for storing the {@link org.apache.harmony.rmi.internal.transport.Endpoint} and * the {@link #lastUsageTime} for the connection. */ static protected WeakHashMap rttTable; /** - * Used to store the value of the ar.org.fitc.rmi.transport.readTimeout + * Used to store the value of the org.apache.harmony.rmi.internal.transport.readTimeout * property. */ protected static int SO_TIME_OUT; static { SO_TIME_OUT = PropertiesReader.readInt( - "ar.org.fitc.rmi.transport.readTimeout", 0); + "org.apache.harmony.rmi.internal.transport.readTimeout", 0); rttTable = new WeakHashMap(); } @@ -106,13 +106,13 @@ /** * Creates a new connection to the specified - * {@link ar.org.fitc.rmi.transport.Endpoint} using the underlying + * {@link org.apache.harmony.rmi.internal.transport.Endpoint} using the underlying * {@link java.net.Socket} * * @param sock * the {@link java.net.Socket} to which the connection belongs * @param ep - * the {@link ar.org.fitc.rmi.transport.Endpoint} for this + * the {@link org.apache.harmony.rmi.internal.transport.Endpoint} for this * connection * @throws ConnectIOException * if an IOException occurs while making a connection to the Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/AbstractServerConnection.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/AbstractServerConnection.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/AbstractServerConnection.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -32,11 +32,11 @@ import java.util.Map; import java.util.Set; -import ar.org.fitc.rmi.runtime.RemoteReferenceManager; -import ar.org.fitc.rmi.transport.jrmp.Message; -import ar.org.fitc.rmi.transport.jrmp.ReturnMessage; -import ar.org.fitc.rmi.transport.jrmp.ServerProtocolHandler; -import ar.org.fitc.rmi.utils.Pair; +import org.apache.harmony.rmi.internal.runtime.RemoteReferenceManager; +import org.apache.harmony.rmi.internal.transport.jrmp.Message; +import org.apache.harmony.rmi.internal.transport.jrmp.ReturnMessage; +import org.apache.harmony.rmi.internal.transport.jrmp.ServerProtocolHandler; +import org.apache.harmony.rmi.internal.utils.Pair; /* * NOTE: @@ -114,14 +114,14 @@ /** * Creates a new connection to the specified - * {@link ar.org.fitc.rmi.transport.EndpointID} + * {@link org.apache.harmony.rmi.internal.transport.EndpointID} * * @param in * the specified {@link java.io.InputStream} * @param out * the specified {@link java.io.OutputStream} * @param clientEP - * the specified {@link ar.org.fitc.rmi.transport.EndpointID} + * the specified {@link org.apache.harmony.rmi.internal.transport.EndpointID} * @param sock * the socket of connection */ Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ClientConnectionFactory.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ClientConnectionFactory.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ClientConnectionFactory.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.net.Socket; @@ -23,8 +23,8 @@ import java.rmi.server.RMIClientSocketFactory; import java.rmi.server.RMISocketFactory; -import ar.org.fitc.rmi.transport.http.HttpSocketClientSide; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.transport.http.HttpSocketClientSide; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /** * @@ -36,7 +36,7 @@ static { SO_TIME_OUT = PropertiesReader.readInt( - "ar.org.fitc.rmi.transport.readTimeout", 0); + "org.apache.harmony.rmi.internal.transport.readTimeout", 0); } static final AbstractClientConnection getClientConnection(Endpoint ep) Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ConnectionPool.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ConnectionPool.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ConnectionPool.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.rmi.ConnectIOException; @@ -27,7 +27,7 @@ import java.util.Timer; import java.util.TimerTask; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /* * NOTE: @@ -37,15 +37,15 @@ /** * Reuses the connections that have been created for a specified - * {@link ar.org.fitc.rmi.transport.Endpoint} and have been released. Maintains + * {@link org.apache.harmony.rmi.internal.transport.Endpoint} and have been released. Maintains * a pool of connections by a Map, that contains for each - * {@link ar.org.fitc.rmi.transport.Endpoint} a corresponding Map with a - * {@link ar.org.fitc.rmi.transport.AbstractClientConnection}-Time) where + * {@link org.apache.harmony.rmi.internal.transport.Endpoint} a corresponding Map with a + * {@link org.apache.harmony.rmi.internal.transport.AbstractClientConnection}-Time) where * Time is the current time in which the connection was released. *
* The Connection Pool is implemented through a {@link java.util.Timer}. * The keep alive time for which a connection is maintained in the map can be - * obtained via the property ar.org.fitc.rmi.transport.connectionTimeout, + * obtained via the property org.apache.harmony.rmi.internal.transport.connectionTimeout, * where the default value is 15000.
* When the connections are removed from the table because are evicted, such * connection is closed and lets the server know. @@ -57,7 +57,7 @@ public final class ConnectionPool { /** - * The table used for storing the {@link ar.org.fitc.rmi.transport.Endpoint} + * The table used for storing the {@link org.apache.harmony.rmi.internal.transport.Endpoint} * as key and a corresponding list that contains pairs * {@link AbstractClientConnection} and time in * milliseconds at the moment that the connection has been released. @@ -77,7 +77,7 @@ static { connTimeOut = PropertiesReader.readLong( - "ar.org.fitc.rmi.transport.connectionTimeout", 15000); + "org.apache.harmony.rmi.internal.transport.connectionTimeout", 15000); } /** @@ -100,21 +100,21 @@ } /** - * Returns a {@link ar.org.fitc.rmi.transport.AbstractClientConnection} for - * the received {@link ar.org.fitc.rmi.transport.Endpoint}.If a - * {@link ar.org.fitc.rmi.transport.AbstractClientConnection} exists in the - * table for the specified {@link ar.org.fitc.rmi.transport.Endpoint} and + * Returns a {@link org.apache.harmony.rmi.internal.transport.AbstractClientConnection} for + * the received {@link org.apache.harmony.rmi.internal.transport.Endpoint}.If a + * {@link org.apache.harmony.rmi.internal.transport.AbstractClientConnection} exists in the + * table for the specified {@link org.apache.harmony.rmi.internal.transport.Endpoint} and * the connection is not evicted, the connection is usable and it is backed. * If no usable connection was found in the pool, a new - * {@link ar.org.fitc.rmi.transport.AbstractClientConnection} is created and - * backed. The {@link ar.org.fitc.rmi.transport.AbstractClientConnection} + * {@link org.apache.harmony.rmi.internal.transport.AbstractClientConnection} is created and + * backed. The {@link org.apache.harmony.rmi.internal.transport.AbstractClientConnection} * found in the table, usable or not, is removed from the table. * * @param ep - * the {@link ar.org.fitc.rmi.transport.Endpoint} for which a + * the {@link org.apache.harmony.rmi.internal.transport.Endpoint} for which a * connection is required. - * @return a {@link ar.org.fitc.rmi.transport.AbstractClientConnection} for - * the specified {@link ar.org.fitc.rmi.transport.Endpoint} + * @return a {@link org.apache.harmony.rmi.internal.transport.AbstractClientConnection} for + * the specified {@link org.apache.harmony.rmi.internal.transport.Endpoint} * @throws IOException */ public synchronized final AbstractClientConnection getClientConnection( @@ -178,17 +178,17 @@ } /** - * Adds a {@link ar.org.fitc.rmi.transport.StreamClientConnection} on the - * table for a specified {@link ar.org.fitc.rmi.transport.Endpoint} with the + * Adds a {@link org.apache.harmony.rmi.internal.transport.StreamClientConnection} on the + * table for a specified {@link org.apache.harmony.rmi.internal.transport.Endpoint} with the * current time in milliseconds.
* Notice that is only applicable to StreamOpClientConnection * * @param ep - * the specific {@link ar.org.fitc.rmi.transport.Endpoint} + * the specific {@link org.apache.harmony.rmi.internal.transport.Endpoint} * @param clConn * the corresponding - * {@link ar.org.fitc.rmi.transport.StreamClientConnection} to - * the specified {@link ar.org.fitc.rmi.transport.Endpoint}. + * {@link org.apache.harmony.rmi.internal.transport.StreamClientConnection} to + * the specified {@link org.apache.harmony.rmi.internal.transport.Endpoint}. */ public synchronized final void releaseClientConnection(Endpoint ep, StreamClientConnection clConn) { // only applicable to stream Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/Endpoint.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/Endpoint.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/Endpoint.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,13 +13,13 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.net.InetAddress; import java.net.UnknownHostException; import java.rmi.server.RMIClientSocketFactory; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /** * This is a simple representation of an TCP/IP, UDP/IP endpoint. @@ -52,7 +52,7 @@ } /** - * Constructs a new {@link ar.org.fitc.rmi.transport.Endpoint} with the specified + * Constructs a new {@link org.apache.harmony.rmi.internal.transport.Endpoint} with the specified * port and csf. * * @param port @@ -83,7 +83,7 @@ } /** - * Constructs a new {@link ar.org.fitc.rmi.transport.Endpoint} with the specified + * Constructs a new {@link org.apache.harmony.rmi.internal.transport.Endpoint} with the specified * hostname, port and csf. * * @param host @@ -101,7 +101,7 @@ /** * Sets a {@link java.rmi.server.RMIClientSocketFactory} to be used by this - * {@link ar.org.fitc.rmi.transport.Endpoint}. + * {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * * @param csf * csf {@link java.rmi.server.RMIClientSocketFactory} instance to @@ -113,7 +113,7 @@ /** * Sets a the hostname to be used by this - * {@link ar.org.fitc.rmi.transport.Endpoint}. + * {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * * @param host * The hostname to be setted @@ -123,7 +123,7 @@ } /** - * Sets the port used by this {@link ar.org.fitc.rmi.transport.Endpoint}. + * Sets the port used by this {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * * @param port * The port to be setted @@ -134,53 +134,53 @@ /** * Returns the {@link java.rmi.server.RMIClientSocketFactory} instance used - * by this {@link ar.org.fitc.rmi.transport.Endpoint}. + * by this {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * * @return the {@link java.rmi.server.RMIClientSocketFactory} instance used - * by this {@link ar.org.fitc.rmi.transport.Endpoint} + * by this {@link org.apache.harmony.rmi.internal.transport.Endpoint} */ public final RMIClientSocketFactory getCsf() { return csf; } /** - * Returns the host used by this {@link ar.org.fitc.rmi.transport.Endpoint}. + * Returns the host used by this {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * - * @return the host used by this {@link ar.org.fitc.rmi.transport.Endpoint} + * @return the host used by this {@link org.apache.harmony.rmi.internal.transport.Endpoint} */ public final String getHost() { return host; } /** - * Returns the port used by this {@link ar.org.fitc.rmi.transport.Endpoint}. + * Returns the port used by this {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * - * @return the port used by this {@link ar.org.fitc.rmi.transport.Endpoint} + * @return the port used by this {@link org.apache.harmony.rmi.internal.transport.Endpoint} */ public final int getPort() { return port; } /** - * Returns an {@link ar.org.fitc.rmi.transport.Endpoint} identifying this - * {@link ar.org.fitc.rmi.transport.Endpoint}. + * Returns an {@link org.apache.harmony.rmi.internal.transport.Endpoint} identifying this + * {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * - * @return the {@link ar.org.fitc.rmi.transport.Endpoint} identifying this - * {@link ar.org.fitc.rmi.transport.Endpoint} + * @return the {@link org.apache.harmony.rmi.internal.transport.Endpoint} identifying this + * {@link org.apache.harmony.rmi.internal.transport.Endpoint} */ public final EndpointID getEndpointID() { return new EndpointID(host, port); } /** - * Test the parameter and this {@link ar.org.fitc.rmi.transport.Endpoint} for + * Test the parameter and this {@link org.apache.harmony.rmi.internal.transport.Endpoint} for * equality. * * @param obj * the object to test for equality * @return *
  • true: if and only if the parameter and - * this {@link ar.org.fitc.rmi.transport.Endpoint} instance are equal + * this {@link org.apache.harmony.rmi.internal.transport.Endpoint} instance are equal *
  • false for every other case */ @Override @@ -219,10 +219,10 @@ /** * Returns the String representation of this - * {@link ar.org.fitc.rmi.transport.Endpoint}. + * {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * * @return the String representation of this - * {@link ar.org.fitc.rmi.transport.Endpoint} + * {@link org.apache.harmony.rmi.internal.transport.Endpoint} */ @Override public final String toString() { Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/EndpointID.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/EndpointID.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/EndpointID.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.DataInput; import java.io.DataOutput; @@ -57,9 +57,9 @@ * Constructor of this class. * * @param host - * the host of the {@link ar.org.fitc.rmi.transport.Endpoint} + * the host of the {@link org.apache.harmony.rmi.internal.transport.Endpoint} * @param port - * the port of the {@link ar.org.fitc.rmi.transport.Endpoint} + * the port of the {@link org.apache.harmony.rmi.internal.transport.Endpoint} */ public EndpointID(String host, int port) { this.host = host; @@ -67,9 +67,9 @@ } /** - * Returns the host of the {@link ar.org.fitc.rmi.transport.Endpoint}. + * Returns the host of the {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * - * @return the host of the {@link ar.org.fitc.rmi.transport.Endpoint}. + * @return the host of the {@link org.apache.harmony.rmi.internal.transport.Endpoint}. */ public final String getHost() { @@ -77,9 +77,9 @@ } /** - * Returns the port of the {@link ar.org.fitc.rmi.transport.Endpoint}. + * Returns the port of the {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * - * @return the port of the {@link ar.org.fitc.rmi.transport.Endpoint}. + * @return the port of the {@link org.apache.harmony.rmi.internal.transport.Endpoint}. */ public final int getPort() { @@ -87,12 +87,12 @@ } /** - * Writes this {@link ar.org.fitc.rmi.transport.EndpointID} to the specified + * Writes this {@link org.apache.harmony.rmi.internal.transport.EndpointID} to the specified * ObjectOutputStream. * * @param out * the ObjectOutputStream where this - * {@link ar.org.fitc.rmi.transport.EndpointID} will be written. + * {@link org.apache.harmony.rmi.internal.transport.EndpointID} will be written. * @throws IOException * if the write fails */ @@ -104,13 +104,13 @@ } /** - * Reads a new {@link ar.org.fitc.rmi.transport.EndpointID} from the specified + * Reads a new {@link org.apache.harmony.rmi.internal.transport.EndpointID} from the specified * ObjectInputStream. * * @param in * the ObjectInputStream from where the - * {@link ar.org.fitc.rmi.transport.EndpointID} will be read. - * @return a new {@link ar.org.fitc.rmi.transport.EndpointID} + * {@link org.apache.harmony.rmi.internal.transport.EndpointID} will be read. + * @return a new {@link org.apache.harmony.rmi.internal.transport.EndpointID} * @throws IOException * if the write fails */ Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/FallBackType.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/FallBackType.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/FallBackType.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/MultiThreadedServer.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/MultiThreadedServer.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/MultiThreadedServer.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.net.ServerSocket; @@ -26,7 +26,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.ThreadPoolExecutor; -import ar.org.fitc.rmi.utils.Pair; +import org.apache.harmony.rmi.internal.utils.Pair; /* * NOTE: @@ -39,20 +39,20 @@ * of possibly several pooled threads. The {@link ThreadPoolExecutor} uses a * {@link BlockingQueue} to transfer and hold submitted tasks. *

    - *

  • The pool size is configured through the property ar.org.fitc.rmi.server.threadPoolCoreSize, + *
  • The pool size is configured through the property org.apache.harmony.rmi.internal.server.threadPoolCoreSize, * the default value is 10. - *
  • The maximum pool size is configured through the property ar.org.fitc.rmi.server.threadPoolMaxSize, + *
  • The maximum pool size is configured through the property org.apache.harmony.rmi.internal.server.threadPoolMaxSize, * the default value is Integer.MAX_VALUE. *
  • The keep alive time of the thread waiting in the pool is configured - * through the property ar.org.fitc.rmi.server.threadPoolKeepAliveTime , + * through the property org.apache.harmony.rmi.internal.server.threadPoolKeepAliveTime , * the default value is 60000 in milliseconds. *
  • Finally, the capacity of the queue is configured through the property - * ar.org.fitc.rmi.server.threadPoolQueueSize, the default value is + * org.apache.harmony.rmi.internal.server.threadPoolQueueSize, the default value is * 0. * *

    * This class has an internal class: - * {@link ar.org.fitc.rmi.transport.MultiThreadedServer.ServerRequestTask} + * {@link org.apache.harmony.rmi.internal.transport.MultiThreadedServer.ServerRequestTask} * * @author Marcelo Arcidiacono * @author Gustavo Petri @@ -76,16 +76,16 @@ // Integer queueCapacity; // // poolSize = PropertiesReader.readInt( -// "ar.org.fitc.rmi.server.threadPoolCoreSize", 10); +// "org.apache.harmony.rmi.internal.server.threadPoolCoreSize", 10); // // maxPoolSize = PropertiesReader.readInt( -// "ar.org.fitc.rmi.server.threadPoolMaxSize", Integer.MAX_VALUE); +// "org.apache.harmony.rmi.internal.server.threadPoolMaxSize", Integer.MAX_VALUE); // // keepAliveTime = PropertiesReader.readLong( -// "ar.org.fitc.rmi.server.threadPoolKeepAliveTime", 60000); +// "org.apache.harmony.rmi.internal.server.threadPoolKeepAliveTime", 60000); // // queueCapacity = PropertiesReader.readInt( -// "ar.org.fitc.rmi.server.threadPoolQueueSize", 0); +// "org.apache.harmony.rmi.internal.server.threadPoolQueueSize", 0); // // queue = (queueCapacity == 0) ? new SynchronousQueue() // : new ArrayBlockingQueue(queueCapacity); @@ -151,7 +151,7 @@ * @param client * the client socket * @param clientEP - * the {@link ar.org.fitc.rmi.transport.EndpointID} associated to + * the {@link org.apache.harmony.rmi.internal.transport.EndpointID} associated to * client * @throws IOException * if the connection failed Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ProtocolException.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ProtocolException.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ProtocolException.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.rmi.RemoteException; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIDefaultSocketFactory.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIDefaultSocketFactory.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIDefaultSocketFactory.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.net.InetSocketAddress; @@ -28,9 +28,9 @@ import java.util.HashMap; import java.util.Map; -import ar.org.fitc.rmi.transport.http.HttpSocketClientSide; -import ar.org.fitc.rmi.utils.Pair; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.transport.http.HttpSocketClientSide; +import org.apache.harmony.rmi.internal.utils.Pair; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /** * This is the default {@link java.rmi.server.RMISocketFactory} used by the RMI @@ -49,7 +49,7 @@ /** * Indicates the value returned by the system's property - * ar.org.fitc.rmi.transport.proxy.leaseTime.
    + * org.apache.harmony.rmi.internal.transport.proxy.leaseTime.
    * Indicates the maximum value to wait until trying again the fallback * mechanism. */ @@ -57,7 +57,7 @@ /** * Indicates the value returned by the system's property - * ar.org.fitc.rmi.transport.proxy.eagerHttpFallback.
    + * org.apache.harmony.rmi.internal.transport.proxy.eagerHttpFallback.
    * If the java.rmi.server.disableHttp is false and this * property is set to true then would try http tunneling if a * SocketException ocurrs @@ -82,7 +82,7 @@ /** * Indicates the value returned by the system's property - * ar.org.fitc.rmi.transport.proxy.connectTimeout.
    + * org.apache.harmony.rmi.internal.transport.proxy.connectTimeout.
    * Sets the maximum time (in milliseconds) that the runtime will wait for a * direct connection attempt to establish, before trying http tunneling. * It's used only if java.rmi.server.disableHttp is false and @@ -92,7 +92,7 @@ /** * Indicates the value returned by the system's property - * ar.org.fitc.rmi.transport.proxy.httpToPortOnly.
    + * org.apache.harmony.rmi.internal.transport.proxy.httpToPortOnly.
    * Setting this value to true will only try to establish a connection * through the proxy that was specified in http.proxyHost. *
    @@ -102,7 +102,7 @@ /** * Indicates the value returned by the system's property - * ar.org.fitc.rmi.transport.proxy.httpToCgiOnly.
    + * org.apache.harmony.rmi.internal.transport.proxy.httpToCgiOnly.
    * Setting this value to true will only try to establish a connection * through the proxy that was specified in http.proxyHost and * execute the cgi's script at the web server.
    @@ -123,24 +123,24 @@ */ leaseTime = PropertiesReader.readLong( - "ar.org.fitc.rmi.transport.proxy.leaseTime", 3600000L); // 1 + "org.apache.harmony.rmi.internal.transport.proxy.leaseTime", 3600000L); // 1 // hour connectTimeout = PropertiesReader.readInt( - "ar.org.fitc.rmi.transport.proxy.connectTimeout", 15000); + "org.apache.harmony.rmi.internal.transport.proxy.connectTimeout", 15000); proxyHost = PropertiesReader.readString("http.proxyHost"); proxyPort = PropertiesReader.readInt("http.proxyPort", 80); eagerHttpFallback = PropertiesReader.readBoolean( - "ar.org.fitc.rmi.transport.proxy.eagerHttpFallback", false); + "org.apache.harmony.rmi.internal.transport.proxy.eagerHttpFallback", false); proxyOnly = PropertiesReader.readBoolean( - "ar.org.fitc.rmi.transport.proxy.httpToPortOnly", false); + "org.apache.harmony.rmi.internal.transport.proxy.httpToPortOnly", false); cgiOnly = PropertiesReader.readBoolean( - "ar.org.fitc.rmi.transport.proxy.httpToCgiOnly", false); + "org.apache.harmony.rmi.internal.transport.proxy.httpToCgiOnly", false); boolean disableHttp = PropertiesReader.readBoolean( "java.rmi.server.disableHttp", false); Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIObjectInputStream.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIObjectInputStream.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIObjectInputStream.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.io.InputStream; @@ -26,9 +26,9 @@ import java.rmi.server.RemoteObjectInvocationHandler; import java.rmi.server.RemoteStub; -import ar.org.fitc.rmi.dgc.client.DGCClient; -import ar.org.fitc.rmi.utils.Pair; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.dgc.client.DGCClient; +import org.apache.harmony.rmi.internal.utils.Pair; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /** * This class is used by the RMI Runtime to serialize and deserialize Remote Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIObjectOutputStream.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIObjectOutputStream.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIObjectOutputStream.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.io.ObjectOutputStream; @@ -25,7 +25,7 @@ import java.rmi.server.RemoteObject; import java.rmi.server.RemoteObjectInvocationHandler; import java.rmi.server.RemoteStub; -import ar.org.fitc.rmi.runtime.RemoteReferenceManager; +import org.apache.harmony.rmi.internal.runtime.RemoteReferenceManager; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIServerSocket.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIServerSocket.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/RMIServerSocket.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.io.InputStream; @@ -21,8 +21,8 @@ import java.net.ServerSocket; import java.net.Socket; -import ar.org.fitc.rmi.transport.http.HttpSocketServerSide; -import ar.org.fitc.rmi.transport.jrmp.ProtocolHeader; +import org.apache.harmony.rmi.internal.transport.http.HttpSocketServerSide; +import org.apache.harmony.rmi.internal.transport.jrmp.ProtocolHeader; /** * The purpose of this class is to be aware of the socket that has to be Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ServerConnectionFactory.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ServerConnectionFactory.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/ServerConnectionFactory.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,13 +13,13 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; -import ar.org.fitc.rmi.transport.http.HttpSocketServerSide; +import org.apache.harmony.rmi.internal.transport.http.HttpSocketServerSide; /** * Factory for Server Connections. Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/SingleOpClientConnection.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/SingleOpClientConnection.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/SingleOpClientConnection.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.net.Socket; @@ -22,13 +22,13 @@ import java.rmi.server.ObjID; import java.rmi.server.UID; -import ar.org.fitc.rmi.transport.jrmp.ProtocolType; -import ar.org.fitc.rmi.transport.jrmp.ReturnMessage; +import org.apache.harmony.rmi.internal.transport.jrmp.ProtocolType; +import org.apache.harmony.rmi.internal.transport.jrmp.ReturnMessage; /** * Encapsulates the Client events occurring in the JRMP protocol, when is * encapsulated inside an HTTP call. It creates a socket for the specified - * {@link ar.org.fitc.rmi.transport.Endpoint}, it sends all + * {@link org.apache.harmony.rmi.internal.transport.Endpoint}, it sends all * the parameters in the apropriate order and it waits for the results. * * @author Gustavo Petri @@ -37,11 +37,11 @@ /** * Creates a new connection to the specified - * {@link ar.org.fitc.rmi.transport.Endpoint}. + * {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * @param sock * the {@link Socket} to be used by this Connection * @param ep - * the {@link ar.org.fitc.rmi.transport.Endpoint} to connect + * the {@link org.apache.harmony.rmi.internal.transport.Endpoint} to connect * @throws ConnectIOException * if an IOException occurs while making a connection to the * remote host Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/SingleOpServerConnection.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/SingleOpServerConnection.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/SingleOpServerConnection.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.io.InputStream; @@ -21,9 +21,9 @@ import java.net.Socket; import java.rmi.RemoteException; -import ar.org.fitc.rmi.transport.jrmp.Message; -import ar.org.fitc.rmi.transport.jrmp.MessageType; -import ar.org.fitc.rmi.transport.jrmp.ProtocolType; +import org.apache.harmony.rmi.internal.transport.jrmp.Message; +import org.apache.harmony.rmi.internal.transport.jrmp.MessageType; +import org.apache.harmony.rmi.internal.transport.jrmp.ProtocolType; /* * NOTE: @@ -40,14 +40,14 @@ /** * Creates a new connection to the specified - * {@link ar.org.fitc.rmi.transport.EndpointID} + * {@link org.apache.harmony.rmi.internal.transport.EndpointID} * * @param in * the specified {@link InputStream} * @param out * the specified {@link OutputStream} * @param clientEP - * the specified {@link ar.org.fitc.rmi.transport.EndpointID} + * the specified {@link org.apache.harmony.rmi.internal.transport.EndpointID} * @param sock * the socket of connection */ Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/StreamClientConnection.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/StreamClientConnection.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/StreamClientConnection.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.net.Socket; @@ -22,12 +22,12 @@ import java.rmi.server.ObjID; import java.rmi.server.UID; -import ar.org.fitc.rmi.transport.jrmp.ProtocolType; -import ar.org.fitc.rmi.transport.jrmp.ReturnMessage; +import org.apache.harmony.rmi.internal.transport.jrmp.ProtocolType; +import org.apache.harmony.rmi.internal.transport.jrmp.ReturnMessage; /** * Encapsulates the Client events occurring in the JRMP protocol. It creates a - * socket for the specified {@link ar.org.fitc.rmi.transport.Endpoint}, it + * socket for the specified {@link org.apache.harmony.rmi.internal.transport.Endpoint}, it * sends all the parameters in the apropriate order and it waits for the * results. * @@ -37,10 +37,10 @@ /** * Creates a new connection to the specified - * {@link ar.org.fitc.rmi.transport.Endpoint}. + * {@link org.apache.harmony.rmi.internal.transport.Endpoint}. * * @param ep - * the {@link ar.org.fitc.rmi.transport.Endpoint} to connect + * the {@link org.apache.harmony.rmi.internal.transport.Endpoint} to connect * @param sock * the {@link java.net.Socket} to connect * @throws ConnectIOException Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/StreamServerConnection.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/StreamServerConnection.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/StreamServerConnection.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.io.InputStream; @@ -21,9 +21,9 @@ import java.net.Socket; import java.rmi.RemoteException; -import ar.org.fitc.rmi.transport.jrmp.Message; -import ar.org.fitc.rmi.transport.jrmp.MessageType; -import ar.org.fitc.rmi.transport.jrmp.ProtocolType; +import org.apache.harmony.rmi.internal.transport.jrmp.Message; +import org.apache.harmony.rmi.internal.transport.jrmp.MessageType; +import org.apache.harmony.rmi.internal.transport.jrmp.ProtocolType; /** * Encapsulates the Server events occurring in the JRMP protocol. @@ -34,7 +34,7 @@ /** * Creates a new connection to the specified - * {@link ar.org.fitc.rmi.transport.EndpointID} + * {@link org.apache.harmony.rmi.internal.transport.EndpointID} * * @param in * the specified @@ -43,7 +43,7 @@ * the specified * {@link OutputStream} * @param clientEP - * the specified {@link ar.org.fitc.rmi.transport.EndpointID} + * the specified {@link org.apache.harmony.rmi.internal.transport.EndpointID} * @param sock * the socket of connection */ Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/TransportManager.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/TransportManager.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/TransportManager.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport; +package org.apache.harmony.rmi.internal.transport; import java.io.IOException; import java.rmi.server.ExportException; @@ -27,8 +27,8 @@ import java.util.Map; import java.util.Set; -import ar.org.fitc.rmi.utils.Pair; -import ar.org.fitc.rmi.utils.ReversibleHashSet; +import org.apache.harmony.rmi.internal.utils.Pair; +import org.apache.harmony.rmi.internal.utils.ReversibleHashSet; /* * NOTE: @@ -56,21 +56,21 @@ private static TransportManager transportManager; /** - * A {@link ar.org.fitc.rmi.utils.ReversibleHashSet} for storing the port + * A {@link org.apache.harmony.rmi.internal.utils.ReversibleHashSet} for storing the port * and the corresponding {@link java.rmi.server.ObjID}. */ private ReversibleHashSet portObjIDMap; /** * Serves as a cache for - * {@link ar.org.fitc.rmi.transport.MultiThreadedServer} and its - * {@link ar.org.fitc.rmi.transport.Endpoint}, indexed by port. + * {@link org.apache.harmony.rmi.internal.transport.MultiThreadedServer} and its + * {@link org.apache.harmony.rmi.internal.transport.Endpoint}, indexed by port. */ private HashMap> serverMap; /** * Indexes the ClientHost and - * {@link ar.org.fitc.rmi.transport.StreamClientConnection} by Thread (hashcode). + * {@link org.apache.harmony.rmi.internal.transport.StreamClientConnection} by Thread (hashcode). */ private Map> clientConnectionMap; @@ -168,7 +168,7 @@ * the specified {@link java.rmi.server.RMIServerSocketFactory} * @param csf * the specified {@link java.rmi.server.RMIClientSocketFactory} - * @return the {@link ar.org.fitc.rmi.transport.Endpoint} of the connection + * @return the {@link org.apache.harmony.rmi.internal.transport.Endpoint} of the connection * @throws ExportException * if the exportation fails */ @@ -247,7 +247,7 @@ * @param objID * the specified {@link java.rmi.server.ObjID} * @param ep - * the {@link ar.org.fitc.rmi.transport.Endpoint} of the + * the {@link org.apache.harmony.rmi.internal.transport.Endpoint} of the * connection * @param args * the arguments of the invocation Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpClientInputStream.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpClientInputStream.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpClientInputStream.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.http; +package org.apache.harmony.rmi.internal.transport.http; import java.io.IOException; import java.io.InputStream; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpClientOutputStream.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpClientOutputStream.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpClientOutputStream.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.http; +package org.apache.harmony.rmi.internal.transport.http; import java.io.OutputStream; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpHeaders.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpHeaders.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpHeaders.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.http; +package org.apache.harmony.rmi.internal.transport.http; import java.util.HashSet; import java.util.Set; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpInputStream.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpInputStream.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpInputStream.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.http; +package org.apache.harmony.rmi.internal.transport.http; import java.io.ByteArrayInputStream; import java.io.IOException; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpOutputStream.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpOutputStream.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpOutputStream.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.http; +package org.apache.harmony.rmi.internal.transport.http; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; @@ -21,7 +21,7 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import ar.org.fitc.rmi.utils.PropertiesReader; +import org.apache.harmony.rmi.internal.utils.PropertiesReader; /** * This class is used for client and server purposes. Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpServerInputStream.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpServerInputStream.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpServerInputStream.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.http; +package org.apache.harmony.rmi.internal.transport.http; import java.io.IOException; import java.io.InputStream; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpServerOutputStream.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpServerOutputStream.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpServerOutputStream.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.http; +package org.apache.harmony.rmi.internal.transport.http; import java.io.OutputStream; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpSocketClientSide.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpSocketClientSide.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpSocketClientSide.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.http; +package org.apache.harmony.rmi.internal.transport.http; import java.io.IOException; import java.io.InputStream; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpSocketServerSide.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpSocketServerSide.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/http/HttpSocketServerSide.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.http; +package org.apache.harmony.rmi.internal.transport.http; import java.io.IOException; import java.io.InputStream; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ClientProtocolHandler.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ClientProtocolHandler.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ClientProtocolHandler.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -23,8 +23,8 @@ import java.rmi.server.ObjID; import java.rmi.server.UID; -import ar.org.fitc.rmi.transport.EndpointID; -import ar.org.fitc.rmi.transport.ProtocolException; +import org.apache.harmony.rmi.internal.transport.EndpointID; +import org.apache.harmony.rmi.internal.transport.ProtocolException; /** * Implements the management Client view of the messages of the JRMP protocol. @@ -53,10 +53,10 @@ * * @param in * the - * {@link ar.org.fitc.rmi.transport.RMIObjectInputStream RMIObjectInputStream} + * {@link org.apache.harmony.rmi.internal.transport.RMIObjectInputStream RMIObjectInputStream} * @param out * the - * {@link ar.org.fitc.rmi.transport.RMIObjectOutputStream RMIObjectOutputStream} + * {@link org.apache.harmony.rmi.internal.transport.RMIObjectOutputStream RMIObjectOutputStream} */ public ClientProtocolHandler(DataInputStream in, DataOutputStream out) { this.out = out; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/Header.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/Header.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/Header.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,13 +13,13 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import ar.org.fitc.rmi.transport.ProtocolException; +import org.apache.harmony.rmi.internal.transport.ProtocolException; /** * A class representing the Header of the JRMI protocol. @@ -39,7 +39,7 @@ static final byte[] JRMI_PROTOCOL_VERSION = new byte[] { 0x00, 0x01 }; /** - * A {@link ar.org.fitc.rmi.transport.jrmp.ProtocolType} object that + * A {@link org.apache.harmony.rmi.internal.transport.jrmp.ProtocolType} object that * indicates the header type */ private ProtocolType type; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/HeaderResponse.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/HeaderResponse.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/HeaderResponse.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,9 +13,9 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; -import ar.org.fitc.rmi.transport.ProtocolException; +import org.apache.harmony.rmi.internal.transport.ProtocolException; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/Message.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/Message.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/Message.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -24,10 +24,10 @@ import java.rmi.server.ObjID; import java.rmi.server.UID; -import ar.org.fitc.rmi.runtime.RemoteReferenceManager; -import ar.org.fitc.rmi.transport.ProtocolException; -import ar.org.fitc.rmi.transport.RMIObjectInputStream; -import ar.org.fitc.rmi.transport.RMIObjectOutputStream; +import org.apache.harmony.rmi.internal.runtime.RemoteReferenceManager; +import org.apache.harmony.rmi.internal.transport.ProtocolException; +import org.apache.harmony.rmi.internal.transport.RMIObjectInputStream; +import org.apache.harmony.rmi.internal.transport.RMIObjectOutputStream; /** * Encapsulates all the messages that a RMI Client can send. It is a Tagged Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/MessageResponse.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/MessageResponse.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/MessageResponse.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/MessageType.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/MessageType.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/MessageType.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,9 +13,9 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; -import ar.org.fitc.rmi.transport.ProtocolException; +import org.apache.harmony.rmi.internal.transport.ProtocolException; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ProtocolHeader.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ProtocolHeader.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ProtocolHeader.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,11 +13,11 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; import java.util.Arrays; -import ar.org.fitc.rmi.transport.ProtocolException; +import org.apache.harmony.rmi.internal.transport.ProtocolException; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ProtocolType.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ProtocolType.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ProtocolType.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ReturnMessage.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ReturnMessage.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ReturnMessage.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,16 +13,16 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.rmi.server.UID; -import ar.org.fitc.rmi.transport.RMIObjectInputStream; -import ar.org.fitc.rmi.transport.RMIObjectOutputStream; -import ar.org.fitc.rmi.utils.Pair; +import org.apache.harmony.rmi.internal.transport.RMIObjectInputStream; +import org.apache.harmony.rmi.internal.transport.RMIObjectOutputStream; +import org.apache.harmony.rmi.internal.utils.Pair; /** * A tagged union type which represents a message returned from the RMI Server Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ReturnType.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ReturnType.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ReturnType.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,9 +13,9 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; -import ar.org.fitc.rmi.transport.ProtocolException; +import org.apache.harmony.rmi.internal.transport.ProtocolException; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ServerProtocolHandler.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ServerProtocolHandler.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/transport/jrmp/ServerProtocolHandler.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,15 +13,15 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.transport.jrmp; +package org.apache.harmony.rmi.internal.transport.jrmp; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.rmi.UnmarshalException; -import ar.org.fitc.rmi.transport.EndpointID; -import ar.org.fitc.rmi.transport.ProtocolException; +import org.apache.harmony.rmi.internal.transport.EndpointID; +import org.apache.harmony.rmi.internal.transport.ProtocolException; /** * Implements the Server side management of the messages of the JRMP protocol. @@ -54,9 +54,9 @@ * Constructs a new {@link ServerProtocolHandler} * * @param in - * the {@link ar.org.fitc.rmi.transport.RMIObjectInputStream} + * the {@link org.apache.harmony.rmi.internal.transport.RMIObjectInputStream} * @param out - * the {@link ar.org.fitc.rmi.transport.RMIObjectInputStream} + * the {@link org.apache.harmony.rmi.internal.transport.RMIObjectInputStream} * @param clientEP * the client {@link EndpointID} */ @@ -94,7 +94,7 @@ /** * Reads the default client's Endpoint used to accept calls. * - * @return an {@link ar.org.fitc.rmi.transport.EndpointID} + * @return an {@link org.apache.harmony.rmi.internal.transport.EndpointID} */ public final EndpointID readEndpointNegotiation() { EndpointID defaultEP = null; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/MethodHashGenerator.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/MethodHashGenerator.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/MethodHashGenerator.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.utils; +package org.apache.harmony.rmi.internal.utils; import java.io.ByteArrayOutputStream; import java.io.DataOutput; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/Pair.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/Pair.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/Pair.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.utils; +package org.apache.harmony.rmi.internal.utils; /** * This class implements a generic pair. Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/PrintStreamHandler.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/PrintStreamHandler.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/PrintStreamHandler.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.utils; +package org.apache.harmony.rmi.internal.utils; import java.io.PrintStream; import java.util.logging.LogRecord; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/PropertiesReader.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/PropertiesReader.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/PropertiesReader.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.utils; +package org.apache.harmony.rmi.internal.utils; /* * NOTE: Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/RemoteUtils.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/RemoteUtils.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/RemoteUtils.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.utils; +package org.apache.harmony.rmi.internal.utils; import java.lang.reflect.Method; import java.util.Collections; Index: modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/ReversibleHashSet.java =================================================================== --- modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/ReversibleHashSet.java.orig 2006-05-17 14:56:57.000000000 +0100 +++ modules/rmi/src/main/java/org/apache/harmony/rmi/internal/utils/ReversibleHashSet.java 2006-05-17 14:59:19.000000000 +0100 @@ -13,7 +13,7 @@ *  See the License for the specific language governing permissions and *  limitations under the License. */ -package ar.org.fitc.rmi.utils; +package org.apache.harmony.rmi.internal.utils; import java.util.HashMap; import java.util.HashSet;