hammant 2003/01/06 15:41:53 Modified: altrmi build.xml default.properties altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription AbstractSubscriber.java altrmi/src/java/org/apache/excalibur/altrmi/client/impl AbstractAltrmiFactory.java AbstractClientInvocationHandler.java AbstractFactoryHelper.java DefaultProxyHelper.java DynamicInvoker.java DynamicStub.java altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/stream CallbackEnabledClientCustomStreamReadWriter.java altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi RmiFactoryHelper.java altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket SocketCustomStreamFactoryHelper.java SocketObjectStreamFactoryHelper.java altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber AbstractAltrmiInterfaceLookupFactory.java altrmi/src/java/org/apache/excalibur/altrmi/common Authentication.java AuthenticationException.java BadConnectionException.java CallbackException.java ClassReply.java ClassRequest.java ClassRetrievalFailedReply.java ConnectionException.java ConnectionRefusedException.java EndConnectionReply.java ExceptionReply.java ExposedObjectProxy.java FacadeRefHolder.java GarbageCollectionReply.java GarbageCollectionRequest.java InvocationException.java KeyAuthentication.java ListMethodsReply.java ListMethodsRequest.java ListReply.java ListRequest.java LookupReply.java LookupRequest.java MethodAsyncRequest.java MethodFacadeArrayReply.java MethodFacadeReply.java MethodFacadeRequest.java MethodReply.java MethodRequest.java NoSuchReferenceException.java NoSuchReferenceReply.java NoSuchSessionException.java NotPublishedException.java NotPublishedReply.java OpenConnectionReply.java OpenConnectionRequest.java PingReply.java PingRequest.java ProxyGenerationException.java Log: Serialization IDs set. Some more altrmi prefix renames. Revision Changes Path 1.63 +7 -5 jakarta-avalon-excalibur/altrmi/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- build.xml 5 Jan 2003 23:11:25 -0000 1.62 +++ build.xml 6 Jan 2003 23:41:48 -0000 1.63 @@ -23,17 +23,19 @@ <pathelement location="${checkstyle.jar}"/> <pathelement location="${jakarta-commons-attributes.jar}"/> <pathelement location="${jakarta-commons-httpclient.jar}"/> - <pathelement location="${jakarta-commons-logging.jar}"/> - <pathelement location="${qdox.jar}"/> + <pathelement location="${jakarta-commons-logging.jar}"/> <pathelement location="${jakarta-bcel.jar}"/> <pathelement path="${java.class.path}"/> <pathelement path="${cornerstone-api.jar}"/> - <pathelement path="${phoenix-client.jar}"/> - <pathelement path="${phoenix-metagenerate.jar}"/> + <pathelement path="${phoenix-client.jar}"/> <pathelement path="${jsch.jar}"/> <pathelement path="${excalibur-container.jar}"/> <pathelement path="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/lib/javax.servlet.jar"/> <pathelement path="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/lib/org.mortbay.jetty.jar"/> + + <pathelement location="${qdox.jar}"/> + <pathelement path="${phoenix-metagenerate.jar}"/> + <pathelement location="${serialver.jar}"/> </path> <path id="tools.class.path"> @@ -589,5 +591,5 @@ <unzip src="jetty-download/Jetty-${jetty.rel}.zip" dest="jetty-download/Jetty-${jetty.rel}" /> </target> - + </project> 1.20 +2 -2 jakarta-avalon-excalibur/altrmi/default.properties Index: default.properties =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/default.properties,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- default.properties 5 Jan 2003 23:11:25 -0000 1.19 +++ default.properties 6 Jan 2003 23:41:49 -0000 1.20 @@ -29,15 +29,15 @@ avalon-framework.lib=${avalon-framework.home}/target/lib avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar jakarta-bcel.jar=./lib/bcel.jar -qdox.jar=./lib/qdox-1.0.jar cornerstone-api.jar=./lib/cornerstone-api.jar phoenix-client.jar=./lib/phoenix-client.jar -phoenix-metagenerate.jar=./lib/phoenix-metagenerate.jar jsch.jar=./lib/jsch-0-0-9.jar jakarta-commons-attributes.jar=./lib/commons-attributes-0.1.jar jakarta-commons-httpclient.jar=./lib/commons-httpclient.jar jakarta-commons-logging.jar=./lib/commons-logging.jar excalibur-container.jar=./lib/excalibur-container-1.0.jar +phoenix-metagenerate.jar=./lib/buildtime/phoenix-metagenerate.jar +qdox.jar=./lib/buildtime/qdox-1.0.jar # ----- Excalibur pool, version 1.1 or later ----- excalibur-pool.home=${basedir}/../pool/dist 1.4 +3 -3 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/AbstractSubscriber.java Index: AbstractSubscriber.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/AbstractSubscriber.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AbstractSubscriber.java 5 Jan 2003 23:24:08 -0000 1.3 +++ AbstractSubscriber.java 6 Jan 2003 23:41:49 -0000 1.4 @@ -12,7 +12,7 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.logger.AbstractLogEnabled; -import org.apache.excalibur.altrmi.client.AltrmiFactory; +import org.apache.excalibur.altrmi.client.Factory; import org.apache.excalibur.altrmi.client.HostContext; import org.apache.excalibur.altrmi.client.InterfaceLookup; import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory; @@ -30,7 +30,7 @@ extends AbstractLogEnabled implements InterfaceLookup, Configurable, Initializable { - protected AltrmiFactory m_altrmiFactory; + protected Factory m_altrmiFactory; protected HostContext m_hostContext; /** 1.17 +9 -9 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractAltrmiFactory.java Index: AbstractAltrmiFactory.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractAltrmiFactory.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- AbstractAltrmiFactory.java 5 Jan 2003 23:24:08 -0000 1.16 +++ AbstractAltrmiFactory.java 6 Jan 2003 23:41:49 -0000 1.17 @@ -13,9 +13,9 @@ import java.rmi.server.UID; -import org.apache.excalibur.altrmi.client.AltrmiFactory; +import org.apache.excalibur.altrmi.client.Factory; import org.apache.excalibur.altrmi.client.HostContext; -import org.apache.excalibur.altrmi.client.AltrmiProxy; +import org.apache.excalibur.altrmi.client.Proxy; import org.apache.excalibur.altrmi.client.ClientInvocationHandler; import org.apache.excalibur.altrmi.common.OpenConnectionRequest; import org.apache.excalibur.altrmi.common.SameVMReply; @@ -41,7 +41,7 @@ * @author Peter Royal <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> * @version $Revision$ */ -public abstract class AbstractAltrmiFactory implements AltrmiFactory +public abstract class AbstractAltrmiFactory implements Factory { private static final UID U_ID = new UID((short)20729); @@ -270,7 +270,7 @@ * @return * */ - public final Long getReferenceID( AltrmiProxy obj ) + public final Long getReferenceID( Proxy obj ) { return obj.altrmiGetReferenceID( this ); } @@ -364,7 +364,7 @@ * @param objectName * @return */ - private FacadeRefHolder makeFacadeRefHolder( AltrmiProxy obj, String objectName ) + private FacadeRefHolder makeFacadeRefHolder( Proxy obj, String objectName ) { Long refID = getReferenceID( obj ); @@ -383,10 +383,10 @@ Class argClass = argClasses[ i ]; if(argClass==null) continue; - //All remote references implement AltrmiProxy interface - if(args[i] instanceof AltrmiProxy) + //All remote references implement Proxy interface + if(args[i] instanceof Proxy) { - AltrmiProxy proxy = (AltrmiProxy)args[i]; + Proxy proxy = (Proxy)args[i]; if( getReferenceID( proxy ) != null ) { 1.10 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractClientInvocationHandler.java Index: AbstractClientInvocationHandler.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractClientInvocationHandler.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- AbstractClientInvocationHandler.java 5 Jan 2003 23:24:08 -0000 1.9 +++ AbstractClientInvocationHandler.java 6 Jan 2003 23:41:49 -0000 1.10 @@ -12,7 +12,7 @@ import org.apache.excalibur.altrmi.client.ClientInvocationHandler; import org.apache.excalibur.altrmi.client.ConnectionListener; import org.apache.excalibur.altrmi.client.ConnectionPinger; -import org.apache.excalibur.altrmi.client.AltrmiProxy; +import org.apache.excalibur.altrmi.client.Proxy; import org.apache.excalibur.altrmi.client.ConnectionClosedException; import org.apache.excalibur.altrmi.common.InvocationHandler; import org.apache.excalibur.altrmi.common.Reply; 1.7 +3 -3 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractFactoryHelper.java Index: AbstractFactoryHelper.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractFactoryHelper.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- AbstractFactoryHelper.java 5 Jan 2003 23:24:08 -0000 1.6 +++ AbstractFactoryHelper.java 6 Jan 2003 23:41:50 -0000 1.7 @@ -9,7 +9,7 @@ import java.util.StringTokenizer; import java.util.Vector; -import org.apache.excalibur.altrmi.client.AltrmiFactory; +import org.apache.excalibur.altrmi.client.Factory; import org.apache.excalibur.altrmi.client.InterfaceLookup; import org.apache.excalibur.altrmi.client.InterfaceLookupFactory; import org.apache.excalibur.altrmi.common.ConnectionException; @@ -42,7 +42,7 @@ return retval; } - protected AltrmiFactory createAltrmiFactory( String type, boolean beanOnly ) + protected Factory createAltrmiFactory( String type, boolean beanOnly ) { if( type.equalsIgnoreCase( "s" ) ) 1.19 +3 -3 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultProxyHelper.java Index: DefaultProxyHelper.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultProxyHelper.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- DefaultProxyHelper.java 5 Jan 2003 23:24:08 -0000 1.18 +++ DefaultProxyHelper.java 6 Jan 2003 23:41:50 -0000 1.19 @@ -8,7 +8,7 @@ package org.apache.excalibur.altrmi.client.impl; import org.apache.excalibur.altrmi.client.ClientInvocationHandler; -import org.apache.excalibur.altrmi.client.AltrmiProxy; +import org.apache.excalibur.altrmi.client.Proxy; import org.apache.excalibur.altrmi.client.ProxyHelper; import org.apache.excalibur.altrmi.common.InvocationException; import org.apache.excalibur.altrmi.common.Reply; @@ -320,7 +320,7 @@ for( int i = 0; i < args.length; i++ ) { - if( args[ i ] instanceof AltrmiProxy ) + if( args[ i ] instanceof Proxy ) { //TODO somehow get the reference details and put a redirect place holder here 1.6 +1 -1 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DynamicInvoker.java Index: DynamicInvoker.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DynamicInvoker.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DynamicInvoker.java 5 Jan 2003 23:24:08 -0000 1.5 +++ DynamicInvoker.java 6 Jan 2003 23:41:50 -0000 1.6 @@ -96,7 +96,7 @@ { //------Variables------------// - /** AltrmiFactory*/ + /** Factory*/ private DynamicClassAltrmiFactory m_factory = new DynamicClassAltrmiFactory(false); /** HostContext*/ 1.4 +5 -5 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DynamicStub.java Index: DynamicStub.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DynamicStub.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DynamicStub.java 5 Jan 2003 23:24:08 -0000 1.3 +++ DynamicStub.java 6 Jan 2003 23:41:50 -0000 1.4 @@ -56,14 +56,14 @@ */ package org.apache.excalibur.altrmi.client.impl; -import org.apache.excalibur.altrmi.client.AltrmiProxy; +import org.apache.excalibur.altrmi.client.Proxy; /** - * Implementation of AltrmiProxy(client stub) for dynamic invocation. + * Implementation of Proxy(client stub) for dynamic invocation. * * @author <a href="mailto:[EMAIL PROTECTED]">Vinay Chandran</a> */ -public class DynamicStub implements AltrmiProxy +public class DynamicStub implements Proxy { //-------Variables-----------// /** Name of the published obj for which this is a stub*/ @@ -87,9 +87,9 @@ m_proxyHelper = proxyHelper; } - //------AltrmiProxy override---------------------// + //------Proxy override---------------------// /** - * @see org.apache.excalibur.altrmi.client.AltrmiProxy#altrmiGetReferenceID(Object) + * @see org.apache.excalibur.altrmi.client.Proxy#altrmiGetReferenceID(Object) */ public Long altrmiGetReferenceID(Object factoryThatIsAsking) { 1.10 +7 -7 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/stream/CallbackEnabledClientCustomStreamReadWriter.java Index: CallbackEnabledClientCustomStreamReadWriter.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/stream/CallbackEnabledClientCustomStreamReadWriter.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- CallbackEnabledClientCustomStreamReadWriter.java 5 Jan 2003 23:24:09 -0000 1.9 +++ CallbackEnabledClientCustomStreamReadWriter.java 6 Jan 2003 23:41:50 -0000 1.10 @@ -21,14 +21,14 @@ import org.apache.excalibur.altrmi.common.Request; import org.apache.excalibur.altrmi.common.SerializationHelper; import org.apache.excalibur.altrmi.common.ConnectionException; -import org.apache.excalibur.altrmi.server.AltrmiServer; +import org.apache.excalibur.altrmi.server.Server; import org.apache.excalibur.altrmi.server.PublicationException; import org.apache.excalibur.altrmi.server.impl.classretrievers.PlainClassRetriever; import org.apache.excalibur.altrmi.server.impl.direct.DirectServer; /** * Class CallbackEnabledClientCustomStreamReadWriter - * This class embedds within itself a AltrmiServer which holds the + * This class embedds within itself a Server which holds the * exposedObjects for the client and upon which the Server can make * callbacks. * @@ -47,7 +47,7 @@ private DataOutputStream m_dataOutputStream; private ClassLoader m_interfacesClassLoader; private HashMap m_exposedObjPublishNameHash_ = new HashMap(); - private AltrmiServer m_clientServerHostingExposedObjects = new DirectServer(); + private Server m_clientServerHostingExposedObjects = new DirectServer(); private static int m_random = 0; /** @@ -70,7 +70,7 @@ //This thread recv's all the messages sent from the server m_messageLoopThread = new Thread( this,"CallbackEnabledClientStream Thread" ); m_messageLoopThread.start(); - //start the internal AltrmiServer which holds the exposed Objects + //start the internal Server which holds the exposed Objects // for the server to make callbacks upon. try { @@ -79,7 +79,7 @@ } catch( Exception e ) { - throw new ConnectionException( "Error Starting Internal AltrmiServer" ); + throw new ConnectionException( "Error Starting Internal Server" ); } } @@ -229,7 +229,7 @@ /** * Method exposeObject. - * Expose the Object by adding it to the internal AltrmiServer + * Expose the Object by adding it to the internal Server * and by assigning a unique PublishedName for the same. * @param tobeExposedObject * @param tobeExposedInterface 1.7 +3 -3 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiFactoryHelper.java Index: RmiFactoryHelper.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiFactoryHelper.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- RmiFactoryHelper.java 5 Jan 2003 23:24:23 -0000 1.6 +++ RmiFactoryHelper.java 6 Jan 2003 23:41:50 -0000 1.7 @@ -8,7 +8,7 @@ package org.apache.excalibur.altrmi.client.impl.rmi; import java.io.IOException; -import org.apache.excalibur.altrmi.client.AltrmiFactory; +import org.apache.excalibur.altrmi.client.Factory; import org.apache.excalibur.altrmi.client.HostContext; import org.apache.excalibur.altrmi.client.InterfaceLookup; import org.apache.excalibur.altrmi.client.impl.AbstractFactoryHelper; @@ -45,7 +45,7 @@ // TODO maybe we should cache these. Or the abstract parent class should. String[] terms = processFactoryString( factoryString ); HostContext hc = new RmiHostContext( terms[ 1 ], Integer.parseInt( terms[ 2 ] ) ); - AltrmiFactory af = createAltrmiFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase( "bo" ) ); + Factory af = createAltrmiFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase( "bo" ) ); af.setHostContext( hc ); 1.9 +3 -3 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamFactoryHelper.java Index: SocketCustomStreamFactoryHelper.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamFactoryHelper.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- SocketCustomStreamFactoryHelper.java 5 Jan 2003 23:24:23 -0000 1.8 +++ SocketCustomStreamFactoryHelper.java 6 Jan 2003 23:41:50 -0000 1.9 @@ -7,7 +7,7 @@ */ package org.apache.excalibur.altrmi.client.impl.socket; -import org.apache.excalibur.altrmi.client.AltrmiFactory; +import org.apache.excalibur.altrmi.client.Factory; import org.apache.excalibur.altrmi.client.HostContext; import org.apache.excalibur.altrmi.client.InterfaceLookup; import org.apache.excalibur.altrmi.client.impl.AbstractFactoryHelper; @@ -46,7 +46,7 @@ HostContext hc = new SocketCustomStreamHostContext( terms[ 1 ], Integer.parseInt( terms[ 2 ] ), interfacesClassLoader ); - AltrmiFactory af = createAltrmiFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase( "bo" ) ); + Factory af = createAltrmiFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase( "bo" ) ); af.setHostContext( hc, optimize ); return af; 1.8 +3 -3 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamFactoryHelper.java Index: SocketObjectStreamFactoryHelper.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamFactoryHelper.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- SocketObjectStreamFactoryHelper.java 5 Jan 2003 23:24:23 -0000 1.7 +++ SocketObjectStreamFactoryHelper.java 6 Jan 2003 23:41:50 -0000 1.8 @@ -7,7 +7,7 @@ */ package org.apache.excalibur.altrmi.client.impl.socket; -import org.apache.excalibur.altrmi.client.AltrmiFactory; +import org.apache.excalibur.altrmi.client.Factory; import org.apache.excalibur.altrmi.client.HostContext; import org.apache.excalibur.altrmi.client.InterfaceLookup; import org.apache.excalibur.altrmi.client.impl.AbstractFactoryHelper; @@ -46,7 +46,7 @@ HostContext hc = new SocketObjectStreamHostContext( terms[ 1 ], Integer.parseInt( terms[ 2 ] ), interfacesClassLoader ); - AltrmiFactory af = createAltrmiFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase( "bo" ) ); + Factory af = createAltrmiFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase( "bo" ) ); af.setHostContext( hc, optimize ); return af; 1.4 +3 -3 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/AbstractAltrmiInterfaceLookupFactory.java Index: AbstractAltrmiInterfaceLookupFactory.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/AbstractAltrmiInterfaceLookupFactory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AbstractAltrmiInterfaceLookupFactory.java 5 Jan 2003 23:24:25 -0000 1.3 +++ AbstractAltrmiInterfaceLookupFactory.java 6 Jan 2003 23:41:51 -0000 1.4 @@ -14,7 +14,7 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.logger.AbstractLogEnabled; -import org.apache.excalibur.altrmi.client.AltrmiFactory; +import org.apache.excalibur.altrmi.client.Factory; import org.apache.excalibur.altrmi.client.HostContext; import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory; import org.apache.excalibur.altrmi.client.impl.PerpetualConnectionPinger; @@ -53,7 +53,7 @@ } } - private AltrmiFactory createFactory() + private Factory createFactory() { if( this.m_isServer ) { @@ -67,7 +67,7 @@ public Object newInstance() throws Exception { - final AltrmiFactory factory = createFactory(); + final Factory factory = createFactory(); final HostContext context = createHostContext(); context.getClientInvocationHandler().setConnectionPinger( new PerpetualConnectionPinger() ); 1.2 +2 -1 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/Authentication.java Index: Authentication.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/Authentication.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Authentication.java 5 Jan 2003 23:24:54 -0000 1.1 +++ Authentication.java 6 Jan 2003 23:41:51 -0000 1.2 @@ -18,4 +18,5 @@ */ public abstract class Authentication implements Externalizable { + static final long serialVersionUID = -4093932349132141782L; } 1.2 +3 -1 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/AuthenticationException.java Index: AuthenticationException.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/AuthenticationException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AuthenticationException.java 5 Jan 2003 23:24:54 -0000 1.1 +++ AuthenticationException.java 6 Jan 2003 23:41:51 -0000 1.2 @@ -17,6 +17,8 @@ public class AuthenticationException extends ConnectionException { + static final long serialVersionUID = 355399012496642358L; + /** * Constructor AuthenticationException * 1.3 +3 -1 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/BadConnectionException.java Index: BadConnectionException.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/BadConnectionException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BadConnectionException.java 5 Jan 2003 23:24:25 -0000 1.2 +++ BadConnectionException.java 6 Jan 2003 23:41:51 -0000 1.3 @@ -17,6 +17,8 @@ public class BadConnectionException extends ConnectionException { + static final long serialVersionUID = 4846126242567107752L; + /** * Constructor BadConnectionException * 1.2 +3 -1 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/CallbackException.java Index: CallbackException.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/CallbackException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CallbackException.java 5 Jan 2003 23:24:54 -0000 1.1 +++ CallbackException.java 6 Jan 2003 23:41:51 -0000 1.2 @@ -18,6 +18,8 @@ public class CallbackException extends Exception { + static final long serialVersionUID = -6179989997797491904L; + /** * Constructor CallbackException * 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassReply.java Index: ClassReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassReply.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ClassReply.java 5 Jan 2003 23:24:25 -0000 1.5 +++ ClassReply.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public final class ClassReply extends Reply { - static final long serialVersionUID = -2122973452303573425L; + static final long serialVersionUID = -3512420149032910635L; private byte[] m_beanClassBytes; private byte[] m_interfaceImplClassBytes; 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassRequest.java Index: ClassRequest.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassRequest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ClassRequest.java 5 Jan 2003 23:24:25 -0000 1.5 +++ ClassRequest.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -16,7 +16,7 @@ */ public final class ClassRequest extends PublishedNameRequest { - static final long serialVersionUID = -306896490240890699L; + static final long serialVersionUID = -6035363236398357203L; /** * Constructor ClassRequest 1.8 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassRetrievalFailedReply.java Index: ClassRetrievalFailedReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassRetrievalFailedReply.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ClassRetrievalFailedReply.java 5 Jan 2003 23:24:25 -0000 1.7 +++ ClassRetrievalFailedReply.java 6 Jan 2003 23:41:51 -0000 1.8 @@ -20,7 +20,7 @@ */ public final class ClassRetrievalFailedReply extends Reply { - static final long serialVersionUID = -9005409182642544362L; + static final long serialVersionUID = -8931777755294495428L; private String m_reason; 1.2 +3 -1 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ConnectionException.java Index: ConnectionException.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ConnectionException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ConnectionException.java 5 Jan 2003 23:24:54 -0000 1.1 +++ ConnectionException.java 6 Jan 2003 23:41:51 -0000 1.2 @@ -17,6 +17,8 @@ public class ConnectionException extends Exception { + static final long serialVersionUID = -2991328464962422036L; + // For the time being, this is backwards compatible with 1.3. It could // just as easily use the 1.4 constructors for Exception. private Throwable m_throwableCause; 1.3 +3 -1 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ConnectionRefusedException.java Index: ConnectionRefusedException.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ConnectionRefusedException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ConnectionRefusedException.java 5 Jan 2003 23:24:25 -0000 1.2 +++ ConnectionRefusedException.java 6 Jan 2003 23:41:51 -0000 1.3 @@ -17,6 +17,8 @@ public class ConnectionRefusedException extends ConnectionException { + static final long serialVersionUID = 3196545824903033003L; + /** * Constructor ConnectionRefusedException * 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/EndConnectionReply.java Index: EndConnectionReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/EndConnectionReply.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- EndConnectionReply.java 5 Jan 2003 23:24:25 -0000 1.5 +++ EndConnectionReply.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -16,7 +16,7 @@ */ public final class EndConnectionReply extends Reply { - static final long serialVersionUID = -3318297057355746898L; + static final long serialVersionUID = 1736963237954338757L; /** * Constructor EndConnectionReply 1.7 +3 -3 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ExceptionReply.java Index: ExceptionReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ExceptionReply.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ExceptionReply.java 5 Jan 2003 23:24:25 -0000 1.6 +++ ExceptionReply.java 6 Jan 2003 23:41:51 -0000 1.7 @@ -20,7 +20,7 @@ */ public final class ExceptionReply extends Reply { - static final long serialVersionUID = 8989665815895115830L; + static final long serialVersionUID = -8571671364852090554L; private Throwable m_replyExcpt; @@ -105,7 +105,7 @@ public void readExternal( ObjectInput in ) throws IOException, ClassNotFoundException { m_replyExcpt = (Throwable)in.readObject(); - + // When the exception is read in from the stream, its stack trace will // no longer exist. This is because the stack trace information is not // serialized with the exception. This can make it difficult to track 1.5 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ExposedObjectProxy.java Index: ExposedObjectProxy.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ExposedObjectProxy.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ExposedObjectProxy.java 23 May 2002 21:37:19 -0000 1.4 +++ ExposedObjectProxy.java 6 Jan 2003 23:41:51 -0000 1.5 @@ -22,7 +22,7 @@ public final class ExposedObjectProxy implements Externalizable { - static final long serialVersionUID = 4395451860718894228L; + static final long serialVersionUID = -6422055643767617956L; private String m_publishedName; 1.5 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/FacadeRefHolder.java Index: FacadeRefHolder.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/FacadeRefHolder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- FacadeRefHolder.java 23 May 2002 21:37:19 -0000 1.4 +++ FacadeRefHolder.java 6 Jan 2003 23:41:51 -0000 1.5 @@ -18,7 +18,7 @@ */ public final class FacadeRefHolder implements Serializable { - static final long serialVersionUID = 6621155565136424819L; + static final long serialVersionUID = 4517499953558154280L; private Long m_referenceID; private String m_objectName; 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/GarbageCollectionReply.java Index: GarbageCollectionReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/GarbageCollectionReply.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- GarbageCollectionReply.java 5 Jan 2003 23:24:25 -0000 1.5 +++ GarbageCollectionReply.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public final class GarbageCollectionReply extends Reply { - static final long serialVersionUID = -4521870130866247906L; + static final long serialVersionUID = -6876914024095000894L; /** * Constructor GarbageCollectionReply 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/GarbageCollectionRequest.java Index: GarbageCollectionRequest.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/GarbageCollectionRequest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- GarbageCollectionRequest.java 5 Jan 2003 23:24:25 -0000 1.5 +++ GarbageCollectionRequest.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public final class GarbageCollectionRequest extends PublishedNameRequest implements Sessionable { - static final long serialVersionUID = 494535989006608445L; + static final long serialVersionUID = -1588019075455361758L; private Long m_session; private Long m_referenceID; 1.2 +3 -1 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/InvocationException.java Index: InvocationException.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/InvocationException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- InvocationException.java 5 Jan 2003 23:24:54 -0000 1.1 +++ InvocationException.java 6 Jan 2003 23:41:51 -0000 1.2 @@ -19,6 +19,8 @@ public class InvocationException extends RuntimeException implements Serializable { + static final long serialVersionUID = -189212431437922233L; + private Throwable m_throwableCause; /** 1.5 +3 -1 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/KeyAuthentication.java Index: KeyAuthentication.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/KeyAuthentication.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- KeyAuthentication.java 5 Jan 2003 23:24:25 -0000 1.4 +++ KeyAuthentication.java 6 Jan 2003 23:41:51 -0000 1.5 @@ -21,6 +21,8 @@ public final class KeyAuthentication extends Authentication { + static final long serialVersionUID = -6587101868869375750L; + private String m_publicKey; private String m_signedText; 1.3 +6 -6 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListMethodsReply.java Index: ListMethodsReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListMethodsReply.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ListMethodsReply.java 5 Jan 2003 23:24:25 -0000 1.2 +++ ListMethodsReply.java 6 Jan 2003 23:41:51 -0000 1.3 @@ -52,9 +52,9 @@ * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. - * + * */ - + package org.apache.excalibur.altrmi.common; import java.io.IOException; @@ -70,12 +70,12 @@ */ public final class ListMethodsReply extends Reply { - //-------variables-----------// - static final long serialVersionUID = 42199248686498983L; + + static final long serialVersionUID = 420067307396614451L; /** String array of the methods list of the request publishedObject*/ private String[] m_listOfMethods; - //------Constructors----------// + /** * Constructor initialized with remote method list of the publishedObject * @param listOfMethods : list of remote methods exposed by the published Obj 1.3 +2 -4 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListMethodsRequest.java Index: ListMethodsRequest.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListMethodsRequest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ListMethodsRequest.java 5 Jan 2003 23:24:25 -0000 1.2 +++ ListMethodsRequest.java 6 Jan 2003 23:41:51 -0000 1.3 @@ -66,14 +66,12 @@ */ public final class ListMethodsRequest extends Request { - //--------Variables----------// - static final long serialVersionUID = -6277904408381799644L; + + static final long serialVersionUID = 466389099971742704L; /** Name of the published object whose remote methods is sought*/ private String m_publishedName; - - //--------Constructors-------// /** * Constructor . * @param publishedName 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListReply.java Index: ListReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListReply.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ListReply.java 5 Jan 2003 23:24:25 -0000 1.5 +++ ListReply.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public final class ListReply extends Reply { - static final long serialVersionUID = 2859821236622834515L; + static final long serialVersionUID = -2491265577999411874L; private String[] m_listOfPublishedObjects; 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListRequest.java Index: ListRequest.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ListRequest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ListRequest.java 5 Jan 2003 23:24:25 -0000 1.5 +++ ListRequest.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -16,7 +16,7 @@ */ public final class ListRequest extends Request { - static final long serialVersionUID = -8603142444769220615L; + static final long serialVersionUID = -6048997904689623626L; /** * Gets number that represents type for this class. 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/LookupReply.java Index: LookupReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/LookupReply.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- LookupReply.java 5 Jan 2003 23:24:25 -0000 1.5 +++ LookupReply.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public final class LookupReply extends Reply { - static final long serialVersionUID = 4421747064999748917L; + static final long serialVersionUID = -3292232924211406705L; private Long m_referenceID; 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/LookupRequest.java Index: LookupRequest.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/LookupRequest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- LookupRequest.java 5 Jan 2003 23:24:25 -0000 1.5 +++ LookupRequest.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public final class LookupRequest extends PublishedNameRequest implements Sessionable { - static final long serialVersionUID = -4954813612238819220L; + static final long serialVersionUID = 7509584735319760230L; private Authentication m_altrmiAuthentication; private Long m_session; 1.3 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodAsyncRequest.java Index: MethodAsyncRequest.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodAsyncRequest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MethodAsyncRequest.java 5 Jan 2003 23:24:25 -0000 1.2 +++ MethodAsyncRequest.java 6 Jan 2003 23:41:51 -0000 1.3 @@ -20,7 +20,7 @@ */ public class MethodAsyncRequest extends PublishedNameRequest implements Sessionable { - static final long serialVersionUID = -909163040319879134L; + static final long serialVersionUID = -5928783250529633953L; private RawRequest[] m_rawRequests; private Long m_referenceID; 1.7 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodFacadeArrayReply.java Index: MethodFacadeArrayReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodFacadeArrayReply.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MethodFacadeArrayReply.java 5 Jan 2003 23:24:25 -0000 1.6 +++ MethodFacadeArrayReply.java 6 Jan 2003 23:41:51 -0000 1.7 @@ -21,7 +21,7 @@ public final class MethodFacadeArrayReply extends Reply { - static final long serialVersionUID = 3982374893707173208L; + static final long serialVersionUID = 2546825714005396324L; private Long[] m_referenceIDs; private String[] m_objectNames; 1.7 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodFacadeReply.java Index: MethodFacadeReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodFacadeReply.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MethodFacadeReply.java 5 Jan 2003 23:24:43 -0000 1.6 +++ MethodFacadeReply.java 6 Jan 2003 23:41:51 -0000 1.7 @@ -21,7 +21,7 @@ public final class MethodFacadeReply extends Reply { - static final long serialVersionUID = 3332468131008501932L; + static final long serialVersionUID = -4708610846345954459L; private Long m_referenceID; private String m_objectName; 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodFacadeRequest.java Index: MethodFacadeRequest.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodFacadeRequest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- MethodFacadeRequest.java 5 Jan 2003 23:24:43 -0000 1.5 +++ MethodFacadeRequest.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public final class MethodFacadeRequest extends MethodRequest { - static final long serialVersionUID = 5924458629530012405L; + static final long serialVersionUID = -8622531707298373091L; private String m_baseReturnClassNameEncoded; 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodReply.java Index: MethodReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodReply.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- MethodReply.java 5 Jan 2003 23:24:43 -0000 1.5 +++ MethodReply.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public final class MethodReply extends Reply { - static final long serialVersionUID = -4177121668966829330L; + static final long serialVersionUID = 5551617722014239119L; private Object m_replyObj; 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodRequest.java Index: MethodRequest.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/MethodRequest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- MethodRequest.java 5 Jan 2003 23:24:43 -0000 1.5 +++ MethodRequest.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public class MethodRequest extends PublishedNameRequest implements Sessionable { - static final long serialVersionUID = -909163040319879134L; + static final long serialVersionUID = -4850912985882914299L; private String m_methodSignature; private Object[] m_args; 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/NoSuchReferenceException.java Index: NoSuchReferenceException.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/NoSuchReferenceException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NoSuchReferenceException.java 5 Jan 2003 23:24:43 -0000 1.5 +++ NoSuchReferenceException.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -16,7 +16,7 @@ */ public class NoSuchReferenceException extends InvocationException { - static final long serialVersionUID = -2716140641916481754L; + static final long serialVersionUID = -8851861876443639094L; /** * Constructor NoSuchReferenceException 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/NoSuchReferenceReply.java Index: NoSuchReferenceReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/NoSuchReferenceReply.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NoSuchReferenceReply.java 5 Jan 2003 23:24:43 -0000 1.5 +++ NoSuchReferenceReply.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public final class NoSuchReferenceReply extends NotPublishedReply { - static final long serialVersionUID = -7215264154886986883L; + static final long serialVersionUID = 4027710660600938555L; private Long m_referenceID; 1.3 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/NoSuchSessionException.java Index: NoSuchSessionException.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/NoSuchSessionException.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- NoSuchSessionException.java 5 Jan 2003 23:24:43 -0000 1.2 +++ NoSuchSessionException.java 6 Jan 2003 23:41:51 -0000 1.3 @@ -16,7 +16,7 @@ */ public class NoSuchSessionException extends InvocationException { - static final long serialVersionUID = -111L; + static final long serialVersionUID = 8690339287468114779L; /** * Constructor NoSuchSessionException 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/NotPublishedException.java Index: NotPublishedException.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/NotPublishedException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NotPublishedException.java 5 Jan 2003 23:24:43 -0000 1.5 +++ NotPublishedException.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -16,7 +16,7 @@ */ public class NotPublishedException extends InvocationException { - static final long serialVersionUID = 2764580329860037436L; + static final long serialVersionUID = 408340491942951667L; /** * Constructor NotPublishedException 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/NotPublishedReply.java Index: NotPublishedReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/NotPublishedReply.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NotPublishedReply.java 5 Jan 2003 23:24:43 -0000 1.5 +++ NotPublishedReply.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -16,7 +16,7 @@ */ public class NotPublishedReply extends Reply { - static final long serialVersionUID = 4732484997343410452L; + static final long serialVersionUID = 2421625946997973156L; /** * Constructor NotPublishedReply 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/OpenConnectionReply.java Index: OpenConnectionReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/OpenConnectionReply.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- OpenConnectionReply.java 5 Jan 2003 23:24:43 -0000 1.5 +++ OpenConnectionReply.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -20,7 +20,7 @@ */ public final class OpenConnectionReply extends Reply implements Sessionable { - static final long serialVersionUID = 5709776827804565629L; + static final long serialVersionUID = -1011412213595049271L; private String m_textToSign; private Long m_session; 1.7 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/OpenConnectionRequest.java Index: OpenConnectionRequest.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/OpenConnectionRequest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- OpenConnectionRequest.java 5 Jan 2003 23:24:43 -0000 1.6 +++ OpenConnectionRequest.java 6 Jan 2003 23:41:51 -0000 1.7 @@ -21,7 +21,7 @@ */ public final class OpenConnectionRequest extends Request { - static final long serialVersionUID = 1773735791378198918L; + static final long serialVersionUID = -2904286124933186290L; private UID m_uid; 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/PingReply.java Index: PingReply.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/PingReply.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PingReply.java 5 Jan 2003 23:24:43 -0000 1.5 +++ PingReply.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -16,7 +16,7 @@ */ public final class PingReply extends NotPublishedReply { - static final long serialVersionUID = 5655098880949413943L; + static final long serialVersionUID = 2290360065017766788L; /** * Gets number that represents type for this class. 1.6 +2 -2 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/PingRequest.java Index: PingRequest.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/PingRequest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PingRequest.java 5 Jan 2003 23:24:43 -0000 1.5 +++ PingRequest.java 6 Jan 2003 23:41:51 -0000 1.6 @@ -16,7 +16,7 @@ */ public final class PingRequest extends Request { - static final long serialVersionUID = -3908905385947590608L; + static final long serialVersionUID = -7551156841939653959L; /** * Gets number that represents type for this class. 1.4 +3 -1 jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ProxyGenerationException.java Index: ProxyGenerationException.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ProxyGenerationException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ProxyGenerationException.java 23 May 2002 21:37:19 -0000 1.3 +++ ProxyGenerationException.java 6 Jan 2003 23:41:51 -0000 1.4 @@ -17,6 +17,8 @@ public class ProxyGenerationException extends Exception { + static final long serialVersionUID = -2465972192768158247L; + /** * Constructor ProxyGenerationException *
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>