hammant 2003/01/09 14:55:12
Modified: altrmi base.xml callback.xml memleak.xml
altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription
AbstractSubscriber.java RmiSubscriber.java
altrmi/src/java/org/apache/excalibur/altrmi/client
ClientInvocationHandler.java ConnectionPinger.java
InterfaceLookupFactory.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl
AbstractClientInvocationHandler.java
AbstractConnectionPinger.java
AbstractFactoryHelper.java AbstractHostContext.java
AbstractInterfaceLookupFactory.java
DefaultConnectionPinger.java
DefaultProxyHelper.java DumbConnectionListener.java
DynamicInvoker.java NeverConnectionPinger.java
PerpetualConnectionPinger.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct
AbstractDirectInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple
AbstractMultipleHostContext.java
AbstractMultipleInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped
AbstractPipedStreamInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi
RmiFactoryHelper.java RmiHostContext.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket
AbstractSocketStreamSSHInvocationHandler.java
SocketCustomStreamFactoryHelper.java
SocketObjectStreamFactoryHelper.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream
StreamInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber
CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java
DefaultLookupSource.java
RmiInterfaceLookupFactory.java
SocketObjectStreamInterfaceLookupFactory.java
altrmi/src/java/org/apache/excalibur/altrmi/common
LookupRequest.java
altrmi/src/java/org/apache/excalibur/altrmi/generator
BCELProxyGeneratorImpl.java
altrmi/src/java/org/apache/excalibur/altrmi/remotable
RemotableDescriptor.java
RemotableExtensionManager.java
RemotableExtensionManager.xconfig
altrmi/src/java/org/apache/excalibur/altrmi/server/impl
ServerStreamReadWriter.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/adapters
InvocationHandlerAdapter.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket
CallbackEnabledSocketCustomStreamReadWriter.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers
AbstractDynamicGeneratorClassRetriever.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/rmi
RmiInovcationAdapter.java RmiServer.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket
AbstractCompleteSocketStreamServer.java
altrmi/src/test/org/apache/excalibur/altrmi/client/impl
DefaultConnectionPingerTestCase.java
DummyInvocationHandler.java
Log:
Positively the last set of wholescale renames!
Revision Changes Path
1.10 +1 -1 jakarta-avalon-excalibur/altrmi/base.xml
Index: base.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/base.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- base.xml 28 Dec 2002 12:23:30 -0000 1.9
+++ base.xml 9 Jan 2003 22:55:09 -0000 1.10
@@ -24,7 +24,7 @@
<pathelement location="${jakarta-commons-logging.jar}"/>
</path>
- <taskdef name="altrmiproxies"
classname="org.apache.excalibur.altrmi.generator.ant.AltrmiProxyTask">
+ <taskdef name="altrmiproxies"
classname="org.apache.excalibur.altrmi.generator.ant.ProxyGenerationTask">
<classpath refid="compile.classpath" />
</taskdef>
1.6 +1 -1 jakarta-avalon-excalibur/altrmi/callback.xml
Index: callback.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/callback.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- callback.xml 14 May 2002 21:35:57 -0000 1.5
+++ callback.xml 9 Jan 2003 22:55:09 -0000 1.6
@@ -35,7 +35,7 @@
</path>
- <taskdef name="altrmiproxies"
classname="org.apache.excalibur.altrmi.generator.ant.AltrmiProxyTask">
+ <taskdef name="altrmiproxies"
classname="org.apache.excalibur.altrmi.generator.ant.ProxyGenerationTask">
<classpath refid="compile.classpath" />
</taskdef>
1.2 +1 -1 jakarta-avalon-excalibur/altrmi/memleak.xml
Index: memleak.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/memleak.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memleak.xml 3 Apr 2002 22:26:53 -0000 1.1
+++ memleak.xml 9 Jan 2003 22:55:09 -0000 1.2
@@ -28,7 +28,7 @@
<pathelement location="${avalon-framework.jar}"/>
</path>
- <taskdef name="altrmiproxies"
classname="org.apache.excalibur.altrmi.generator.ant.AltrmiProxyTask">
+ <taskdef name="altrmiproxies"
classname="org.apache.excalibur.altrmi.generator.ant.ProxyGenerationTask">
<classpath refid="compile.classpath" />
</taskdef>
1.5 +6 -6
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractSubscriber.java 6 Jan 2003 23:41:49 -0000 1.4
+++ AbstractSubscriber.java 9 Jan 2003 22:55:09 -0000 1.5
@@ -15,15 +15,15 @@
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;
-import org.apache.excalibur.altrmi.client.impl.ServerClassAltrmiFactory;
+import org.apache.excalibur.altrmi.client.impl.ClientSideClassFactory;
+import org.apache.excalibur.altrmi.client.impl.ServerSideClassFactory;
import org.apache.excalibur.altrmi.common.Authentication;
import org.apache.excalibur.altrmi.common.ConnectionException;
/**
* @phoenix:service name="org.apache.excalibur.altrmi.client.InterfaceLookup"
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class AbstractSubscriber
@@ -47,11 +47,11 @@
if( proxyClassLocation.equals( "client" ) )
{
- m_altrmiFactory = new ClientClassAltrmiFactory( false );
+ m_altrmiFactory = new ClientSideClassFactory( false );
}
else if( proxyClassLocation.equals( "server" ) )
{
- m_altrmiFactory = new ServerClassAltrmiFactory( false );
+ m_altrmiFactory = new ServerSideClassFactory( false );
}
else
{
1.3 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/RmiSubscriber.java
Index: RmiSubscriber.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/blocks/subscription/RmiSubscriber.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RmiSubscriber.java 5 Jan 2003 23:11:25 -0000 1.2
+++ RmiSubscriber.java 9 Jan 2003 22:55:09 -0000 1.3
@@ -15,7 +15,7 @@
* @phoenix:block
* @phoenix:service name="org.apache.excalibur.altrmi.client.InterfaceLookup"
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public class RmiSubscriber
1.3 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/ClientInvocationHandler.java
Index: ClientInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/ClientInvocationHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClientInvocationHandler.java 5 Jan 2003 23:24:08 -0000 1.2
+++ ClientInvocationHandler.java 9 Jan 2003 22:55:09 -0000 1.3
@@ -15,20 +15,20 @@
* Interface ClientInvocationHandler
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version * $Revision$
*/
public interface ClientInvocationHandler extends InvocationHandler
{
/**
- * Method setAltrmiConnectionListener
+ * Method setConnectionListener
*
*
* @param altrmiConnectionListener
*
*/
- void setAltrmiConnectionListener( ConnectionListener altrmiConnectionListener );
+ void setConnectionListener( ConnectionListener altrmiConnectionListener );
/**
* Method setConnectionPinger
1.2 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/ConnectionPinger.java
Index: ConnectionPinger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/ConnectionPinger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConnectionPinger.java 5 Jan 2003 23:11:40 -0000 1.1
+++ ConnectionPinger.java 9 Jan 2003 22:55:09 -0000 1.2
@@ -11,19 +11,19 @@
* Interface ConnectionPinger
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version * $Revision$
*/
public interface ConnectionPinger
{
/**
- * Method setAltrmiInvocationHandler
+ * Method setInvocationHandler
*
*
*
*/
- void setAltrmiInvocationHandler( ClientInvocationHandler
altrmiInvocationHandler );
+ void setInvocationHandler( ClientInvocationHandler altrmiInvocationHandler );
/**
* Method start
1.3 +6 -6
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/InterfaceLookupFactory.java
Index: InterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/InterfaceLookupFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InterfaceLookupFactory.java 5 Jan 2003 23:24:08 -0000 1.2
+++ InterfaceLookupFactory.java 9 Jan 2003 22:55:09 -0000 1.3
@@ -13,14 +13,14 @@
* Interface InterfaceLookupFactory
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version * $Revision$
*/
public interface InterfaceLookupFactory
{
/**
- * Method getAltrmiInterfaceLookup
+ * Method getInterfaceLookup
*
* FactoryStrings as listed here should look like this:
*
@@ -40,11 +40,11 @@
* @return
*
*/
- InterfaceLookup getAltrmiInterfaceLookup( String factoryString, boolean
optimize )
+ InterfaceLookup getInterfaceLookup( String factoryString, boolean optimize )
throws ConnectionException;
/**
- * Method getAltrmiInterfaceLookup
+ * Method getInterfaceLookup
*
*
* @param factoryString
@@ -56,7 +56,7 @@
* @throws ConnectionException
*
*/
- InterfaceLookup getAltrmiInterfaceLookup(
+ InterfaceLookup getInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean optimize
) throws ConnectionException;
}
1.11 +5 -5
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractClientInvocationHandler.java 6 Jan 2003 23:41:49 -0000 1.10
+++ AbstractClientInvocationHandler.java 9 Jan 2003 22:55:09 -0000 1.11
@@ -24,7 +24,7 @@
* Class AbstractClientInvocationHandler
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class AbstractClientInvocationHandler
@@ -37,13 +37,13 @@
protected boolean m_stopped = false;
/**
- * Method setAltrmiConnectionListener
+ * Method setConnectionListener
*
*
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
+ public void setConnectionListener( ConnectionListener altrmiConnectionListener )
{
m_altrmiConnectionListener = altrmiConnectionListener;
}
@@ -63,7 +63,7 @@
m_connectionPinger = new DefaultConnectionPinger();
}
- m_connectionPinger.setAltrmiInvocationHandler( this );
+ m_connectionPinger.setInvocationHandler( this );
m_connectionPinger.start();
}
1.12 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractConnectionPinger.java
Index: AbstractConnectionPinger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractConnectionPinger.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractConnectionPinger.java 5 Jan 2003 23:24:08 -0000 1.11
+++ AbstractConnectionPinger.java 9 Jan 2003 22:55:09 -0000 1.12
@@ -16,7 +16,7 @@
* Interface AbstractConnectionPinger
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version * $Revision$
*/
public abstract class AbstractConnectionPinger implements ConnectionPinger
@@ -70,12 +70,12 @@
}
/**
- * Method setAltrmiInvocationHandler
+ * Method setInvocationHandler
*
*
*
*/
- public void setAltrmiInvocationHandler( ClientInvocationHandler
altrmiInvocationHandler )
+ public void setInvocationHandler( ClientInvocationHandler
altrmiInvocationHandler )
{
m_altrmiInvocationHandler = altrmiInvocationHandler;
}
@@ -84,7 +84,7 @@
* Get the Invocation handler.
* @return
*/
- protected ClientInvocationHandler getAltrmiInvocationHandler()
+ protected ClientInvocationHandler getInvocationHandler()
{
return m_altrmiInvocationHandler;
}
1.8 +8 -8
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractFactoryHelper.java 6 Jan 2003 23:41:50 -0000 1.7
+++ AbstractFactoryHelper.java 9 Jan 2003 22:55:09 -0000 1.8
@@ -18,7 +18,7 @@
* Class AbstractFactoryHelper
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class AbstractFactoryHelper implements InterfaceLookupFactory
@@ -42,16 +42,16 @@
return retval;
}
- protected Factory createAltrmiFactory( String type, boolean beanOnly )
+ protected Factory createFactory( String type, boolean beanOnly )
{
if( type.equalsIgnoreCase( "s" ) )
{
- return new ServerClassAltrmiFactory( beanOnly );
+ return new ServerSideClassFactory( beanOnly );
}
else if( type.equalsIgnoreCase( "c" ) )
{
- return new ClientClassAltrmiFactory( beanOnly );
+ return new ClientSideClassFactory( beanOnly );
}
else
{
@@ -60,7 +60,7 @@
}
/**
- * Method getAltrmiInterfaceLookup
+ * Method getInterfaceLookup
*
*
* @param factoryString
@@ -71,9 +71,9 @@
* @throws ConnectionException
*
*/
- public final InterfaceLookup getAltrmiInterfaceLookup( String factoryString,
boolean optimize )
+ public final InterfaceLookup getInterfaceLookup( String factoryString, boolean
optimize )
throws ConnectionException
{
- return getAltrmiInterfaceLookup( factoryString,
this.getClass().getClassLoader(), optimize );
+ return getInterfaceLookup( factoryString, this.getClass().getClassLoader(),
optimize );
}
}
1.8 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractHostContext.java
Index: AbstractHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractHostContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractHostContext.java 5 Jan 2003 23:11:25 -0000 1.7
+++ AbstractHostContext.java 9 Jan 2003 22:55:09 -0000 1.8
@@ -15,7 +15,7 @@
* Class AbstractHostContext
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class AbstractHostContext implements HostContext
@@ -49,16 +49,16 @@
}
/**
- * Method setAltrmiConnectionListener
+ * Method setConnectionListener
*
*
*
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
+ public void setConnectionListener( ConnectionListener altrmiConnectionListener )
{
- m_altrmiClientInvocationHandler.setAltrmiConnectionListener(
altrmiConnectionListener );
+ m_altrmiClientInvocationHandler.setConnectionListener(
altrmiConnectionListener );
}
public HostContext makeSameVmHostContext(String key) {
1.8 +9 -9
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractInterfaceLookupFactory.java
Index: AbstractInterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/AbstractInterfaceLookupFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractInterfaceLookupFactory.java 5 Jan 2003 23:24:08 -0000 1.7
+++ AbstractInterfaceLookupFactory.java 9 Jan 2003 22:55:09 -0000 1.8
@@ -16,7 +16,7 @@
* Class AbstractInterfaceLookupFactory
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public class AbstractInterfaceLookupFactory implements InterfaceLookupFactory
@@ -30,7 +30,7 @@
}
/**
- * Method getAltrmiInterfaceLookup
+ * Method getInterfaceLookup
*
*
* @param factoryString
@@ -40,14 +40,14 @@
* @throws ConnectionException
*
*/
- public final InterfaceLookup getAltrmiInterfaceLookup( String factoryString,
boolean optimize )
+ public final InterfaceLookup getInterfaceLookup( String factoryString, boolean
optimize )
throws ConnectionException
{
- return getAltrmiInterfaceLookup( factoryString,
this.getClass().getClassLoader(), optimize );
+ return getInterfaceLookup( factoryString, this.getClass().getClassLoader(),
optimize );
}
/**
- * Method getAltrmiInterfaceLookup
+ * Method getInterfaceLookup
*
*
* @param factoryString
@@ -58,7 +58,7 @@
* @throws ConnectionException
*
*/
- public InterfaceLookup getAltrmiInterfaceLookup(
+ public InterfaceLookup getInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean optimize )
throws ConnectionException
{
@@ -70,7 +70,7 @@
if( factoryString.startsWith( factory.factoryStringPrefix ) )
{
return factory.altrmiInterfaceLookupFactory
- .getAltrmiInterfaceLookup( factoryString,
interfacesClassLoader, optimize );
+ .getInterfaceLookup( factoryString, interfacesClassLoader,
optimize );
}
}
1.5 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultConnectionPinger.java
Index: DefaultConnectionPinger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultConnectionPinger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultConnectionPinger.java 2 Sep 2002 22:36:23 -0000 1.4
+++ DefaultConnectionPinger.java 9 Jan 2003 22:55:09 -0000 1.5
@@ -11,7 +11,7 @@
* Interface DefaultConnectionPinger
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version * $Revision$
*/
public class DefaultConnectionPinger extends AbstractConnectionPinger
@@ -59,10 +59,10 @@
protected void ping()
{
- if( getAltrmiInvocationHandler().getLastRealRequest()
+ if( getInvocationHandler().getLastRealRequest()
> ( System.currentTimeMillis() - ( getGiveupInterval() ) ) )
{
- getAltrmiInvocationHandler().ping();
+ getInvocationHandler().ping();
}
else
{
1.20 +4 -4
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultProxyHelper.java 6 Jan 2003 23:41:50 -0000 1.19
+++ DefaultProxyHelper.java 9 Jan 2003 22:55:09 -0000 1.20
@@ -32,14 +32,14 @@
* Class DefaultProxyHelper
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @author Vinay Chandrasekharan <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
* @version $Revision$
*/
public final class DefaultProxyHelper implements ProxyHelper
{
- private final transient AbstractAltrmiFactory m_altrmiFactory;
+ private final transient AbstractFactory m_altrmiFactory;
private final transient ClientInvocationHandler m_clientInvocationHandler;
private final transient String m_publishedServiceName;
private final transient String m_objectName;
@@ -59,7 +59,7 @@
* @param session
*
*/
- public DefaultProxyHelper( AbstractAltrmiFactory altrmiFactory,
+ public DefaultProxyHelper( AbstractFactory altrmiFactory,
ClientInvocationHandler clientInvocationHandler,
String pubishedServiceName, String objectName, Long
referenceID,
Long session )
1.4 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DumbConnectionListener.java
Index: DumbConnectionListener.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DumbConnectionListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DumbConnectionListener.java 5 Jan 2003 23:24:08 -0000 1.3
+++ DumbConnectionListener.java 9 Jan 2003 22:55:09 -0000 1.4
@@ -14,7 +14,7 @@
import java.io.IOException;
/**
- * Interface AltrmiConnectDumbConnectionListenerionListener
+ * Class DumbConnectionListener
*
*
* @author Paul Hammant
1.7 +4 -4
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DynamicInvoker.java 6 Jan 2003 23:41:50 -0000 1.6
+++ DynamicInvoker.java 9 Jan 2003 22:55:09 -0000 1.7
@@ -70,7 +70,7 @@
/**
* DynamicInvoker enables complete dynamic
* invocation of the remote methods ;Its a stubless execution working
- * directly with the Altrmi defined request and response messages.
+ * directly with the AltRMI defined request and response messages.
*.
* One creates a DynamicInvoker as follows:
* <code>
@@ -97,8 +97,8 @@
//------Variables------------//
/** Factory*/
- private DynamicClassAltrmiFactory m_factory =
- new DynamicClassAltrmiFactory(false);
+ private DynamicClassFactory m_factory =
+ new DynamicClassFactory(false);
/** HostContext*/
private HostContext m_hostContext;
/** ClientInvocationHandler */
@@ -134,7 +134,7 @@
/**
* Retrieve the list of publishedObjects on the server.
- * Re-uses the impl within AbstractAltrmiFactory.
+ * Re-uses the impl within AbstractFactory.
*/
public String[] list()
{
1.3 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/NeverConnectionPinger.java
Index: NeverConnectionPinger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/NeverConnectionPinger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NeverConnectionPinger.java 5 Jan 2003 23:11:25 -0000 1.2
+++ NeverConnectionPinger.java 9 Jan 2003 22:55:09 -0000 1.3
@@ -27,7 +27,7 @@
{
}
- public void setAltrmiInvocationHandler(ClientInvocationHandler
altrmiInvocationHandler)
+ public void setInvocationHandler(ClientInvocationHandler
altrmiInvocationHandler)
{
}
1.5 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/PerpetualConnectionPinger.java
Index: PerpetualConnectionPinger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/PerpetualConnectionPinger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PerpetualConnectionPinger.java 2 Sep 2002 22:36:23 -0000 1.4
+++ PerpetualConnectionPinger.java 9 Jan 2003 22:55:09 -0000 1.5
@@ -15,7 +15,7 @@
* Pings every ten seconds.
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version * $Revision$
*/
public class PerpetualConnectionPinger extends AbstractConnectionPinger
@@ -45,6 +45,6 @@
protected void ping()
{
- getAltrmiInvocationHandler().handleInvocation( new PingRequest() );
+ getInvocationHandler().handleInvocation( new PingRequest() );
}
}
1.8 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/AbstractDirectInvocationHandler.java
Index: AbstractDirectInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/AbstractDirectInvocationHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractDirectInvocationHandler.java 5 Jan 2003 23:24:09 -0000 1.7
+++ AbstractDirectInvocationHandler.java 9 Jan 2003 22:55:10 -0000 1.8
@@ -26,7 +26,7 @@
* Class DirectInvocationHandler
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class AbstractDirectInvocationHandler extends
AbstractClientInvocationHandler
@@ -36,16 +36,16 @@
protected long m_lastRealRequest = System.currentTimeMillis();
/**
- * Method setAltrmiConnectionListener
+ * Method setConnectionListener
*
*
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
+ public void setConnectionListener( ConnectionListener altrmiConnectionListener )
{
- super.setAltrmiConnectionListener( altrmiConnectionListener );
+ super.setConnectionListener( altrmiConnectionListener );
m_methodLogging = altrmiConnectionListener.methodLogging();
}
1.6 +6 -6
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/AbstractMultipleHostContext.java
Index: AbstractMultipleHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/AbstractMultipleHostContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractMultipleHostContext.java 5 Jan 2003 23:11:26 -0000 1.5
+++ AbstractMultipleHostContext.java 9 Jan 2003 22:55:10 -0000 1.6
@@ -16,7 +16,7 @@
* Class AbstractMultipleHostContext
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class AbstractMultipleHostContext implements HostContext
@@ -42,25 +42,25 @@
}
/**
- * Method addAltrmiHostContext
+ * Method addHostContext
*
*
* @param altrmiHostContext
*
*/
- public void addAltrmiHostContext( HostContext altrmiHostContext )
+ public void addHostContext( HostContext altrmiHostContext )
{
m_altrmiHostContexts.add( altrmiHostContext );
}
/**
- * Method removeAltrmiHostContext
+ * Method removeHostContext
*
*
* @param altrmiHostContext
*
*/
- public void removeAltrmiHostContext( HostContext altrmiHostContext )
+ public void removeHostContext( HostContext altrmiHostContext )
{
m_altrmiHostContexts.remove( altrmiHostContext );
}
1.8 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/AbstractMultipleInvocationHandler.java
Index: AbstractMultipleInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/AbstractMultipleInvocationHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractMultipleInvocationHandler.java 5 Jan 2003 23:24:10 -0000 1.7
+++ AbstractMultipleInvocationHandler.java 9 Jan 2003 22:55:10 -0000 1.8
@@ -17,7 +17,7 @@
* Class AbstractMultipleInvocationHandler
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class AbstractMultipleInvocationHandler implements
ClientInvocationHandler
@@ -27,13 +27,13 @@
protected AbstractMultipleHostContext m_multipleHostContext;
/**
- * Method setAltrmiConnectionListener
+ * Method setConnectionListener
*
*
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
+ public void setConnectionListener( ConnectionListener altrmiConnectionListener )
{
m_altrmiConnectionListener = altrmiConnectionListener;
}
1.10 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/AbstractPipedStreamInvocationHandler.java
Index: AbstractPipedStreamInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/AbstractPipedStreamInvocationHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractPipedStreamInvocationHandler.java 5 Jan 2003 23:24:10 -0000 1.9
+++ AbstractPipedStreamInvocationHandler.java 9 Jan 2003 22:55:10 -0000 1.10
@@ -21,7 +21,7 @@
* Class AbstractPipedStreamInvocationHandler
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class AbstractPipedStreamInvocationHandler extends
StreamInvocationHandler
1.8 +5 -5
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RmiFactoryHelper.java 6 Jan 2003 23:41:50 -0000 1.7
+++ RmiFactoryHelper.java 9 Jan 2003 22:55:10 -0000 1.8
@@ -21,14 +21,14 @@
* 0 : 1 : 2
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public class RmiFactoryHelper extends AbstractFactoryHelper
{
/**
- * Method getAltrmiInterfaceLookup
+ * Method getInterfaceLookup
*
*
* @param factoryString
@@ -37,7 +37,7 @@
* @return
*
*/
- public InterfaceLookup getAltrmiInterfaceLookup(
+ public InterfaceLookup getInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean optimize )
throws ConnectionException
{
@@ -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
] ) );
- Factory af = createAltrmiFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase(
"bo" ) );
+ Factory af = createFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase( "bo" )
);
af.setHostContext( hc );
1.4 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiHostContext.java
Index: RmiHostContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiHostContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RmiHostContext.java 5 Jan 2003 23:24:23 -0000 1.3
+++ RmiHostContext.java 9 Jan 2003 22:55:10 -0000 1.4
@@ -34,6 +34,6 @@
*/
public RmiHostContext( String host, int port ) throws ConnectionException
{
- super( new RmiInvocationHandler( host, port ) );
+ super( new RmiClientInvocationHandler( host, port ) );
}
}
1.4 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/AbstractSocketStreamSSHInvocationHandler.java
Index: AbstractSocketStreamSSHInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/AbstractSocketStreamSSHInvocationHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractSocketStreamSSHInvocationHandler.java 5 Jan 2003 23:24:23 -0000
1.3
+++ AbstractSocketStreamSSHInvocationHandler.java 9 Jan 2003 22:55:10 -0000
1.4
@@ -115,7 +115,7 @@
{
JSch jsch = new JSch();
Session session = jsch.getSession(m_host, 22);
- session.setUserInfo(new AltrmiUserInfo(m_userID, m_password));
+ session.setUserInfo(new DefaultUserInfo(m_userID, m_password));
session.connect();
Socket socket = new Socket();
1.10 +4 -4
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SocketCustomStreamFactoryHelper.java 6 Jan 2003 23:41:50 -0000 1.9
+++ SocketCustomStreamFactoryHelper.java 9 Jan 2003 22:55:10 -0000 1.10
@@ -27,7 +27,7 @@
{
/**
- * Method getAltrmiInterfaceLookup
+ * Method getInterfaceLookup
*
*
* @param factoryString
@@ -36,7 +36,7 @@
* @return
*
*/
- public InterfaceLookup getAltrmiInterfaceLookup(
+ public InterfaceLookup getInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean optimize)
throws ConnectionException
{
@@ -46,7 +46,7 @@
HostContext hc = new SocketCustomStreamHostContext( terms[ 1 ],
Integer.parseInt(
terms[ 2 ] ),
interfacesClassLoader );
- Factory af = createAltrmiFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase(
"bo" ) );
+ Factory af = createFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase( "bo" )
);
af.setHostContext( hc, optimize );
return af;
1.9 +4 -4
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SocketObjectStreamFactoryHelper.java 6 Jan 2003 23:41:50 -0000 1.8
+++ SocketObjectStreamFactoryHelper.java 9 Jan 2003 22:55:10 -0000 1.9
@@ -27,7 +27,7 @@
{
/**
- * Method getAltrmiInterfaceLookup
+ * Method getInterfaceLookup
*
*
* @param factoryString
@@ -36,7 +36,7 @@
* @return
*
*/
- public InterfaceLookup getAltrmiInterfaceLookup(
+ public InterfaceLookup getInterfaceLookup(
String factoryString, ClassLoader interfacesClassLoader, boolean optimize )
throws ConnectionException
{
@@ -46,7 +46,7 @@
HostContext hc = new SocketObjectStreamHostContext( terms[ 1 ],
Integer.parseInt(
terms[ 2 ] ),
interfacesClassLoader );
- Factory af = createAltrmiFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase(
"bo" ) );
+ Factory af = createFactory( terms[ 3 ], terms[ 4 ].equalsIgnoreCase( "bo" )
);
af.setHostContext( hc, optimize );
return af;
1.15 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/StreamInvocationHandler.java
Index: StreamInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/StreamInvocationHandler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StreamInvocationHandler.java 5 Jan 2003 23:24:24 -0000 1.14
+++ StreamInvocationHandler.java 9 Jan 2003 22:55:10 -0000 1.15
@@ -30,7 +30,7 @@
* Class StreamInvocationHandler
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class StreamInvocationHandler extends
AbstractClientInvocationHandler
@@ -66,16 +66,16 @@
}
/**
- * Method setAltrmiConnectionListener
+ * Method setConnectionListener
*
*
* @param altrmiConnectionListener
*
*/
- public void setAltrmiConnectionListener( ConnectionListener
altrmiConnectionListener )
+ public void setConnectionListener( ConnectionListener altrmiConnectionListener )
{
- super.setAltrmiConnectionListener( altrmiConnectionListener );
+ super.setConnectionListener( altrmiConnectionListener );
m_methodLogging = altrmiConnectionListener.methodLogging();
}
1.4 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java
Index: CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java 5 Jan 2003
23:24:25 -0000 1.3
+++ CallbackEnabledCustomSocketStreamInterfaceLookupFactory.java 9 Jan 2003
22:55:11 -0000 1.4
@@ -20,7 +20,7 @@
* @version $Revision$
*/
public class CallbackEnabledCustomSocketStreamInterfaceLookupFactory
- extends AbstractAltrmiInterfaceLookupFactory
+ extends AbstractInterfaceLookupFactory
{
private String m_host;
private int m_port;
1.2 +7 -7
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/DefaultLookupSource.java
Index: DefaultLookupSource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/DefaultLookupSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultLookupSource.java 5 Jan 2003 23:11:41 -0000 1.1
+++ DefaultLookupSource.java 9 Jan 2003 22:55:11 -0000 1.2
@@ -56,7 +56,7 @@
public class DefaultLookupSource extends AbstractLogEnabled
implements LookupSource, Disposable, Configurable, ThreadSafe
{
- protected AltrmiLookupPool m_pool;
+ protected DefaultLookupPool m_pool;
/**
* Configure and set up DB connection. Here we set the connection
@@ -125,9 +125,9 @@
try
{
final DefaultPoolController poolController = new
DefaultPoolController( l_max / 4 );
- final AbstractAltrmiInterfaceLookupFactory factory = createFactory(
fconfig );
+ final AbstractInterfaceLookupFactory factory = createFactory(
fconfig );
- m_pool = new AltrmiLookupPool( factory, poolController, l_min,
l_max );
+ m_pool = new DefaultLookupPool( factory, poolController, l_min,
l_max );
m_pool.enableLogging( getLogger() );
m_pool.initialize();
}
@@ -138,13 +138,13 @@
}
}
- private AbstractAltrmiInterfaceLookupFactory createFactory( final Configuration
fconfig )
+ private AbstractInterfaceLookupFactory createFactory( final Configuration
fconfig )
throws Exception
{
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
final String className = fconfig.getAttribute( "class" );
- final AbstractAltrmiInterfaceLookupFactory factory =
- ( AbstractAltrmiInterfaceLookupFactory )
loader.loadClass(className).newInstance();
+ final AbstractInterfaceLookupFactory factory =
+ ( AbstractInterfaceLookupFactory )
loader.loadClass(className).newInstance();
setupLogger( factory );
1.4 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/RmiInterfaceLookupFactory.java
Index: RmiInterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/RmiInterfaceLookupFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RmiInterfaceLookupFactory.java 5 Jan 2003 23:24:25 -0000 1.3
+++ RmiInterfaceLookupFactory.java 9 Jan 2003 22:55:11 -0000 1.4
@@ -19,7 +19,7 @@
* @author <a href="[EMAIL PROTECTED]">Peter Royal</a>
* @version $Revision$
*/
-public class RmiInterfaceLookupFactory extends AbstractAltrmiInterfaceLookupFactory
+public class RmiInterfaceLookupFactory extends AbstractInterfaceLookupFactory
{
private String m_host;
private int m_port;
1.4 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/SocketObjectStreamInterfaceLookupFactory.java
Index: SocketObjectStreamInterfaceLookupFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/subscriber/SocketObjectStreamInterfaceLookupFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SocketObjectStreamInterfaceLookupFactory.java 5 Jan 2003 23:24:25 -0000
1.3
+++ SocketObjectStreamInterfaceLookupFactory.java 9 Jan 2003 22:55:11 -0000
1.4
@@ -19,7 +19,7 @@
* @author <a href="[EMAIL PROTECTED]">Peter Royal</a>
* @version $Revision$
*/
-public class SocketObjectStreamInterfaceLookupFactory extends
AbstractAltrmiInterfaceLookupFactory
+public class SocketObjectStreamInterfaceLookupFactory extends
AbstractInterfaceLookupFactory
{
private String m_host;
private int m_port;
1.7 +4 -4
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LookupRequest.java 6 Jan 2003 23:41:51 -0000 1.6
+++ LookupRequest.java 9 Jan 2003 22:55:11 -0000 1.7
@@ -15,7 +15,7 @@
* Class LookupRequest
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public final class LookupRequest extends PublishedNameRequest implements Sessionable
@@ -67,13 +67,13 @@
}
/**
- * Get Altrmi Authentication handler
+ * Get AltRMI Authentication handler
*
*
* @return the authenticator
*
*/
- public Authentication getAltrmiAuthentication()
+ public Authentication getAuthentication()
{
return m_altrmiAuthentication;
}
1.12 +16 -16
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BCELProxyGeneratorImpl.java 6 Jan 2003 23:42:10 -0000 1.11
+++ BCELProxyGeneratorImpl.java 9 Jan 2003 22:55:11 -0000 1.12
@@ -38,7 +38,7 @@
/**
* Class BCElProxyGeneratorImpl
- * This class generates Altrmi stubs using Jakarta BCEL library.
+ * This class generates AltRMI stubs using Jakarta BCEL library.
*
* HOWTO: Use 'javap' to read the bytecodes of the stubs generated
* by using the original stub-generator(which generates pure java code).
@@ -67,8 +67,8 @@
{
//create the Main Stubs:
- generateAltrmiProxyClass(STUB_PREFIX + getGenName() + "_Main",
getInterfacesToExpose());
- generateAltrmiProxyClass2(
+ generateProxyClass(STUB_PREFIX + getGenName() + "_Main",
getInterfacesToExpose());
+ generateProxyClass2(
STUB_PREFIX + "2" + getGenName() + "_Main",
STUB_PREFIX + getGenName() + "_Main",
getInterfacesToExpose());
@@ -79,10 +79,10 @@
for (int i = 0; i < getAdditionalFacades().length; i++)
{
String encodedClassName =
MethodNameHelper.encodeClassName(getAdditionalFacades()[i].getFacadeClass());
- generateAltrmiProxyClass(
+ generateProxyClass(
STUB_PREFIX + getGenName() + "_" + encodedClassName,
new PublicationDescriptionItem[] { getAdditionalFacades()[i] });
- generateAltrmiProxyClass2(
+ generateProxyClass2(
STUB_PREFIX + "2" + getGenName() + "_" + encodedClassName,
STUB_PREFIX + getGenName() + "_" + encodedClassName,
new PublicationDescriptionItem[] { getAdditionalFacades()[i] });
@@ -93,13 +93,13 @@
}
/**
- * Method generateAltrmiProxyClass.
+ * Method generateProxyClass.
* 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.
*/
- protected void generateAltrmiProxyClass(
+ protected void generateProxyClass(
String mGeneratedClassName,
PublicationDescriptionItem[] interfacesToStubify)
{
@@ -113,7 +113,7 @@
createFields();
/******** METHODS *************/
//create fields
- createAltrmiGetReferenceIDMethod(mGeneratedClassName);
+ createGetReferenceIDMethod(mGeneratedClassName);
createHelperMethodForDotClassCalls(mGeneratedClassName);
createInterfaceMethods(mGeneratedClassName, interfacesToStubify);
/*
@@ -138,7 +138,7 @@
}
/**
- * Method generateAltrmiProxyClass2.
+ * Method generateProxyClass2.
* Create the Stub Class purely implementing the Interface and
* inheriting the implementation from the helper class
* Generating AltrmiGenerated2GENNAME_Main class
@@ -146,7 +146,7 @@
* @param generatedClassName the bean class name
* @param interfacesToStubify the interfaces to turn into stubs.
*/
- protected void generateAltrmiProxyClass2(
+ protected void generateProxyClass2(
String generatedClassName2,
String generatedClassName,
PublicationDescriptionItem[] interfacesToStubify)
@@ -325,7 +325,7 @@
}
/**
- * Method createAltrmiGetReferenceIDMethod.
+ * Method createGetReferenceIDMethod.
* =================adding=====================================
* public Long altrmiGetReferenceID(Object factoryThatIsAsking) {
* return mProxyHelper.getReferenceID(factoryThatIsAsking);
@@ -335,7 +335,7 @@
* @param generatedClassName the generated class name
*
*/
- protected void createAltrmiGetReferenceIDMethod(String generatedClassName)
+ protected void createGetReferenceIDMethod(String generatedClassName)
{
InstructionList il = new InstructionList();
MethodGen method =
@@ -1185,16 +1185,16 @@
*/
public Class getGeneratedClass(String generatedClassName)
{
- return getAltrmiClass(generatedClassName);
+ return getProxyClass(generatedClassName);
}
/**
- * Method getAltrmiClass.
+ * Method getProxyClass.
* This get the Class definition from the bytes
* @param className the clas name
* @return Class the class
*/
- protected Class getAltrmiClass(String className)
+ protected Class getProxyClass(String className)
{
/*
1.2 +1 -1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/remotable/RemotableDescriptor.java
Index: RemotableDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/remotable/RemotableDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemotableDescriptor.java 5 Jan 2003 23:11:41 -0000 1.1
+++ RemotableDescriptor.java 9 Jan 2003 22:55:11 -0000 1.2
@@ -64,7 +64,7 @@
/**
*
* <code>RemotableDescriptor</code> details the remotable objects that the
- * component wishes to expose over Altrmi.
+ * component wishes to expose over AltRMI.
* Usage :
* <code><pre>
* RemotableDescriptor weatherStationComponentDescriptor
1.4 +23 -23
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemotableExtensionManager.java 6 Jan 2003 23:42:11 -0000 1.3
+++ RemotableExtensionManager.java 9 Jan 2003 22:55:11 -0000 1.4
@@ -83,10 +83,10 @@
/**
* Remotable Extension handler.
* <br/>
- * It uses Altrmi to expose objects supplied by components implementing
+ * It uses AltRMI to expose objects supplied by components implementing
* the <code>Remotable</code> lifecycle extension.
* <br/>
- * One can chose between the different Altrmi transport implementation
+ * One can chose between the different AltRMI transport implementation
* using the <altrmi> configuration element while configuring the
* extension handler.
* <br/>
@@ -118,7 +118,7 @@
//*********Variables
//****************************
//
- /** Altrmi server through which the components are remoted*/
+ /** AltRMI server through which the components are remoted*/
private AbstractServer m_altrmiServer;
/** Class Retriever that fetchs the stubs on clients request */
private PlainClassRetriever m_classRetriever;
@@ -129,9 +129,9 @@
/** Indicates whether the extension handler has been activated
* successfully*/
private boolean m_initialized = false;
- /** Port number Altrmi server is listening on */
+ /** Port number AltRMI server is listening on */
private int m_port = 1234;
- /** Altrmi working directory*/
+ /** AltRMI working directory*/
private File m_altrmiWorkDirectory;
/** Generated Stub Class's Directory*/
private File m_altrmiGeneratedClassesDirectory;
@@ -148,7 +148,7 @@
public void contextualize(Context context) throws ContextException
{
getLogger().info("context");
- //Create the working directory for Altrmi.
+ //Create the working directory for AltRMI.
m_altrmiWorkDirectory =
new File((File) context.get("avalon:home"), "work-altrmi");
m_altrmiWorkDirectory.mkdir();
@@ -171,19 +171,19 @@
}
/**
- * Configure the Altrmi Server with the transport
+ * Configure the AltRMI Server with the transport
* choices specified within the configuration of the handler.
* <br/>
* <code>
* <pre>
* <altrmi type="<i>short hand for the transport type</i>"
- * classname="<i> Altrmi Server implementation</i>"
+ * classname="<i> AltRMI Server implementation</i>"
* class-retriever="<i>Class name of the ClassRetriever </i>"/>
* </pre>
* </code>
* <br/>
* Note:
- * "classname" is optional with the default of Altrmi Custom server.
+ * "classname" is optional with the default of AltRMI Custom server.
*
(org.apache.excalibur.altrmi.server.impl.socket.CompleteSocketCustomStreamServer)
* <br/>
* <br/>
@@ -196,7 +196,7 @@
{
getLogger().info("configure");
Configuration altrmiConfig = config.getChild("altrmi");
- //create Altrmi Server
+ //create AltRMI Server
if (!createServer(altrmiConfig))
{
return;
@@ -248,12 +248,12 @@
{
getLogger().error(
"\n**********************************************************************"
- + "\n Altrmi Transport class ["
+ + "\n AltRMI Transport class ["
+ className
+ "] NOT FOUND"
+ "\n Remedy:"
+ "\n
-------------------------------------------------------------------"
- + "\n Place Altrmi libraries within the classpath of the
container"
+ + "\n Place AltRMI libraries within the classpath of the
container"
+ "\n "
+ "\n Proceeding further without AltRMI beside the components
for remoting"
+
"\n**********************************************************************");
@@ -272,7 +272,7 @@
{
getLogger().error(
"\n**********************************************************************"
- + "\n Altrmi Transport class ["
+ + "\n AltRMI Transport class ["
+ className
+ "] does NOT have a constructor that "
+ "\n takes the port no. it listens to"
@@ -293,7 +293,7 @@
{
getLogger().error(
"\n**********************************************************************"
- + "\n Altrmi Transport class ["
+ + "\n AltRMI Transport class ["
+ className
+ "] does NOT extend
o.a.excalibur.altrmi.server.impl.AbstractServer "
+ "\n "
@@ -305,7 +305,7 @@
{
getLogger().error(
"\n**********************************************************************"
- + "\n An instance of Altrmi Transport class ["
+ + "\n An instance of AltRMI Transport class ["
+ className
+ "] could NOT be created"
+ "\n "
@@ -341,7 +341,7 @@
{
getLogger().error(
"\n**********************************************************************"
- + "\n Altrmi Proxy Generator["
+ + "\n AltRMI Proxy Generator["
+ strProxyGenerator
+ "] does NOT implement "
+ ProxyGenerator.class.getName()
@@ -358,7 +358,7 @@
{
getLogger().error(
"\n**********************************************************************"
- + "\n Altrmi Proxy Generator["
+ + "\n AltRMI Proxy Generator["
+ strProxyGenerator
+ "] could NOT be created"
+ "\n Exception Message[",
@@ -397,7 +397,7 @@
}
/**
- * Initialize the internal Altrmi Server
+ * Initialize the internal AltRMI Server
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize() throws Exception
@@ -405,7 +405,7 @@
if (!m_initialized)
{
getLogger().info(
- "short-circuiting Remotable lifecycle since the Altrmi Server could
NOT start successfully");
+ "short-circuiting Remotable lifecycle since the AltRMI Server could
NOT start successfully");
return;
}
getLogger().info("initialize");
@@ -453,7 +453,7 @@
}
/**
- * Stop the Altrmi Server
+ * Stop the AltRMI Server
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
public void dispose()
@@ -461,7 +461,7 @@
if (!m_initialized)
{
getLogger().info(
- "short-circuiting Remotable lifecycle since the Altrmi Server could
NOT start successfully");
+ "short-circuiting Remotable lifecycle since the AltRMI Server could
NOT start successfully");
return;
}
getLogger().info("dispose");
@@ -486,7 +486,7 @@
if (!m_initialized)
{
getLogger().info(
- "short-circuiting Remotable lifecycle since the Altrmi Server could
NOT start successfully");
+ "short-circuiting Remotable lifecycle since the AltRMI Server could
NOT start successfully");
return;
}
getLogger().debug("create");
@@ -555,7 +555,7 @@
if (!m_initialized)
{
getLogger().info(
- "short-circuiting Remotable lifecycle since the Altrmi Server could
NOT start successfully");
+ "short-circuiting Remotable lifecycle since the AltRMI Server could
NOT start successfully");
return;
}
getLogger().debug("destroy");
1.2 +1 -1
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/remotable/RemotableExtensionManager.xconfig
Index: RemotableExtensionManager.xconfig
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/remotable/RemotableExtensionManager.xconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemotableExtensionManager.xconfig 5 Jan 2003 23:11:41 -0000 1.1
+++ RemotableExtensionManager.xconfig 9 Jan 2003 22:55:11 -0000 1.2
@@ -5,7 +5,7 @@
-->
<configuration>
- <!-- Configuration for a custom Altrmi server bootup-->
+ <!-- Configuration for a custom AltRMI server bootup-->
<altrmi type="altrmi.custom"
class="org.apache.excalibur.altrmi.server.impl.socket.CompleteSocketCustomStreamServer"
class-retriever="org.apache.excalibur.altrmi.server.impl.classretrievers.JarFileClassRetriever"
1.8 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/ServerStreamReadWriter.java
Index: ServerStreamReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/ServerStreamReadWriter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServerStreamReadWriter.java 5 Jan 2003 23:24:44 -0000 1.7
+++ ServerStreamReadWriter.java 9 Jan 2003 22:55:11 -0000 1.8
@@ -19,7 +19,7 @@
* Class ServerStreamReadWriter
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class ServerStreamReadWriter extends AbstractLogEnabled
@@ -77,7 +77,7 @@
}
catch ( IOException e )
{
- getLogger().error( "Failed closing an Altrmi connection input stream:
", e);
+ getLogger().error( "Failed closing an AltRMI connection input stream:
", e);
}
try
@@ -86,7 +86,7 @@
}
catch ( IOException e )
{
- getLogger().error( "Failed closing an Altrmi connection output stream:
", e);
+ getLogger().error( "Failed closing an AltRMI connection output stream:
", e);
}
}
1.18 +8 -8
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/adapters/InvocationHandlerAdapter.java
Index: InvocationHandlerAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/adapters/InvocationHandlerAdapter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- InvocationHandlerAdapter.java 5 Jan 2003 23:24:45 -0000 1.17
+++ InvocationHandlerAdapter.java 9 Jan 2003 22:55:11 -0000 1.18
@@ -50,7 +50,7 @@
import org.apache.excalibur.altrmi.server.ClassRetrievalException;
import org.apache.excalibur.altrmi.server.ClassRetriever;
import org.apache.excalibur.altrmi.server.MethodInvocationHandler;
-import org.apache.excalibur.altrmi.server.impl.AltrmiSession;
+import org.apache.excalibur.altrmi.server.impl.Session;
import org.apache.excalibur.altrmi.server.impl.DefaultAuthenticator;
import org.apache.excalibur.altrmi.server.impl.DefaultMethodInvocationHandler;
import org.apache.excalibur.altrmi.server.impl.classretrievers.NoClassRetriever;
@@ -59,7 +59,7 @@
* Class InvocationHandlerAdapter
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public class InvocationHandlerAdapter extends PublicationAdapter
@@ -285,7 +285,7 @@
refs[ i ] =
methodInvocationHandler2.getOrMakeReferenceIDForBean(
beanImpls[ i ] );
- AltrmiSession sess = (AltrmiSession)m_sessions.get(
+ Session sess = (Session)m_sessions.get(
methodFacadeRequest.getSession() );
sess.addBeanInUse( refs[ i ], beanImpls[ i ] );
@@ -334,7 +334,7 @@
Long newRef = methodInvocationHandler.getOrMakeReferenceIDForBean( beanImpl
);
// make sure the bean is not garbage collected.
- AltrmiSession sess = (AltrmiSession)m_sessions.get(
methodFacadeRequest.getSession() );
+ Session sess = (Session)m_sessions.get( methodFacadeRequest.getSession() );
sess.addBeanInUse( newRef, beanImpl );
@@ -419,7 +419,7 @@
try
{
- m_altrmiAuthenticator.checkAuthority( lr.getAltrmiAuthentication(),
+ m_altrmiAuthenticator.checkAuthority( lr.getAuthentication(),
lr.getPublishedServiceName() );
}
catch( AuthenticationException aae )
@@ -467,7 +467,7 @@
else
{
Long session = getNewSession();
- m_sessions.put( session, new AltrmiSession( session ) );
+ m_sessions.put( session, new Session( session ) );
return new OpenConnectionReply( m_altrmiAuthenticator.getTextToSign(),
session );
}
}
@@ -522,7 +522,7 @@
new InvocationException( "TODO - you dirty rat/hacker" ) );
}
- AltrmiSession sess = (AltrmiSession) m_sessions.get( session );
+ Session sess = (Session) m_sessions.get( session );
if( sess == null )
{
System.err.println( "DEBUG- GC on missing session - " + session );
1.9 +4 -4
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket/CallbackEnabledSocketCustomStreamReadWriter.java
Index: CallbackEnabledSocketCustomStreamReadWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket/CallbackEnabledSocketCustomStreamReadWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CallbackEnabledSocketCustomStreamReadWriter.java 5 Jan 2003 23:24:45 -0000
1.8
+++ CallbackEnabledSocketCustomStreamReadWriter.java 9 Jan 2003 22:55:12 -0000
1.9
@@ -19,7 +19,7 @@
import org.apache.excalibur.altrmi.common.SerializationHelper;
import org.apache.excalibur.altrmi.server.impl.ServerStreamReadWriter;
import org.apache.excalibur.altrmi.server.impl.callback.CallbackHostContext;
-import
org.apache.excalibur.altrmi.server.impl.callback.CallbackServerClassAltrmiFactory;
+import org.apache.excalibur.altrmi.server.impl.callback.CallbackServerClassFactory;
import
org.apache.excalibur.altrmi.server.impl.callback.stream.CallbackStreamInvocationHandler;
/**
@@ -49,7 +49,7 @@
private CallbackServerClientReadWriter m_callbackServerClientReadWriter;
private CallbackStreamInvocationHandler m_callbackStreamInvocationHandler;
private CallbackHostContext m_callbackHostContext;
- private CallbackServerClassAltrmiFactory m_altrmiFactory;
+ private CallbackServerClassFactory m_altrmiFactory;
/*
* @see ServerStreamReadWriter#initialize()
@@ -81,7 +81,7 @@
m_callbackStreamInvocationHandler.setObjectReadWriter(
m_callbackServerClientReadWriter );
m_callbackHostContext = new CallbackHostContext(
m_callbackStreamInvocationHandler );
- m_altrmiFactory = new CallbackServerClassAltrmiFactory( false );
+ m_altrmiFactory = new CallbackServerClassFactory( false );
m_altrmiFactory.setInitializedHostContext( m_callbackHostContext );
1.10 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers/AbstractDynamicGeneratorClassRetriever.java
Index: AbstractDynamicGeneratorClassRetriever.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers/AbstractDynamicGeneratorClassRetriever.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractDynamicGeneratorClassRetriever.java 5 Jan 2003 23:24:45 -0000
1.9
+++ AbstractDynamicGeneratorClassRetriever.java 9 Jan 2003 22:55:12 -0000
1.10
@@ -25,7 +25,7 @@
* Class JarFileClassRetriever
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public class AbstractDynamicGeneratorClassRetriever
@@ -115,19 +115,19 @@
* @param altrmiClasspath the m_classpath
*
*/
- public void setAltrmiClasspath( String altrmiClasspath )
+ public void setClasspath( String altrmiClasspath )
{
m_altrmiClasspath = altrmiClasspath;
}
/**
- * Method addToAltrmiClasspath
+ * Method addToClasspath
*
*
* @param classpathElement an element for the m_classpath
*
*/
- public void addToAltrmiClasspath( String classpathElement )
+ public void addToClasspath( String classpathElement )
{
m_altrmiClasspath = m_altrmiClasspath + File.pathSeparator +
classpathElement;
}
1.5 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/rmi/RmiInovcationAdapter.java
Index: RmiInovcationAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/rmi/RmiInovcationAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RmiInovcationAdapter.java 5 Jan 2003 23:24:46 -0000 1.4
+++ RmiInovcationAdapter.java 9 Jan 2003 22:55:12 -0000 1.5
@@ -10,7 +10,7 @@
import java.rmi.RemoteException;
import org.apache.excalibur.altrmi.common.Reply;
import org.apache.excalibur.altrmi.common.Request;
-import org.apache.excalibur.altrmi.common.RmiAltrmiInvocationHandler;
+import org.apache.excalibur.altrmi.common.RmiInvocationHandler;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
/**
@@ -20,7 +20,7 @@
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
* @version $Revision$
*/
-public class RmiInovcationAdapter implements RmiAltrmiInvocationHandler
+public class RmiInovcationAdapter implements RmiInvocationHandler
{
/**
* The abstract server
1.6 +9 -9
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/rmi/RmiServer.java
Index: RmiServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/rmi/RmiServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RmiServer.java 5 Jan 2003 23:24:46 -0000 1.5
+++ RmiServer.java 9 Jan 2003 22:55:12 -0000 1.6
@@ -12,7 +12,7 @@
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.rmi.server.UnicastRemoteObject;
-import org.apache.excalibur.altrmi.common.RmiAltrmiInvocationHandler;
+import org.apache.excalibur.altrmi.common.RmiInvocationHandler;
import org.apache.excalibur.altrmi.server.ServerException;
import org.apache.excalibur.altrmi.server.impl.AbstractServer;
import org.apache.excalibur.altrmi.server.impl.adapters.InvocationHandlerAdapter;
@@ -21,7 +21,7 @@
* Class RmiServer for serving of AltRMI over RMI
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public class RmiServer extends AbstractServer
@@ -30,7 +30,7 @@
/**
* The invocation adapter
*/
- private RmiInovcationAdapter m_rmiAltrmiInovcationAdapter;
+ private RmiInovcationAdapter m_rmiInovcationAdapter;
/**
* The host
*/
@@ -84,14 +84,14 @@
setState(STARTING);
try
{
- m_rmiAltrmiInovcationAdapter = new RmiInovcationAdapter( this );
+ m_rmiInovcationAdapter = new RmiInovcationAdapter( this );
- UnicastRemoteObject.exportObject( m_rmiAltrmiInovcationAdapter );
+ UnicastRemoteObject.exportObject( m_rmiInovcationAdapter );
m_registry = LocateRegistry.createRegistry( m_port );
- m_registry.rebind( RmiAltrmiInvocationHandler.class.getName(),
- m_rmiAltrmiInovcationAdapter );
+ m_registry.rebind( RmiInvocationHandler.class.getName(),
+ m_rmiInovcationAdapter );
setState(STARTED);
}
catch( RemoteException re )
@@ -115,7 +115,7 @@
try
{
- m_registry.unbind( RmiAltrmiInvocationHandler.class.getName() );
+ m_registry.unbind( RmiInvocationHandler.class.getName() );
}
catch( RemoteException re )
{
1.9 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/AbstractCompleteSocketStreamServer.java
Index: AbstractCompleteSocketStreamServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/socket/AbstractCompleteSocketStreamServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractCompleteSocketStreamServer.java 5 Jan 2003 23:24:54 -0000 1.8
+++ AbstractCompleteSocketStreamServer.java 9 Jan 2003 22:55:12 -0000 1.9
@@ -20,7 +20,7 @@
* Class CompleteSocketObjectStreamServer
*
*
- * @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
+ * @author Paul Hammant
* @version $Revision$
*/
public abstract class AbstractCompleteSocketStreamServer extends AbstractServer
@@ -184,7 +184,7 @@
if( m_thread == null )
{
- m_thread = new Thread( this, "AltrmiSocketStreamServer" );
+ m_thread = new Thread( this, "SocketStreamServer" );
}
return m_thread;
1.2 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/client/impl/DefaultConnectionPingerTestCase.java
Index: DefaultConnectionPingerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/client/impl/DefaultConnectionPingerTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultConnectionPingerTestCase.java 2 Sep 2002 22:36:23 -0000 1.1
+++ DefaultConnectionPingerTestCase.java 9 Jan 2003 22:55:12 -0000 1.2
@@ -27,7 +27,7 @@
DefaultConnectionPinger pinger = new DefaultConnectionPinger(1L,10000L);
DummyInvocationHandler dummy = new DummyInvocationHandler();
pinger.start();
- pinger.setAltrmiInvocationHandler(dummy);
+ pinger.setInvocationHandler(dummy);
Thread.sleep(1000);
assertTrue("Should have pinged", dummy.isPinged());
pinger.stop();
1.7 +1 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/client/impl/DummyInvocationHandler.java
Index: DummyInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/client/impl/DummyInvocationHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DummyInvocationHandler.java 5 Jan 2003 23:24:54 -0000 1.6
+++ DummyInvocationHandler.java 9 Jan 2003 22:55:12 -0000 1.7
@@ -52,7 +52,7 @@
throw new java.lang.UnsupportedOperationException();
}
- public void setAltrmiConnectionListener(ConnectionListener
altrmiConnectionListener)
+ public void setConnectionListener(ConnectionListener altrmiConnectionListener)
{
throw new java.lang.UnsupportedOperationException();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
