hammant 2003/01/06 15:42:13
Modified: altrmi/src/java/org/apache/excalibur/altrmi/common
PublishedNameRequest.java RawRequest.java
Reply.java Request.java RequestFailedReply.java
SameVMReply.java SuspendedReply.java
TryLaterReply.java UserPasswordAuthentication.java
altrmi/src/java/org/apache/excalibur/altrmi/generator
BCELProxyGeneratorImpl.java ProxyGeneratorImpl.java
altrmi/src/java/org/apache/excalibur/altrmi/remotable
RemotableExtensionManager.java
altrmi/src/java/org/apache/excalibur/altrmi/server
Publisher.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl
AbstractServer.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback
CallbackServerClassAltrmiFactory.java
altrmi/src/test/org/apache/excalibur/altrmi/test2
ClassRetrievingTestCase.java
altrmi/src/test/org/apache/excalibur/altrmi/test
AbstractAltrmiTestCase.java
MemoryLeakClientTest.java ProConClientTest.java
altrmi/src/test/org/apache/excalibur/altrmi/test/async
SimpleAsync2TestCase.java SimpleAsyncTestCase.java
altrmi/src/test/org/apache/excalibur/altrmi/test/callback
CallBackTestClient.java
altrmi/src/test/org/apache/excalibur/altrmi/test/direct
DirectMarshalledTestCase.java DirectTestCase.java
altrmi/src/test/org/apache/excalibur/altrmi/test/generator
BCELProxyGeneratorTestCase.java
altrmi/src/test/org/apache/excalibur/altrmi/test/piped
PipedCustomStreamTestCase.java
PipedObjectStreamTestCase.java
altrmi/src/test/org/apache/excalibur/altrmi/test/rmi
RmiTestCase.java
altrmi/src/test/org/apache/excalibur/altrmi/test/socket
CustomStreamTestCase.java
JSXObjectStreamTestCase.java
ObjectStreamTestCase.java
Added: altrmi/src/java/org/apache/excalibur/altrmi/server
Server.java
altrmi/lib/buildtime phoenix-metagenerate.jar qdox-1.0.jar
altrmi/src/java/org/apache/excalibur/altrmi/client
Factory.java Proxy.java
Removed: altrmi/src/java/org/apache/excalibur/altrmi/server
AltrmiServer.java
altrmi/src/java/org/apache/excalibur/altrmi/client
AltrmiFactory.java AltrmiProxy.java
altrmi/lib phoenix-metagenerate.jar qdox-1.0.jar
Log:
Serialization IDs set. Some more altrmi prefix renames.
Revision Changes Path
1.6 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/PublishedNameRequest.java
Index: PublishedNameRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/PublishedNameRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PublishedNameRequest.java 5 Jan 2003 23:24:43 -0000 1.5
+++ PublishedNameRequest.java 6 Jan 2003 23:42:10 -0000 1.6
@@ -20,7 +20,7 @@
*/
public abstract class PublishedNameRequest extends Request
{
- static final long serialVersionUID = -1313413018904303303L;
+ static final long serialVersionUID = 5995735372269955205L;
private String m_publishedServiceName;
private String m_objectName;
1.4 +4 -1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/RawRequest.java
Index: RawRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/RawRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RawRequest.java 5 Jan 2003 23:24:43 -0000 1.3
+++ RawRequest.java 6 Jan 2003 23:42:10 -0000 1.4
@@ -20,6 +20,9 @@
*/
public class RawRequest extends Request
{
+
+ static final long serialVersionUID = 2433454402872395509L;
+
private String m_methodSignature;
private Object[] m_args;
1.2 +3 -1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/Reply.java
Index: Reply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/Reply.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Reply.java 5 Jan 2003 23:24:56 -0000 1.1
+++ Reply.java 6 Jan 2003 23:42:10 -0000 1.2
@@ -22,6 +22,8 @@
public abstract class Reply implements Externalizable
{
+ static final long serialVersionUID = -1604781598397036131L;
+
/**
* Gets number that represents type for this class.
* This is quicker than instanceof for type checking.
1.2 +3 -1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/Request.java
Index: Request.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/Request.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Request.java 5 Jan 2003 23:24:56 -0000 1.1
+++ Request.java 6 Jan 2003 23:42:10 -0000 1.2
@@ -22,6 +22,8 @@
public abstract class Request implements Externalizable
{
+ static final long serialVersionUID = 3003722657216604838L;
+
/**
* Gets number that represents type for this class.
* This is quicker than instanceof for type checking.
1.6 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/RequestFailedReply.java
Index: RequestFailedReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/RequestFailedReply.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestFailedReply.java 5 Jan 2003 23:24:43 -0000 1.5
+++ RequestFailedReply.java 6 Jan 2003 23:42:10 -0000 1.6
@@ -20,7 +20,7 @@
*/
public final class RequestFailedReply extends Reply
{
- static final long serialVersionUID = -708020416286440120L;
+ static final long serialVersionUID = 8411019523629669181L;
private String m_failureReason;
1.3 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/SameVMReply.java
Index: SameVMReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/SameVMReply.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SameVMReply.java 5 Jan 2003 23:24:43 -0000 1.2
+++ SameVMReply.java 6 Jan 2003 23:42:10 -0000 1.3
@@ -16,7 +16,7 @@
*/
public final class SameVMReply extends Reply
{
- static final long serialVersionUID = -3567039115479930599L;
+ static final long serialVersionUID = -764673713874147364L;
/**
* Constructor a SameVMReply
1.6 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/SuspendedReply.java
Index: SuspendedReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/SuspendedReply.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SuspendedReply.java 5 Jan 2003 23:24:43 -0000 1.5
+++ SuspendedReply.java 6 Jan 2003 23:42:10 -0000 1.6
@@ -16,7 +16,7 @@
*/
public final class SuspendedReply extends TryLaterReply
{
- static final long serialVersionUID = 7687775321788037967L;
+ static final long serialVersionUID = -5602483138541792903L;
/**
* Gets number that represents type for this class.
1.6 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/TryLaterReply.java
Index: TryLaterReply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/TryLaterReply.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TryLaterReply.java 5 Jan 2003 23:24:43 -0000 1.5
+++ TryLaterReply.java 6 Jan 2003 23:42:10 -0000 1.6
@@ -20,7 +20,7 @@
*/
public abstract class TryLaterReply extends Reply
{
- static final long serialVersionUID = -6459959300465362602L;
+ static final long serialVersionUID = -3748772312349051164L;
private int m_suggestedDelayMillis;
1.6 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/UserPasswordAuthentication.java
Index: UserPasswordAuthentication.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/UserPasswordAuthentication.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserPasswordAuthentication.java 5 Jan 2003 23:24:43 -0000 1.5
+++ UserPasswordAuthentication.java 6 Jan 2003 23:42:10 -0000 1.6
@@ -20,7 +20,7 @@
*/
public final class UserPasswordAuthentication extends Authentication
{
- static final long serialVersionUID = -5410097680279080054L;
+ static final long serialVersionUID = -1387784311223571160L;
private String m_userID;
private String m_password;
1.11 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/BCELProxyGeneratorImpl.java
Index: BCELProxyGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/BCELProxyGeneratorImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BCELProxyGeneratorImpl.java 5 Jan 2003 23:24:44 -0000 1.10
+++ BCELProxyGeneratorImpl.java 6 Jan 2003 23:42:10 -0000 1.11
@@ -94,7 +94,7 @@
/**
* Method generateAltrmiProxyClass.
- * Create AltrmiProxy Implementation with all interface methods
+ * Create Proxy Implementation with all interface methods
* Generating AltrmiGeneratedGENNAME_Main class
* @param mGeneratedClassName the name of the class to generate.
* @param interfacesToStubify the interfaces to stubify.
@@ -192,7 +192,7 @@
"java.lang.Object",
generatedClassName + ".java",
Constants.ACC_PUBLIC | Constants.ACC_SUPER,
- new String[] { "org.apache.excalibur.altrmi.client.AltrmiProxy" });
+ new String[] { "org.apache.excalibur.altrmi.client.Proxy" });
m_constantsPool = m_classGen.getConstantPool();
m_factory = new InstructionFactory(m_classGen, m_constantsPool);
m_internalFieldRepresentingClasses = new ArrayList();
1.19 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/ProxyGeneratorImpl.java
Index: ProxyGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/ProxyGeneratorImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ProxyGeneratorImpl.java 5 Jan 2003 23:24:44 -0000 1.18
+++ ProxyGeneratorImpl.java 6 Jan 2003 23:42:11 -0000 1.19
@@ -149,7 +149,7 @@
}
m_classSource.print( "public class AltrmiGenerated" + getGenName() + "_" +
name );
- m_classSource.println( " implements
org.apache.excalibur.altrmi.client.AltrmiProxy{ " );
+ m_classSource.println( " implements
org.apache.excalibur.altrmi.client.Proxy{ " );
m_classSource.println(
" private transient org.apache.excalibur.altrmi.client.ProxyHelper
m_proxyHelper;" );
@@ -168,7 +168,7 @@
m_classSource.println( " }" );
// helper method for the factory.
- // from AltrmiProxy interface
+ // from Proxy interface
m_classSource
.println( " public Long altrmiGetReferenceID(Object
factoryThatIsAsking) {" );
m_classSource
1.3 +1 -1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/remotable/RemotableExtensionManager.java
Index: RemotableExtensionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/remotable/RemotableExtensionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemotableExtensionManager.java 5 Jan 2003 23:24:44 -0000 1.2
+++ RemotableExtensionManager.java 6 Jan 2003 23:42:11 -0000 1.3
@@ -426,7 +426,7 @@
m_classpath += File.pathSeparator
+ getClassLocation(
Class.forName(
- "org.apache.excalibur.altrmi.client.AltrmiProxy"));
+ "org.apache.excalibur.altrmi.client.Proxy"));
//adding altrmi-common library
m_classpath += File.pathSeparator
+ getClassLocation(
1.2 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/Publisher.java
Index: Publisher.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/Publisher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Publisher.java 5 Jan 2003 23:24:57 -0000 1.1
+++ Publisher.java 6 Jan 2003 23:42:11 -0000 1.2
@@ -10,7 +10,7 @@
import org.apache.excalibur.altrmi.common.MethodRequest;
/**
- * Interface AltrmiServer
+ * Interface Server
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
1.1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/Server.java
Index: Server.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.excalibur.altrmi.server;
import org.apache.excalibur.altrmi.common.InvocationHandler;
/**
* Interface Server
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
* @version * $Revision: 1.1 $
*/
public interface Server extends Publisher, InvocationHandler
{
/**
* The state of the system while shutting down.
*/
int SHUTTINGDOWN = 101;
/**
* The state of the starting system.
*/
int STARTING = 202;
/**
* The state of the starting system.
*/
int STARTED = 303;
/**
* The state of the system when stopped
*/
int STOPPED = 404;
/**
* The state of the un started system.
*/
int UNSTARTED = 505;
/**
* Set a ClassRetriever for the server. Overides default.
*
*
* @param classRetriever we want to use.
*
*
*/
void setClassRetriever( ClassRetriever classRetriever );
/**
* Set an Authenticator to be used in invocations.
*
*
* @param altrmiAuthenticator we want to use.
*
*/
void setAuthenticator( Authenticator altrmiAuthenticator );
/**
* Suspend publishing
*
*/
void suspend();
/**
* Resume publishing
*
*/
void resume();
/**
* Start publishing
*
* @throws ServerException if the server cannot start.
*
*/
void start() throws ServerException;
/**
* Stop publishing
*
*/
void stop();
}
1.11 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/AbstractServer.java
Index: AbstractServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/AbstractServer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractServer.java 5 Jan 2003 23:24:44 -0000 1.10
+++ AbstractServer.java 6 Jan 2003 23:42:11 -0000 1.11
@@ -15,7 +15,7 @@
import org.apache.excalibur.altrmi.common.Request;
import org.apache.excalibur.altrmi.common.MethodRequest;
import org.apache.excalibur.altrmi.server.Authenticator;
-import org.apache.excalibur.altrmi.server.AltrmiServer;
+import org.apache.excalibur.altrmi.server.Server;
import org.apache.excalibur.altrmi.server.ServerConnection;
import org.apache.excalibur.altrmi.server.ClassRetriever;
import org.apache.excalibur.altrmi.server.MethodInvocationHandler;
@@ -32,7 +32,7 @@
* @version $Revision$
*/
public abstract class AbstractServer
- implements AltrmiServer, LogEnabled
+ implements Server, LogEnabled
{
/**
1.9 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/CallbackServerClassAltrmiFactory.java
Index: CallbackServerClassAltrmiFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/CallbackServerClassAltrmiFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CallbackServerClassAltrmiFactory.java 5 Jan 2003 23:24:45 -0000 1.8
+++ CallbackServerClassAltrmiFactory.java 6 Jan 2003 23:42:11 -0000 1.9
@@ -23,7 +23,7 @@
/**
* Class CallbackServerClassAltrmiFactory :
* Provides a hook for setting the hostContext
- * for the AltrmiFactory WITHOUT having to exchange
+ * for the Factory WITHOUT having to exchange
* OpenConnectionRequestMessage &
* also to provides the hacks the lookup() mechanism by modifying
* PublishedName during this part of the protocol.
1.2 +2 -2
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test2/ClassRetrievingTestCase.java
Index: ClassRetrievingTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test2/ClassRetrievingTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassRetrievingTestCase.java 25 Aug 2002 22:23:31 -0000 1.1
+++ ClassRetrievingTestCase.java 6 Jan 2003 23:42:11 -0000 1.2
@@ -11,7 +11,7 @@
import
org.apache.excalibur.altrmi.server.impl.classretrievers.BcelDynamicGeneratorClassRetriever;
import
org.apache.excalibur.altrmi.server.impl.classretrievers.AbstractDynamicGeneratorClassRetriever;
import org.apache.excalibur.altrmi.server.impl.piped.PipedCustomStreamServer;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import org.apache.excalibur.altrmi.client.impl.ServerClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.piped.PipedCustomStreamHostContext;
@@ -56,7 +56,7 @@
((PipedCustomStreamServer) server).makeNewConnection(in, out);
// Client side setup
- AltrmiFactory af = new ServerClassAltrmiFactory(false);
+ Factory af = new ServerClassAltrmiFactory(false);
af.setHostContext(new PipedCustomStreamHostContext(in, out));
testClient = (TestInterface) af.lookup("Kewl");
1.2 +2 -2
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/AbstractAltrmiTestCase.java
Index: AbstractAltrmiTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/AbstractAltrmiTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractAltrmiTestCase.java 21 Dec 2002 23:18:14 -0000 1.1
+++ AbstractAltrmiTestCase.java 6 Jan 2003 23:42:11 -0000 1.2
@@ -8,7 +8,7 @@
package org.apache.excalibur.altrmi.test;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import java.beans.PropertyVetoException;
import java.io.IOException;
@@ -25,7 +25,7 @@
protected AbstractServer server;
protected TestInterfaceImpl testServer;
protected TestInterface testClient;
- protected AltrmiFactory altrmiFactory;
+ protected Factory altrmiFactory;
protected boolean testForBug4499841 = true;
public AbstractAltrmiTestCase(String name)
1.3 +3 -3
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/MemoryLeakClientTest.java
Index: MemoryLeakClientTest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/MemoryLeakClientTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryLeakClientTest.java 24 Apr 2002 12:43:02 -0000 1.2
+++ MemoryLeakClientTest.java 6 Jan 2003 23:42:11 -0000 1.3
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.altrmi.test;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.socket.SocketCustomStreamHostContext;
@@ -75,7 +75,7 @@
System.out.println( "Memory Leak Client" );
- AltrmiFactory af = new ClientClassAltrmiFactory( false );
+ Factory af = new ClientClassAltrmiFactory( false );
af.setHostContext( new SocketCustomStreamHostContext( "127.0.0.1", 1277 ) );
1.4 +2 -2
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/ProConClientTest.java
Index: ProConClientTest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/ProConClientTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProConClientTest.java 5 Jan 2003 23:11:40 -0000 1.3
+++ ProConClientTest.java 6 Jan 2003 23:42:11 -0000 1.4
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.altrmi.test;
-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.ServerClassAltrmiFactory;
@@ -59,7 +59,7 @@
arhc = new SocketCustomStreamHostContext( "127.0.0.1", 1235 );
}
- AltrmiFactory af = null;
+ Factory af = null;
if( args[ 0 ].equals( "S" ) )
{
1.4 +2 -2
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/async/SimpleAsync2TestCase.java
Index: SimpleAsync2TestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/async/SimpleAsync2TestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleAsync2TestCase.java 5 Jan 2003 10:37:11 -0000 1.3
+++ SimpleAsync2TestCase.java 6 Jan 2003 23:42:11 -0000 1.4
@@ -13,7 +13,7 @@
import org.apache.excalibur.altrmi.server.PublicationDescriptionItem;
import org.apache.excalibur.altrmi.client.impl.ServerClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.socket.SocketCustomStreamHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import junit.framework.TestCase;
import java.io.File;
@@ -26,7 +26,7 @@
AsyncTestImpl asyncTestImpl;
AsyncTest testClient;
- AltrmiFactory altrmiFactory;
+ Factory altrmiFactory;
CompleteSocketCustomStreamServer server;
public SimpleAsync2TestCase(String name)
1.6 +2 -2
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/async/SimpleAsyncTestCase.java
Index: SimpleAsyncTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/async/SimpleAsyncTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleAsyncTestCase.java 3 Dec 2002 00:19:57 -0000 1.5
+++ SimpleAsyncTestCase.java 6 Jan 2003 23:42:11 -0000 1.6
@@ -13,7 +13,7 @@
import org.apache.excalibur.altrmi.server.PublicationDescriptionItem;
import org.apache.excalibur.altrmi.client.impl.ServerClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.socket.SocketCustomStreamHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import junit.framework.TestCase;
import java.io.File;
@@ -23,7 +23,7 @@
AsyncTestImpl asyncTestImpl;
AsyncTest testClient;
- AltrmiFactory altrmiFactory;
+ Factory altrmiFactory;
CompleteSocketCustomStreamServer server;
public SimpleAsyncTestCase(String name)
1.8 +2 -2
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/callback/CallBackTestClient.java
Index: CallBackTestClient.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/callback/CallBackTestClient.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CallBackTestClient.java 5 Jan 2003 23:11:40 -0000 1.7
+++ CallBackTestClient.java 6 Jan 2003 23:42:12 -0000 1.8
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.altrmi.test.callback;
-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.ServerClassAltrmiFactory;
import
org.apache.excalibur.altrmi.client.impl.callback.socket.CallbackEnabledSocketCustomStreamHostContext;
@@ -38,7 +38,7 @@
arhc = new CallbackEnabledSocketCustomStreamHostContext( "127.0.0.1", 1235
);
- AltrmiFactory af = null;
+ Factory af = null;
af = new ServerClassAltrmiFactory( false );
1.4 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/direct/DirectMarshalledTestCase.java
Index: DirectMarshalledTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/direct/DirectMarshalledTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirectMarshalledTestCase.java 26 Aug 2002 10:44:08 -0000 1.3
+++ DirectMarshalledTestCase.java 6 Jan 2003 23:42:12 -0000 1.4
@@ -9,7 +9,7 @@
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.direct.DirectMarshalledHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import org.apache.excalibur.altrmi.server.impl.direct.DirectMarshalledServer;
import org.apache.excalibur.altrmi.server.PublicationDescription;
1.4 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/direct/DirectTestCase.java
Index: DirectTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/direct/DirectTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DirectTestCase.java 26 Aug 2002 10:44:08 -0000 1.3
+++ DirectTestCase.java 6 Jan 2003 23:42:12 -0000 1.4
@@ -9,7 +9,7 @@
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.direct.DirectHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import org.apache.excalibur.altrmi.server.impl.direct.DirectServer;
import org.apache.excalibur.altrmi.server.PublicationDescription;
1.7 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/generator/BCELProxyGeneratorTestCase.java
Index: BCELProxyGeneratorTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/generator/BCELProxyGeneratorTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BCELProxyGeneratorTestCase.java 4 Jan 2003 22:17:20 -0000 1.6
+++ BCELProxyGeneratorTestCase.java 6 Jan 2003 23:42:12 -0000 1.7
@@ -100,7 +100,7 @@
/**
* Method testConstructorOfProxy.
* Test if the instance is created properly using the lone
- * Constructor embedded within the AltrmiProxy implementation
+ * Constructor embedded within the Proxy implementation
* @throws Exception
*/
public void testConstructorOfProxy() throws Exception
1.4 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/piped/PipedCustomStreamTestCase.java
Index: PipedCustomStreamTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/piped/PipedCustomStreamTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PipedCustomStreamTestCase.java 26 Aug 2002 10:44:08 -0000 1.3
+++ PipedCustomStreamTestCase.java 6 Jan 2003 23:42:12 -0000 1.4
@@ -9,7 +9,7 @@
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.piped.PipedCustomStreamHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import org.apache.excalibur.altrmi.server.impl.piped.PipedCustomStreamServer;
import org.apache.excalibur.altrmi.server.PublicationDescription;
1.5 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/piped/PipedObjectStreamTestCase.java
Index: PipedObjectStreamTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/piped/PipedObjectStreamTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PipedObjectStreamTestCase.java 26 Aug 2002 13:59:52 -0000 1.4
+++ PipedObjectStreamTestCase.java 6 Jan 2003 23:42:12 -0000 1.5
@@ -9,7 +9,7 @@
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.piped.PipedObjectStreamHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import org.apache.excalibur.altrmi.server.impl.piped.PipedObjectStreamServer;
import org.apache.excalibur.altrmi.server.PublicationDescription;
1.5 +2 -2
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/rmi/RmiTestCase.java
Index: RmiTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/rmi/RmiTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RmiTestCase.java 26 Aug 2002 10:44:08 -0000 1.4
+++ RmiTestCase.java 6 Jan 2003 23:42:13 -0000 1.5
@@ -9,7 +9,7 @@
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
import org.apache.excalibur.altrmi.client.impl.rmi.RmiHostContext;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import org.apache.excalibur.altrmi.server.impl.rmi.RmiServer;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
@@ -58,7 +58,7 @@
server.start();
// Client side setup
- AltrmiFactory af = new ClientClassAltrmiFactory(false);
+ Factory af = new ClientClassAltrmiFactory(false);
af.setHostContext(new RmiHostContext( "127.0.0.1", 10003 ));
testClient = (TestInterface) af.lookup("Hello");
1.6 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/socket/CustomStreamTestCase.java
Index: CustomStreamTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/socket/CustomStreamTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CustomStreamTestCase.java 26 Oct 2002 14:10:50 -0000 1.5
+++ CustomStreamTestCase.java 6 Jan 2003 23:42:13 -0000 1.6
@@ -9,7 +9,7 @@
import org.apache.excalibur.altrmi.client.impl.socket.SocketCustomStreamHostContext;
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import
org.apache.excalibur.altrmi.server.impl.socket.CompleteSocketCustomStreamServer;
import org.apache.excalibur.altrmi.server.PublicationDescription;
1.5 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/socket/JSXObjectStreamTestCase.java
Index: JSXObjectStreamTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/socket/JSXObjectStreamTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JSXObjectStreamTestCase.java 13 Oct 2002 11:54:28 -0000 1.4
+++ JSXObjectStreamTestCase.java 6 Jan 2003 23:42:13 -0000 1.5
@@ -9,7 +9,7 @@
import org.apache.excalibur.altrmi.client.impl.socket.SocketObjectStreamHostContext;
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import
org.apache.excalibur.altrmi.server.impl.socket.CompleteSocketObjectStreamServer;
import org.apache.excalibur.altrmi.server.PublicationDescription;
1.6 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/socket/ObjectStreamTestCase.java
Index: ObjectStreamTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/socket/ObjectStreamTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ObjectStreamTestCase.java 13 Oct 2002 11:54:28 -0000 1.5
+++ ObjectStreamTestCase.java 6 Jan 2003 23:42:13 -0000 1.6
@@ -9,7 +9,7 @@
import org.apache.excalibur.altrmi.client.impl.socket.SocketObjectStreamHostContext;
import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
-import org.apache.excalibur.altrmi.client.AltrmiFactory;
+import org.apache.excalibur.altrmi.client.Factory;
import
org.apache.excalibur.altrmi.server.impl.socket.CompleteSocketObjectStreamServer;
import org.apache.excalibur.altrmi.server.PublicationDescription;
1.1
jakarta-avalon-excalibur/altrmi/lib/buildtime/phoenix-metagenerate.jar
<<Binary file>>
1.1 jakarta-avalon-excalibur/altrmi/lib/buildtime/qdox-1.0.jar
<<Binary file>>
1.1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/Factory.java
Index: Factory.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.excalibur.altrmi.client;
import org.apache.excalibur.altrmi.common.ConnectionException;
import java.io.IOException;
/**
* Interface Factory
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
* @version $Revision: 1.1 $
*/
public interface Factory extends InterfaceLookup
{
/**
* Set the HostContext
* @param hostContext the host context
* @throws ConnectionException if a problem
*
*/
void setHostContext( HostContext hostContext ) throws ConnectionException;
/**
* Set the host context
* @param hostContext the host context
* @param allowOptimize allow optimize
* @throws ConnectionException if a problem
*/
void setHostContext( HostContext hostContext, boolean allowOptimize ) throws
ConnectionException;
}
1.1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/Proxy.java
Index: Proxy.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.excalibur.altrmi.client;
/**
* Interface Proxy
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
* @version $Revision: 1.1 $
*/
public interface Proxy
{
/**
* Method altrmiGetReferenceID
*
*
* @param factoryThatIsAsking
*
* @return
*
*/
Long altrmiGetReferenceID( Object factoryThatIsAsking );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
