avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/generator BCELProxyGeneratorTestCase.java
Date Sat, 04 Jan 2003 22:17:20 GMT
hammant     2003/01/04 14:17:20

  Modified:    altrmi/src/java/org/apache/excalibur/altrmi/client/impl
                        AbstractClientInvocationHandler.java
                        AbstractHostContext.java
                        AbstractInterfaceLookupFactory.java
                        ServerClassAltrmiFactory.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket
                        CallbackEnabledSocketCustomStreamInvocationHandler.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct
                        AbstractDirectInvocationHandler.java
                        DirectInvocationHandler.java
                        DirectMarshalledInvocationHandler.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple
                        AbstractMultipleHostContext.java
                        AbstractMultipleInvocationHandler.java
                        RotatingMultipleInvocationHandler.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming
                        DefaultAltrmiContext.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped
                        AbstractPipedStreamInvocationHandler.java
                        PipedCustomStreamHostContext.java
                        PipedObjectStreamHostContext.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi
                        RmiInvocationHandler.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket
                        AbstractSocketStreamInvocationHandler.java
                        SocketCustomStreamHostContext.java
                        SocketObjectStreamHostContext.java
                        SocketObjectStreamInvocationHandler.java
               altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream
                        ClientCustomStreamReadWriter.java
                        ClientObjectStreamReadWriter.java
                        StreamInvocationHandler.java
               altrmi/src/java/org/apache/excalibur/altrmi/common
                        AltrmiConnectionException.java
                        AltrmiInvocationException.java ProxyGenerator.java
               altrmi/src/java/org/apache/excalibur/altrmi/generator
                        AbstractProxyGenerator.java
                        BCELProxyGeneratorImpl.java ProxyGeneratorImpl.java
               altrmi/src/java/org/apache/excalibur/altrmi/generator/ant
                        AltrmiProxyTask.java
               altrmi/src/java/org/apache/excalibur/altrmi/javacompiler
                        JavaCompiler.java SunJavaCompiler.java
               altrmi/src/java/org/apache/excalibur/altrmi/server
                        ClassRetriever.java
               altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket
                        CallbackServerClientReadWriter.java
               altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers
                        AbstractDynamicGeneratorClassRetriever.java
               altrmi/src/java/org/apache/excalibur/altrmi/server/impl/direct
                        DirectMarshalledServer.java
               altrmi/src/java/org/apache/excalibur/altrmi/server/impl/http
                        CustomHttpServlet.java
               altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped
                        PipedStreamServerConnection.java
               altrmi/src/test/org/apache/excalibur/altrmi/test/generator
                        BCELProxyGeneratorTestCase.java
  Log:
  Standards corrections
  
  Revision  Changes    Path
  1.6       +13 -13    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractClientInvocationHandler.java	26 Oct 2002 14:10:48 -0000	1.5
  +++ AbstractClientInvocationHandler.java	4 Jan 2003 22:17:18 -0000	1.6
  @@ -31,10 +31,10 @@
       implements AltrmiInvocationHandler, AltrmiClientInvocationHandler
   {
   
  -    protected AltrmiConnectionPinger mConnectionPinger;
  -    protected AltrmiConnectionListener mAltrmiConnectionListener =
  +    protected AltrmiConnectionPinger m_connectionPinger;
  +    protected AltrmiConnectionListener m_altrmiConnectionListener =
           new DefaultConnectionListener();
  -    protected boolean mStopped = false;
  +    protected boolean m_stopped = false;
   
       /**
        * Method setAltrmiConnectionListener
  @@ -45,7 +45,7 @@
        */
       public void setAltrmiConnectionListener( AltrmiConnectionListener altrmiConnectionListener )
       {
  -        mAltrmiConnectionListener = altrmiConnectionListener;
  +        m_altrmiConnectionListener = altrmiConnectionListener;
       }
   
       /**
  @@ -58,13 +58,13 @@
       public void initialize() throws AltrmiConnectionException
       {
   
  -        if( mConnectionPinger == null )
  +        if( m_connectionPinger == null )
           {
  -            mConnectionPinger = new DefaultConnectionPinger();
  +            m_connectionPinger = new DefaultConnectionPinger();
           }
   
  -        mConnectionPinger.setAltrmiInvocationHandler( this );
  -        mConnectionPinger.start();
  +        m_connectionPinger.setAltrmiInvocationHandler( this );
  +        m_connectionPinger.start();
       }
   
       /**
  @@ -75,9 +75,9 @@
       public void close()
       {
   
  -        mConnectionPinger.stop();
  +        m_connectionPinger.stop();
   
  -        mStopped = true;
  +        m_stopped = true;
       }
   
       /**
  @@ -88,7 +88,7 @@
       public void ping()
       {
   
  -        if( mStopped )
  +        if( m_stopped )
           {
               throw new AltrmiConnectionClosedException( "Connection closed" );
           }
  @@ -107,7 +107,7 @@
        */
       public void setConnectionPinger( AltrmiConnectionPinger connectionPinger )
       {
  -        mConnectionPinger = connectionPinger;
  +        m_connectionPinger = connectionPinger;
       }
   
       /**
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractHostContext.java	13 Oct 2002 11:54:25 -0000	1.5
  +++ AbstractHostContext.java	4 Jan 2003 22:17:18 -0000	1.6
  @@ -21,7 +21,7 @@
   public abstract class AbstractHostContext implements AltrmiHostContext
   {
   
  -    protected final AltrmiClientInvocationHandler mAltrmiClientInvocationHandler;
  +    protected final AltrmiClientInvocationHandler m_altrmiClientInvocationHandler;
   
       /**
        * Constructor AbstractHostContext
  @@ -33,7 +33,7 @@
        */
       public AbstractHostContext( AltrmiClientInvocationHandler altrmiClientInvocationHandler )
       {
  -        mAltrmiClientInvocationHandler = altrmiClientInvocationHandler;
  +        m_altrmiClientInvocationHandler = altrmiClientInvocationHandler;
       }
   
       /**
  @@ -45,7 +45,7 @@
        */
       public AltrmiClientInvocationHandler getClientInvocationHandler()
       {
  -        return mAltrmiClientInvocationHandler;
  +        return m_altrmiClientInvocationHandler;
       }
   
       /**
  @@ -58,7 +58,7 @@
        */
       public void setAltrmiConnectionListener( AltrmiConnectionListener altrmiConnectionListener )
       {
  -        mAltrmiClientInvocationHandler.setAltrmiConnectionListener( altrmiConnectionListener );
  +        m_altrmiClientInvocationHandler.setAltrmiConnectionListener( altrmiConnectionListener );
       }
   
       public AltrmiHostContext makeSameVmHostContext(String key) {
  
  
  
  1.5       +6 -6      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractInterfaceLookupFactory.java	13 Oct 2002 11:54:25 -0000	1.4
  +++ AbstractInterfaceLookupFactory.java	4 Jan 2003 22:17:18 -0000	1.5
  @@ -22,11 +22,11 @@
   public class AbstractInterfaceLookupFactory implements AltrmiInterfaceLookupFactory
   {
   
  -    private Vector factories = new Vector();
  +    private Vector m_factories = new Vector();
   
       protected void addFactory( String factoryStringPrefix, AltrmiInterfaceLookupFactory factory )
       {
  -        factories.add( new Factory( factoryStringPrefix, factory ) );
  +        m_factories.add( new Factory( factoryStringPrefix, factory ) );
       }
   
       /**
  @@ -63,9 +63,9 @@
           throws AltrmiConnectionException
       {
   
  -        for( int i = 0; i < factories.size(); i++ )
  +        for( int i = 0; i < m_factories.size(); i++ )
           {
  -            Factory factory = (Factory)factories.elementAt( i );
  +            Factory factory = (Factory)m_factories.elementAt( i );
   
               if( factoryString.startsWith( factory.factoryStringPrefix ) )
               {
  
  
  
  1.11      +5 -5      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/ServerClassAltrmiFactory.java
  
  Index: ServerClassAltrmiFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/ServerClassAltrmiFactory.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ServerClassAltrmiFactory.java	4 Jan 2003 21:31:45 -0000	1.10
  +++ ServerClassAltrmiFactory.java	4 Jan 2003 22:17:18 -0000	1.11
  @@ -29,7 +29,7 @@
   public class ServerClassAltrmiFactory extends AbstractAltrmiFactory
   {
   
  -    private HashMap mPublishedServiceClassLoaders = new HashMap();
  +    private HashMap m_publishedServiceClassLoaders = new HashMap();
   
       /**
        * Constructor ServerClassAltrmiFactory
  @@ -60,9 +60,9 @@
           String iiClassName = "AltrmiGenerated2" + publishedServiceName + "_" + objectName;
           String className = "AltrmiGenerated" + code + publishedServiceName + "_" + objectName;
   
  -        if( mPublishedServiceClassLoaders.containsKey( beanClassName ) )
  +        if( m_publishedServiceClassLoaders.containsKey( beanClassName ) )
           {
  -            tcl = (TransportedClassLoader)mPublishedServiceClassLoaders.get( beanClassName );
  +            tcl = (TransportedClassLoader)m_publishedServiceClassLoaders.get( beanClassName );
           }
           else
           {
  @@ -118,7 +118,7 @@
                   // introspection to invoke methods.
               }
   
  -            mPublishedServiceClassLoaders.put( beanClassName, tcl );
  +            m_publishedServiceClassLoaders.put( beanClassName, tcl );
           }
   
           return tcl.loadClass( className );
  
  
  
  1.11      +7 -7      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket/CallbackEnabledSocketCustomStreamInvocationHandler.java
  
  Index: CallbackEnabledSocketCustomStreamInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/callback/socket/CallbackEnabledSocketCustomStreamInvocationHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CallbackEnabledSocketCustomStreamInvocationHandler.java	4 Jan 2003 21:31:45 -0000	1.10
  +++ CallbackEnabledSocketCustomStreamInvocationHandler.java	4 Jan 2003 22:17:18 -0000	1.11
  @@ -29,7 +29,7 @@
       extends AbstractSocketStreamInvocationHandler implements CallbackEnabledClientInvocationHandler
   {
   
  -    private CallbackEnabledClientCustomStreamReadWriter mCallbackEnabledClientCustomStreamReadWriter;
  +    private CallbackEnabledClientCustomStreamReadWriter m_callbackEnabledClientCustomStreamReadWriter;
   
       /*
        * @see AbstractSocketStreamInvocationHandler#AbstractSocketStreamInvocationHandler(String, int, ClassLoader)
  @@ -46,21 +46,21 @@
       protected ClientStreamReadWriter createClientStreamReadWriter(
           InputStream in, OutputStream out ) throws AltrmiConnectionException
       {
  -        if( mCallbackEnabledClientCustomStreamReadWriter == null )
  +        if( m_callbackEnabledClientCustomStreamReadWriter == null )
           {
  -            mCallbackEnabledClientCustomStreamReadWriter = new CallbackEnabledClientCustomStreamReadWriter( in, out, m_interfacesClassLoader );
  +            m_callbackEnabledClientCustomStreamReadWriter = new CallbackEnabledClientCustomStreamReadWriter( in, out, m_interfacesClassLoader );
           }
  -        return mCallbackEnabledClientCustomStreamReadWriter;
  +        return m_callbackEnabledClientCustomStreamReadWriter;
       }
   
       public boolean exposeObject( Object tobeExposedObject, Class tobeExposedInterface ) throws AltrmiCallbackException
       {
  -        return mCallbackEnabledClientCustomStreamReadWriter.exposeObject( tobeExposedObject, tobeExposedInterface );
  +        return m_callbackEnabledClientCustomStreamReadWriter.exposeObject( tobeExposedObject, tobeExposedInterface );
       }
   
       public String getPublishedName( Object tobeExposedObject )
       {
  -        return mCallbackEnabledClientCustomStreamReadWriter.getPublishedName( tobeExposedObject );
  +        return m_callbackEnabledClientCustomStreamReadWriter.getPublishedName( tobeExposedObject );
       }
   
       
  
  
  
  1.5       +10 -10    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractDirectInvocationHandler.java	23 May 2002 21:37:19 -0000	1.4
  +++ AbstractDirectInvocationHandler.java	4 Jan 2003 22:17:18 -0000	1.5
  @@ -32,8 +32,8 @@
   public abstract class AbstractDirectInvocationHandler extends AbstractClientInvocationHandler
   {
   
  -    protected boolean mMethodLogging = false;
  -    protected long mLastRealRequest = System.currentTimeMillis();
  +    protected boolean m_methodLogging = false;
  +    protected long m_lastRealRequest = System.currentTimeMillis();
   
       /**
        * Method setAltrmiConnectionListener
  @@ -47,7 +47,7 @@
   
           super.setAltrmiConnectionListener( altrmiConnectionListener );
   
  -        mMethodLogging = altrmiConnectionListener.methodLogging();
  +        m_methodLogging = altrmiConnectionListener.methodLogging();
       }
   
       /**
  @@ -64,7 +64,7 @@
   
           if( request.getRequestCode() != AltrmiRequestConstants.PINGREQUEST )
           {
  -            mLastRealRequest = System.currentTimeMillis();
  +            m_lastRealRequest = System.currentTimeMillis();
           }
   
           boolean again = true;
  @@ -72,7 +72,7 @@
           int tries = 0;
           long start = 0;
   
  -        if( mMethodLogging )
  +        if( m_methodLogging )
           {
               start = System.currentTimeMillis();
           }
  @@ -99,7 +99,7 @@
                   {
                       int millis = ( (TryLaterReply)reply ).getSuggestedDelayMillis();
   
  -                    mAltrmiConnectionListener.serviceSuspended( request, tries, millis );
  +                    m_altrmiConnectionListener.serviceSuspended( request, tries, millis );
   
                       again = true;
                   }
  @@ -118,11 +118,11 @@
               }
           }
   
  -        if( mMethodLogging )
  +        if( m_methodLogging )
           {
               if( request instanceof MethodRequest )
               {
  -                mAltrmiConnectionListener.methodCalled(
  +                m_altrmiConnectionListener.methodCalled(
                       ( (MethodRequest)request ).getMethodSignature(),
                       System.currentTimeMillis() - start );
               }
  @@ -147,7 +147,7 @@
        */
       public long getLastRealRequest()
       {
  -        return mLastRealRequest;
  +        return m_lastRealRequest;
       }
   
       protected abstract AltrmiReply performInvocation( AltrmiRequest request ) throws IOException;
  
  
  
  1.6       +4 -4      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/DirectInvocationHandler.java
  
  Index: DirectInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/DirectInvocationHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DirectInvocationHandler.java	6 May 2002 18:14:37 -0000	1.5
  +++ DirectInvocationHandler.java	4 Jan 2003 22:17:18 -0000	1.6
  @@ -23,7 +23,7 @@
   public final class DirectInvocationHandler extends AbstractDirectInvocationHandler
   {
   
  -    private AltrmiInvocationHandler mAltrmiInvocationHandler;
  +    private AltrmiInvocationHandler m_altrmiInvocationHandler;
   
       /**
        * Constructor DirectInvocationHandler
  @@ -37,12 +37,12 @@
       public DirectInvocationHandler( AltrmiInvocationHandler altrmiInvocationHandler )
           throws AltrmiConnectionException
       {
  -        mAltrmiInvocationHandler = altrmiInvocationHandler;
  +        m_altrmiInvocationHandler = altrmiInvocationHandler;
       }
   
       protected AltrmiReply performInvocation( AltrmiRequest request ) throws IOException
       {
  -        return mAltrmiInvocationHandler.handleInvocation( request );
  +        return m_altrmiInvocationHandler.handleInvocation( request );
       }
   
   }
  
  
  
  1.6       +10 -10    jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/DirectMarshalledInvocationHandler.java
  
  Index: DirectMarshalledInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/direct/DirectMarshalledInvocationHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DirectMarshalledInvocationHandler.java	6 May 2002 18:14:37 -0000	1.5
  +++ DirectMarshalledInvocationHandler.java	4 Jan 2003 22:17:18 -0000	1.6
  @@ -25,8 +25,8 @@
   public final class DirectMarshalledInvocationHandler extends AbstractDirectInvocationHandler
   {
   
  -    private AltrmiMarshalledInvocationHandler mAltrmiInvocationHandler;
  -    private ClassLoader mInterfacesClassLoader;
  +    private AltrmiMarshalledInvocationHandler m_altrmiInvocationHandler;
  +    private ClassLoader m_interfacesClassLoader;
   
       /**
        * Constructor DirectInvocationHandler
  @@ -41,8 +41,8 @@
           AltrmiMarshalledInvocationHandler altrmiInvocationHandler )
           throws AltrmiConnectionException
       {
  -        mAltrmiInvocationHandler = altrmiInvocationHandler;
  -        mInterfacesClassLoader = this.getClass().getClassLoader();
  +        m_altrmiInvocationHandler = altrmiInvocationHandler;
  +        m_interfacesClassLoader = this.getClass().getClassLoader();
       }
   
       /**
  @@ -59,8 +59,8 @@
           AltrmiMarshalledInvocationHandler altrmiInvocationHandler, ClassLoader classLoader )
           throws AltrmiConnectionException
       {
  -        mAltrmiInvocationHandler = altrmiInvocationHandler;
  -        mInterfacesClassLoader = classLoader;
  +        m_altrmiInvocationHandler = altrmiInvocationHandler;
  +        m_interfacesClassLoader = classLoader;
       }
   
       protected AltrmiReply performInvocation( AltrmiRequest request ) throws IOException
  @@ -69,10 +69,10 @@
           try
           {
               byte[] serRequest = SerializationHelper.getBytesFromInstance( request );
  -            byte[] serReply = mAltrmiInvocationHandler.handleInvocation( serRequest );
  +            byte[] serReply = m_altrmiInvocationHandler.handleInvocation( serRequest );
   
               return (AltrmiReply)SerializationHelper.getInstanceFromBytes( serReply,
  -                                                                          mInterfacesClassLoader );
  +                                                                          m_interfacesClassLoader );
           }
           catch( IOException e )
           {
  @@ -98,7 +98,7 @@
        */
       public ClassLoader getInterfacesClassLoader()
       {
  -        return mInterfacesClassLoader;
  +        return m_interfacesClassLoader;
       }
   
   }
  
  
  
  1.4       +9 -9      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractMultipleHostContext.java	6 May 2002 18:14:37 -0000	1.3
  +++ AbstractMultipleHostContext.java	4 Jan 2003 22:17:18 -0000	1.4
  @@ -22,8 +22,8 @@
   public abstract class AbstractMultipleHostContext implements AltrmiHostContext
   {
   
  -    private final AbstractMultipleInvocationHandler mAbstractMultipleInvocationHandler;
  -    private Vector mAltrmiHostContexts = new Vector();
  +    private final AbstractMultipleInvocationHandler m_abstractMultipleInvocationHandler;
  +    private Vector m_altrmiHostContexts = new Vector();
   
       /**
        * Constructor AbstractMultipleHostContext
  @@ -36,9 +36,9 @@
           AbstractMultipleInvocationHandler abstractMultipleInvocationHandler )
       {
   
  -        mAbstractMultipleInvocationHandler = abstractMultipleInvocationHandler;
  +        m_abstractMultipleInvocationHandler = abstractMultipleInvocationHandler;
   
  -        mAbstractMultipleInvocationHandler.setMultipleHostContext( this );
  +        m_abstractMultipleInvocationHandler.setMultipleHostContext( this );
       }
   
       /**
  @@ -50,7 +50,7 @@
        */
       public void addAltrmiHostContext( AltrmiHostContext altrmiHostContext )
       {
  -        mAltrmiHostContexts.add( altrmiHostContext );
  +        m_altrmiHostContexts.add( altrmiHostContext );
       }
   
       /**
  @@ -62,12 +62,12 @@
        */
       public void removeAltrmiHostContext( AltrmiHostContext altrmiHostContext )
       {
  -        mAltrmiHostContexts.remove( altrmiHostContext );
  +        m_altrmiHostContexts.remove( altrmiHostContext );
       }
   
       protected List getHostContexts()
       {
  -        return mAltrmiHostContexts;
  +        return m_altrmiHostContexts;
       }
   
       /**
  @@ -79,6 +79,6 @@
        */
       public AltrmiClientInvocationHandler getClientInvocationHandler()
       {
  -        return mAbstractMultipleInvocationHandler;
  +        return m_abstractMultipleInvocationHandler;
       }
   }
  
  
  
  1.5       +5 -5      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractMultipleInvocationHandler.java	26 Oct 2002 14:10:49 -0000	1.4
  +++ AbstractMultipleInvocationHandler.java	4 Jan 2003 22:17:18 -0000	1.5
  @@ -23,8 +23,8 @@
   public abstract class AbstractMultipleInvocationHandler implements AltrmiClientInvocationHandler
   {
   
  -    private AltrmiConnectionListener mAltrmiConnectionListener;
  -    protected AbstractMultipleHostContext mMultipleHostContext;
  +    private AltrmiConnectionListener m_altrmiConnectionListener;
  +    protected AbstractMultipleHostContext m_multipleHostContext;
   
       /**
        * Method setAltrmiConnectionListener
  @@ -35,12 +35,12 @@
        */
       public void setAltrmiConnectionListener( AltrmiConnectionListener altrmiConnectionListener )
       {
  -        mAltrmiConnectionListener = altrmiConnectionListener;
  +        m_altrmiConnectionListener = altrmiConnectionListener;
       }
   
       protected void setMultipleHostContext( AbstractMultipleHostContext multipleHostContext )
       {
  -        mMultipleHostContext = multipleHostContext;
  +        m_multipleHostContext = multipleHostContext;
       }
   
       /**
  
  
  
  1.6       +12 -12    jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/RotatingMultipleInvocationHandler.java
  
  Index: RotatingMultipleInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/multiple/RotatingMultipleInvocationHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RotatingMultipleInvocationHandler.java	6 May 2002 18:14:37 -0000	1.5
  +++ RotatingMultipleInvocationHandler.java	4 Jan 2003 22:17:18 -0000	1.6
  @@ -23,8 +23,8 @@
   public class RotatingMultipleInvocationHandler extends AbstractMultipleInvocationHandler
   {
   
  -    private HashMap mSessionHandlerMap = new HashMap();
  -    private int mNext;
  +    private HashMap m_sessionHandlerMap = new HashMap();
  +    private int m_next;
   
       /**
        * Method handleInvocation
  @@ -42,10 +42,10 @@
           {
               Long session = ( (Sessionable)request ).getSession();
   
  -            if( mSessionHandlerMap.containsKey( session ) )
  +            if( m_sessionHandlerMap.containsKey( session ) )
               {
                   AltrmiClientInvocationHandler cih =
  -                    (AltrmiClientInvocationHandler)mSessionHandlerMap.get( session );
  +                    (AltrmiClientInvocationHandler)m_sessionHandlerMap.get( session );
   
                   return cih.handleInvocation( request );
               }
  @@ -56,22 +56,22 @@
           }
           else if( request instanceof OpenConnectionRequest )
           {
  -            List hostContexts = mMultipleHostContext.getHostContexts();
  +            List hostContexts = m_multipleHostContext.getHostContexts();
   
  -            if( mNext >= hostContexts.size() )
  +            if( m_next >= hostContexts.size() )
               {
  -                mNext = 0;
  +                m_next = 0;
               }
   
               AltrmiClientInvocationHandler cih =
  -                (AltrmiClientInvocationHandler)hostContexts.get( mNext++ );
  +                (AltrmiClientInvocationHandler)hostContexts.get( m_next++ );
               AltrmiReply ar = cih.handleInvocation( request );
   
               if( ar instanceof OpenConnectionReply )
               {
                   Long session = ( (OpenConnectionReply)ar ).getSession();
   
  -                mSessionHandlerMap.put( session, cih );
  +                m_sessionHandlerMap.put( session, cih );
               }
   
               return ar;
  @@ -79,7 +79,7 @@
           else if( request instanceof PingRequest )
           {
               AltrmiReply pingReply = null;
  -            List hostContexts = mMultipleHostContext.getHostContexts();
  +            List hostContexts = m_multipleHostContext.getHostContexts();
   
               for( Iterator iterator = hostContexts.iterator(); iterator.hasNext(); )
               {
  @@ -106,7 +106,7 @@
           {
   
               // class request
  -            List hostContexts = mMultipleHostContext.getHostContexts();
  +            List hostContexts = m_multipleHostContext.getHostContexts();
   
               return ( (AltrmiClientInvocationHandler)hostContexts.get( 0 ) )
                   .handleInvocation( request );
  
  
  
  1.6       +8 -8      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming/DefaultAltrmiContext.java
  
  Index: DefaultAltrmiContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming/DefaultAltrmiContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultAltrmiContext.java	4 Jan 2003 21:31:46 -0000	1.5
  +++ DefaultAltrmiContext.java	4 Jan 2003 22:17:18 -0000	1.6
  @@ -29,9 +29,9 @@
   public class DefaultAltrmiContext implements Context
   {
   
  -    AltrmiInterfaceLookupFactory altrmiInterfaceLookupFactory =
  +    AltrmiInterfaceLookupFactory m_altrmiInterfaceLookupFactory =
           new DefaultInterfaceLookupFactory();
  -    AltrmiInterfaceLookup altrmiInterfaceLookup = null;
  +    AltrmiInterfaceLookup m_altrmiInterfaceLookup = null;
   
       /**
        * Constructor DefaultAltrmiContext
  @@ -133,8 +133,8 @@
               try
               {
   
  -                altrmiInterfaceLookup =
  -                    altrmiInterfaceLookupFactory
  +                m_altrmiInterfaceLookup =
  +                    m_altrmiInterfaceLookupFactory
                       .getAltrmiInterfaceLookup( transportStream + ":" + host + ":" + port + ":"
                                                  + proxyDetails + ":"
                                                  + beanDetails, interfacesClassLoader, optimize );
  @@ -180,7 +180,7 @@
   
           try
           {
  -            return altrmiInterfaceLookup.lookup( name );
  +            return m_altrmiInterfaceLookup.lookup( name );
           }
           catch( AltrmiConnectionException ace )
           {
  @@ -330,7 +330,7 @@
       public NamingEnumeration list( String name ) throws NamingException
       {
   
  -        final String[] names = altrmiInterfaceLookup.list();
  +        final String[] names = m_altrmiInterfaceLookup.list();
   
           return new NamingEnumeration()
           {
  @@ -608,7 +608,7 @@
        */
       public void close() throws NamingException
       {
  -        altrmiInterfaceLookup.close();
  +        m_altrmiInterfaceLookup.close();
       }
   
       /**
  
  
  
  1.8       +6 -6      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractPipedStreamInvocationHandler.java	13 Dec 2002 00:09:13 -0000	1.7
  +++ AbstractPipedStreamInvocationHandler.java	4 Jan 2003 22:17:18 -0000	1.8
  @@ -27,8 +27,8 @@
   public abstract class AbstractPipedStreamInvocationHandler extends StreamInvocationHandler
   {
   
  -    private PipedInputStream mIS;
  -    private PipedOutputStream mOS;
  +    private PipedInputStream m_inputStream;
  +    private PipedOutputStream m_outputStream;
   
       /**
        * Constructor AbstractPipedStreamInvocationHandler
  @@ -48,8 +48,8 @@
   
           super( interfacesClassLoader );
   
  -        mIS = is;
  -        mOS = os;
  +        m_inputStream = is;
  +        m_outputStream = os;
       }
   
       /**
  @@ -61,7 +61,7 @@
        */
       public void initialize() throws AltrmiConnectionException
       {
  -        setObjectReadWriter( createClientStreamReadWriter( mIS, mOS ) );
  +        setObjectReadWriter( createClientStreamReadWriter( m_inputStream, m_outputStream ) );
           super.initialize();
       }
   
  
  
  
  1.4       +2 -2      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/PipedCustomStreamHostContext.java
  
  Index: PipedCustomStreamHostContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/PipedCustomStreamHostContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PipedCustomStreamHostContext.java	26 Oct 2002 14:10:49 -0000	1.3
  +++ PipedCustomStreamHostContext.java	4 Jan 2003 22:17:18 -0000	1.4
  @@ -50,6 +50,6 @@
        */
       public void initialize() throws AltrmiConnectionException
       {
  -        ( (PipedCustomStreamInvocationHandler)mAltrmiClientInvocationHandler ).initialize();
  +        ( (PipedCustomStreamInvocationHandler)m_altrmiClientInvocationHandler ).initialize();
       }
   }
  
  
  
  1.5       +2 -2      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/PipedObjectStreamHostContext.java
  
  Index: PipedObjectStreamHostContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/piped/PipedObjectStreamHostContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PipedObjectStreamHostContext.java	26 Oct 2002 14:10:49 -0000	1.4
  +++ PipedObjectStreamHostContext.java	4 Jan 2003 22:17:18 -0000	1.5
  @@ -50,6 +50,6 @@
        */
       public void initialize() throws AltrmiConnectionException
       {
  -        ( (PipedObjectStreamInvocationHandler)mAltrmiClientInvocationHandler ).initialize();
  +        ( (PipedObjectStreamInvocationHandler)m_altrmiClientInvocationHandler ).initialize();
       }
   }
  
  
  
  1.9       +18 -18    jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiInvocationHandler.java
  
  Index: RmiInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/rmi/RmiInvocationHandler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- RmiInvocationHandler.java	21 Dec 2002 21:43:54 -0000	1.8
  +++ RmiInvocationHandler.java	4 Jan 2003 22:17:18 -0000	1.9
  @@ -40,10 +40,10 @@
   public final class RmiInvocationHandler extends AbstractClientInvocationHandler
   {
   
  -    private RmiAltrmiInvocationHandler mRmiAltrmiInvocationHandler;
  -    private String mURL;
  -    private boolean mMethodLogging = false;
  -    private long mLastRealRequest = System.currentTimeMillis();
  +    private RmiAltrmiInvocationHandler m_rmiAltrmiInvocationHandler;
  +    private String m_URL;
  +    private boolean m_methodLogging = false;
  +    private long m_lastRealRequest = System.currentTimeMillis();
   
       /**
        * Constructor RmiInvocationHandler
  @@ -58,11 +58,11 @@
       public RmiInvocationHandler( String host, int port ) throws AltrmiConnectionException
       {
   
  -        mURL = "rmi://" + host + ":" + port + "/" + RmiAltrmiInvocationHandler.class.getName();
  +        m_URL = "rmi://" + host + ":" + port + "/" + RmiAltrmiInvocationHandler.class.getName();
   
           try
           {
  -            mRmiAltrmiInvocationHandler = (RmiAltrmiInvocationHandler)Naming.lookup( mURL );
  +            m_rmiAltrmiInvocationHandler = (RmiAltrmiInvocationHandler)Naming.lookup( m_URL );
           }
           catch( NotBoundException nbe )
           {
  @@ -97,7 +97,7 @@
   
           super.setAltrmiConnectionListener( altrmiConnectionListener );
   
  -        mMethodLogging = altrmiConnectionListener.methodLogging();
  +        m_methodLogging = altrmiConnectionListener.methodLogging();
       }
   
       /**
  @@ -111,7 +111,7 @@
   
           try
           {
  -            mRmiAltrmiInvocationHandler = (RmiAltrmiInvocationHandler)Naming.lookup( mURL );
  +            m_rmiAltrmiInvocationHandler = (RmiAltrmiInvocationHandler)Naming.lookup( m_URL );
   
               return true;
           }
  @@ -135,7 +135,7 @@
   
           if( request.getRequestCode() != AltrmiRequestConstants.PINGREQUEST )
           {
  -            mLastRealRequest = System.currentTimeMillis();
  +            m_lastRealRequest = System.currentTimeMillis();
           }
   
           boolean again = true;
  @@ -143,7 +143,7 @@
           int tries = 0;
           long start = 0;
   
  -        if( mMethodLogging )
  +        if( m_methodLogging )
           {
               start = System.currentTimeMillis();
           }
  @@ -156,7 +156,7 @@
   
               try
               {
  -                reply = mRmiAltrmiInvocationHandler.handleInvocation( request );
  +                reply = m_rmiAltrmiInvocationHandler.handleInvocation( request );
   
                   if( reply.getReplyCode() >= 100 )
                   {
  @@ -164,7 +164,7 @@
                       {
                           int millis = ( (TryLaterReply)reply ).getSuggestedDelayMillis();
   
  -                        mAltrmiConnectionListener.serviceSuspended( request, tries, millis );
  +                        m_altrmiConnectionListener.serviceSuspended( request, tries, millis );
   
                           again = true;
                       }
  @@ -188,11 +188,11 @@
                   {
                       int retryConnectTries = 0;
   
  -                    mRmiAltrmiInvocationHandler = null;
  +                    m_rmiAltrmiInvocationHandler = null;
   
                       while( !tryReconnect() )
                       {
  -                        mAltrmiConnectionListener.serviceAbend( retryConnectTries, re );
  +                        m_altrmiConnectionListener.serviceAbend( retryConnectTries, re );
   
                           retryConnectTries++;
                       }
  @@ -205,11 +205,11 @@
               }
           }
   
  -        if( mMethodLogging )
  +        if( m_methodLogging )
           {
               if( request instanceof MethodRequest )
               {
  -                mAltrmiConnectionListener.methodCalled(
  +                m_altrmiConnectionListener.methodCalled(
                       ( (MethodRequest)request ).getMethodSignature(),
                       System.currentTimeMillis() - start );
               }
  @@ -227,6 +227,6 @@
        */
       public long getLastRealRequest()
       {
  -        return mLastRealRequest;
  +        return m_lastRealRequest;
       }
   }
  
  
  
  1.6       +6 -6      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/AbstractSocketStreamInvocationHandler.java
  
  Index: AbstractSocketStreamInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/AbstractSocketStreamInvocationHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractSocketStreamInvocationHandler.java	13 Dec 2002 00:09:14 -0000	1.5
  +++ AbstractSocketStreamInvocationHandler.java	4 Jan 2003 22:17:19 -0000	1.6
  @@ -26,8 +26,8 @@
   public abstract class AbstractSocketStreamInvocationHandler extends StreamInvocationHandler
   {
   
  -    private final String mHost;
  -    private final int mPort;
  +    private final String m_host;
  +    private final int m_port;
   
       /**
        * AbstractSocketStreamInvocationHandler
  @@ -46,8 +46,8 @@
   
           super( classLoader );
   
  -        mHost = host;
  -        mPort = port;
  +        m_host = host;
  +        m_port = port;
   
           try
           {
  @@ -101,7 +101,7 @@
       private Socket makeSocket() throws IOException
       {
   
  -        Socket socket = new Socket( mHost, mPort );
  +        Socket socket = new Socket( m_host, m_port );
   
           // The 1 second value was causing unwanted timeouts when the remote
           //  method took more than a second to run or if either system was heavily
  
  
  
  1.6       +1 -2      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamHostContext.java
  
  Index: SocketCustomStreamHostContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketCustomStreamHostContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SocketCustomStreamHostContext.java	26 Oct 2002 14:10:49 -0000	1.5
  +++ SocketCustomStreamHostContext.java	4 Jan 2003 22:17:19 -0000	1.6
  @@ -14,7 +14,6 @@
   
   import java.io.PipedInputStream;
   import java.io.PipedOutputStream;
  -import java.io.IOException;
   import java.lang.reflect.Method;
   
   /**
  
  
  
  1.6       +3 -3      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamHostContext.java
  
  Index: SocketObjectStreamHostContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamHostContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SocketObjectStreamHostContext.java	26 Oct 2002 14:10:49 -0000	1.5
  +++ SocketObjectStreamHostContext.java	4 Jan 2003 22:17:19 -0000	1.6
  @@ -27,8 +27,8 @@
   public class SocketObjectStreamHostContext extends AbstractSameVmBindableHostContext
   {
   
  -    private String mObjectOutputStreamClassName;
  -    private String mObjectInputStreamClassName;
  +    private String m_objectOutputStreamClassName;
  +    private String m_objectInputStreamClassName;
       private int m_port;
   
       /**
  
  
  
  1.6       +7 -7      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamInvocationHandler.java
  
  Index: SocketObjectStreamInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/socket/SocketObjectStreamInvocationHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SocketObjectStreamInvocationHandler.java	13 Dec 2002 00:09:14 -0000	1.5
  +++ SocketObjectStreamInvocationHandler.java	4 Jan 2003 22:17:19 -0000	1.6
  @@ -25,8 +25,8 @@
       extends AbstractSocketStreamInvocationHandler
   {
   
  -    private String mObjectOutputStreamClassName;
  -    private String mObjectInputStreamClassName;
  +    private String m_objectOutputStreamClassName;
  +    private String m_objectInputStreamClassName;
   
       /**
        * Const a SocketObjectStreamInvocationHandler.
  @@ -50,8 +50,8 @@
   
           //TODO - is this a pending problem?  The superclass invokes createClientStreamReadWriter
           // perhaps an init() is needed.
  -        mObjectInputStreamClassName = objectInputStreamClassName;
  -        mObjectOutputStreamClassName = objectOutputStreamClassName;
  +        m_objectInputStreamClassName = objectInputStreamClassName;
  +        m_objectOutputStreamClassName = objectOutputStreamClassName;
       }
   
       /**
  @@ -64,7 +64,7 @@
       protected ClientStreamReadWriter createClientStreamReadWriter(
           InputStream in, OutputStream out ) throws AltrmiConnectionException
       {
  -        return new ClientObjectStreamReadWriter( in, out, mObjectOutputStreamClassName,
  -                                                 mObjectInputStreamClassName );
  +        return new ClientObjectStreamReadWriter( in, out, m_objectOutputStreamClassName,
  +                                                 m_objectInputStreamClassName );
       }
   }
  
  
  
  1.8       +13 -13    jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/ClientCustomStreamReadWriter.java
  
  Index: ClientCustomStreamReadWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/ClientCustomStreamReadWriter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ClientCustomStreamReadWriter.java	4 Jan 2003 21:31:46 -0000	1.7
  +++ ClientCustomStreamReadWriter.java	4 Jan 2003 22:17:19 -0000	1.8
  @@ -29,9 +29,9 @@
   public class ClientCustomStreamReadWriter implements ClientStreamReadWriter
   {
   
  -    private DataInputStream mDataInputStream;
  -    private DataOutputStream mDataOutputStream;
  -    private ClassLoader mInterfacesClassLoader;
  +    private DataInputStream m_dataInputStream;
  +    private DataOutputStream m_dataOutputStream;
  +    private ClassLoader m_interfacesClassLoader;
   
   
   
  @@ -51,9 +51,9 @@
           throws AltrmiConnectionException
       {
   
  -        mDataOutputStream = new DataOutputStream( new BufferedOutputStream( outputStream ) );
  -        mDataInputStream = new DataInputStream( inputStream );
  -        mInterfacesClassLoader = interfacesClassLoader;
  +        m_dataOutputStream = new DataOutputStream( new BufferedOutputStream( outputStream ) );
  +        m_dataInputStream = new DataInputStream( inputStream );
  +        m_interfacesClassLoader = interfacesClassLoader;
       }
   
       public synchronized AltrmiReply postRequest( AltrmiRequest altrmiRequest )
  @@ -72,26 +72,26 @@
   
           byte[] aBytes = SerializationHelper.getBytesFromInstance( altrmiRequest );
   
  -        mDataOutputStream.writeInt( aBytes.length );
  -        mDataOutputStream.write( aBytes );
  -        mDataOutputStream.flush();
  +        m_dataOutputStream.writeInt( aBytes.length );
  +        m_dataOutputStream.write( aBytes );
  +        m_dataOutputStream.flush();
       }
   
       private AltrmiReply readReply() throws IOException, ClassNotFoundException
       {
   
  -        int byteArraySize = mDataInputStream.readInt();
  +        int byteArraySize = m_dataInputStream.readInt();
           byte[] byteArray = new byte[ byteArraySize ];
           int pos = 0;
           int cnt = 0;
           // Loop here until the entire array has been read in.
           while( pos < byteArraySize )
           {
  -            int read = mDataInputStream.read( byteArray, pos, byteArraySize - pos );
  +            int read = m_dataInputStream.read( byteArray, pos, byteArraySize - pos );
               pos += read;
               cnt++;
           }
           return (AltrmiReply)SerializationHelper.getInstanceFromBytes( byteArray,
  -                                                                      mInterfacesClassLoader );
  +                                                                      m_interfacesClassLoader );
       }
   }
  
  
  
  1.7       +15 -15    jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/ClientObjectStreamReadWriter.java
  
  Index: ClientObjectStreamReadWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/stream/ClientObjectStreamReadWriter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ClientObjectStreamReadWriter.java	13 Dec 2002 00:09:14 -0000	1.6
  +++ ClientObjectStreamReadWriter.java	4 Jan 2003 22:17:19 -0000	1.7
  @@ -31,10 +31,10 @@
   public class ClientObjectStreamReadWriter implements ClientStreamReadWriter
   {
   
  -    private ObjectInputStream mObjectInputStream;
  -    private ObjectOutputStream mObjectOutputStream;
  -    private String mObjectOutputStreamClassName = "java.io.ObjectOutputStream";
  -    private String mObjectInputStreamClassName = "java.io.ObjectInputStream";
  +    private ObjectInputStream m_objectInputStream;
  +    private ObjectOutputStream m_objectOutputStream;
  +    private String m_objectOutputStreamClassName = "java.io.ObjectOutputStream";
  +    private String m_objectInputStreamClassName = "java.io.ObjectInputStream";
   
       /**
        * Constructor ClientObjectStreamReadWriter
  @@ -55,24 +55,24 @@
   
           if( objectOutputStreamClassName != null )
           {
  -            mObjectOutputStreamClassName = objectOutputStreamClassName;
  +            m_objectOutputStreamClassName = objectOutputStreamClassName;
           }
   
           if( objectInputStreamClassName != null )
           {
  -            mObjectInputStreamClassName = objectInputStreamClassName;
  +            m_objectInputStreamClassName = objectInputStreamClassName;
           }
   
           try
           {
  -            Class clazz = this.getClass().getClassLoader().loadClass( mObjectOutputStreamClassName );
  +            Class clazz = this.getClass().getClassLoader().loadClass( m_objectOutputStreamClassName );
               Constructor con = clazz.getConstructor( new Class[]{OutputStream.class} );
   
  -            mObjectOutputStream = (ObjectOutputStream)con.newInstance( new Object[]{
  +            m_objectOutputStream = (ObjectOutputStream)con.newInstance( new Object[]{
                   outputStream} );
  -            clazz = this.getClass().getClassLoader().loadClass( mObjectInputStreamClassName );
  +            clazz = this.getClass().getClassLoader().loadClass( m_objectInputStreamClassName );
               con = clazz.getConstructor( new Class[]{InputStream.class} );
  -            mObjectInputStream = (ObjectInputStream)con.newInstance( new Object[]{inputStream} );
  +            m_objectInputStream = (ObjectInputStream)con.newInstance( new Object[]{inputStream} );
           }
           catch(InvocationTargetException ite)
           {
  @@ -99,14 +99,14 @@
       private void writeRequest( AltrmiRequest altrmiRequest ) throws IOException
       {
   
  -        mObjectOutputStream.writeObject( altrmiRequest );
  -        mObjectOutputStream.flush();
  +        m_objectOutputStream.writeObject( altrmiRequest );
  +        m_objectOutputStream.flush();
   
  -        //mObjectOutputStream.reset();
  +        //m_objectOutputStream.reset();
       }
   
       private AltrmiReply readReply() throws IOException, ClassNotFoundException
       {
  -        return (AltrmiReply)mObjectInputStream.readObject();
  +        return (AltrmiReply)m_objectInputStream.readObject();
       }
   }
  
  
  
  1.12      +4 -4      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StreamInvocationHandler.java	4 Jan 2003 21:31:46 -0000	1.11
  +++ StreamInvocationHandler.java	4 Jan 2003 22:17:19 -0000	1.12
  @@ -140,7 +140,7 @@
                               {
                                   int millis = ( (TryLaterReply)reply ).getSuggestedDelayMillis();
   
  -                                mAltrmiConnectionListener.serviceSuspended( request, tries,
  +                                m_altrmiConnectionListener.serviceSuspended( request, tries,
                                                                               millis );
   
                                   again = true;
  @@ -169,7 +169,7 @@
   
                               while( !tryReconnect() )
                               {
  -                                mAltrmiConnectionListener.serviceAbend( retryConnectTries, ioe );
  +                                m_altrmiConnectionListener.serviceAbend( retryConnectTries, ioe );
   
                                   retryConnectTries++;
                               }
  @@ -188,7 +188,7 @@
                   {
                       if( request instanceof MethodRequest )
                       {
  -                        mAltrmiConnectionListener.methodCalled(
  +                        m_altrmiConnectionListener.methodCalled(
                               ( (MethodRequest)request ).getMethodSignature(),
                               System.currentTimeMillis() - start );
                       }
  
  
  
  1.5       +5 -5      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/AltrmiConnectionException.java
  
  Index: AltrmiConnectionException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/AltrmiConnectionException.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AltrmiConnectionException.java	4 Jan 2003 21:31:46 -0000	1.4
  +++ AltrmiConnectionException.java	4 Jan 2003 22:17:19 -0000	1.5
  @@ -19,7 +19,7 @@
   
       // For the time being, this is backwards compatible with 1.3. It could
       // just as easily use the 1.4 constructors for Exception.
  -    private Throwable throwableCause;
  +    private Throwable m_throwableCause;
   
       /**
        * Constructor AltrmiConnectionException
  @@ -36,16 +36,16 @@
       public AltrmiConnectionException(String message, Throwable cause)
       {
           super(message);
  -        throwableCause = cause;
  +        m_throwableCause = cause;
       }
   
       public Throwable getCause()
       {
  -        return throwableCause;
  +        return m_throwableCause;
       }
   
       public String getMessage()
       {
  -        return super.getMessage() + (throwableCause != null ? " : " + throwableCause.getMessage() : "");
  +        return super.getMessage() + (m_throwableCause != null ? " : " + m_throwableCause.getMessage() : "");
       }
   }
  
  
  
  1.5       +5 -5      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/AltrmiInvocationException.java
  
  Index: AltrmiInvocationException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/AltrmiInvocationException.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AltrmiInvocationException.java	4 Jan 2003 21:31:46 -0000	1.4
  +++ AltrmiInvocationException.java	4 Jan 2003 22:17:19 -0000	1.5
  @@ -19,7 +19,7 @@
   public class AltrmiInvocationException extends RuntimeException implements Serializable
   {
   
  -    private Throwable throwableCause;
  +    private Throwable m_throwableCause;
   
       /**
        * Constructor AltrmiInvocationException
  @@ -36,17 +36,17 @@
       public AltrmiInvocationException(String message, Throwable cause)
       {
           super(message);
  -        throwableCause = cause;
  +        m_throwableCause = cause;
       }
   
       public Throwable getCause()
       {
  -        return throwableCause;
  +        return m_throwableCause;
       }
   
       public String getMessage()
       {
  -        return super.getMessage() + (throwableCause != null ? " : " + throwableCause.getMessage() : "");
  +        return super.getMessage() + (m_throwableCause != null ? " : " + m_throwableCause.getMessage() : "");
       }
   
   }
  
  
  
  1.5       +3 -3      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ProxyGenerator.java
  
  Index: ProxyGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ProxyGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProxyGenerator.java	14 Nov 2002 23:49:28 -0000	1.4
  +++ ProxyGenerator.java	4 Jan 2003 22:17:19 -0000	1.5
  @@ -47,10 +47,10 @@
       void setSrcGenDir( String srcGenDir );
   
       /**
  -     * Set the classpath
  +     * Set the m_classpath
        *
        *
  -     * @param classpath the classpath for compilation (if appl).
  +     * @param classpath the m_classpath for compilation (if appl).
        *
        */
       void setClasspath( String classpath );
  
  
  
  1.6       +5 -5      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/AbstractProxyGenerator.java
  
  Index: AbstractProxyGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/AbstractProxyGenerator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractProxyGenerator.java	3 Dec 2002 00:19:56 -0000	1.5
  +++ AbstractProxyGenerator.java	4 Jan 2003 22:17:19 -0000	1.6
  @@ -66,9 +66,9 @@
   
   
       /**
  -     * Get the classpath used during creation
  +     * Get the m_classpath used during creation
        *
  -     * @return classpath
  +     * @return m_classpath
        */
   
       public String getClasspath()
  @@ -182,10 +182,10 @@
       }
   
       /**
  -     * Set the classpath to generate with
  +     * Set the m_classpath to generate with
        *
        *
  -     * @param classpath the classpath.
  +     * @param classpath the m_classpath.
        *
        */
       public void setClasspath( String classpath )
  
  
  
  1.9       +2 -2      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BCELProxyGeneratorImpl.java	25 Nov 2002 21:17:07 -0000	1.8
  +++ BCELProxyGeneratorImpl.java	4 Jan 2003 22:17:19 -0000	1.9
  @@ -483,7 +483,7 @@
           //debug(getArguments(m));
   
           // **** TO Insert TEST Bytecode Inside the stub ,uncomment the subsequent lines
  -        //if (mVerbose)
  +        //if (m_verbose)
           //    createTestMethod(il, "calling " + m.getName());
   
           /*
  
  
  
  1.17      +2 -2      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ProxyGeneratorImpl.java	27 Nov 2002 00:08:49 -0000	1.16
  +++ ProxyGeneratorImpl.java	4 Jan 2003 22:17:19 -0000	1.17
  @@ -75,7 +75,7 @@
   
           jc.setOutputDir( getClassGenDir() );
   
  -        //jc.setCompilerPath();
  +        //jc.setM_compilerPath();
           jc.addClassPath( getClassGenDir() );
           jc.addClassPath( getClasspath() );
           jc.addDefaultClassPath();
  
  
  
  1.10      +46 -46    jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/ant/AltrmiProxyTask.java
  
  Index: AltrmiProxyTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/ant/AltrmiProxyTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AltrmiProxyTask.java	14 Nov 2002 23:49:28 -0000	1.9
  +++ AltrmiProxyTask.java	4 Jan 2003 22:17:19 -0000	1.10
  @@ -29,14 +29,14 @@
   public class AltrmiProxyTask extends Task
   {
   
  -    protected String[] mInterfacesToExpose;
  -    protected String[] mAdditionalFacades;
  -    protected File mSrcGenDir;
  -    protected File mClassGenDir;
  -    protected String mGenName;
  -    protected Path mClasspath;
  -    protected String mVerbose = "false";
  -    private String mGeneratorClass="org.apache.excalibur.altrmi.generator.ProxyGeneratorImpl";
  +    protected String[] m_interfacesToExpose;
  +    protected String[] m_additionalFacades;
  +    protected File m_srcGenDir;
  +    protected File m_classGenDir;
  +    protected String m_genName;
  +    protected Path m_classpath;
  +    protected String m_verbose = "false";
  +    private String m_generatorClass="org.apache.excalibur.altrmi.generator.ProxyGeneratorImpl";
   
       /**
        * Constructor AltrmiProxyTask
  @@ -65,9 +65,9 @@
               strings.add( st.nextToken().trim() );
           }
   
  -        mInterfacesToExpose = new String[ strings.size() ];
  +        m_interfacesToExpose = new String[ strings.size() ];
   
  -        strings.copyInto( mInterfacesToExpose );
  +        strings.copyInto( m_interfacesToExpose );
       }
   
       /**
  @@ -88,9 +88,9 @@
               strings.add( st.nextToken().trim() );
           }
   
  -        mAdditionalFacades = new String[ strings.size() ];
  +        m_additionalFacades = new String[ strings.size() ];
   
  -        strings.copyInto( mAdditionalFacades );
  +        strings.copyInto( m_additionalFacades );
       }
   
       /**
  @@ -102,7 +102,7 @@
        */
       public void setSrcgendir( File srcGenDir )
       {
  -        mSrcGenDir = srcGenDir;
  +        m_srcGenDir = srcGenDir;
       }
   
       /**
  @@ -114,7 +114,7 @@
        */
       public void setClassgendir( File classGenDir )
       {
  -        mClassGenDir = classGenDir;
  +        m_classGenDir = classGenDir;
       }
   
       /**
  @@ -126,11 +126,11 @@
        */
       public void setGenname( String genName )
       {
  -        this.mGenName = genName;
  +        this.m_genName = genName;
       }
   
       /**
  -     * Method setClasspath
  +     * Method setM_classpath
        *
        *
        * @param classpath
  @@ -139,13 +139,13 @@
       public void setClasspath( Path classpath )
       {
   
  -        if( mClasspath == null )
  +        if( m_classpath == null )
           {
  -            mClasspath = classpath;
  +            m_classpath = classpath;
           }
           else
           {
  -            mClasspath.append( classpath );
  +            m_classpath.append( classpath );
           }
       }
   
  @@ -159,12 +159,12 @@
       public Path createClasspath()
       {
   
  -        if( mClasspath == null )
  +        if( m_classpath == null )
           {
  -            mClasspath = new Path( project );
  +            m_classpath = new Path( project );
           }
   
  -        return mClasspath.createPath();
  +        return m_classpath.createPath();
       }
   
       /**
  @@ -188,7 +188,7 @@
        */
       public void setVerbose( String verbose )
       {
  -        mVerbose = verbose;
  +        m_verbose = verbose;
       }
   
       /**
  @@ -197,7 +197,7 @@
        */
       public void setGeneratorClass(String generatorClass)
       {
  -        this.mGeneratorClass = generatorClass;
  +        this.m_generatorClass = generatorClass;
       }
   
       /**
  @@ -210,22 +210,22 @@
       public void execute() throws BuildException
       {
   
  -        if( mInterfacesToExpose == null )
  +        if( m_interfacesToExpose == null )
           {
               throw new BuildException( "Specify at least one interface to expose" );
           }
   
  -        if( mSrcGenDir == null )
  +        if( m_srcGenDir == null )
           {
               throw new BuildException( "Specify the directory to generate Java source in" );
           }
   
  -        if( mClassGenDir == null )
  +        if( m_classGenDir == null )
           {
               throw new BuildException( "Specify the directory to generate Java classes in" );
           }
   
  -        if( mGenName == null )
  +        if( m_genName == null )
           {
               throw new BuildException( "Specify the name to use for lookup" );
           }
  @@ -236,43 +236,43 @@
           {
               proxyGenerator =
                   (ProxyGenerator)Class
  -                .forName( mGeneratorClass )
  +                .forName( m_generatorClass )
                   .newInstance();
           }
           catch( Exception e )
           {
               e.printStackTrace();
   
  -            throw new RuntimeException( "PrimaryGenerator Impl jar not in classpath" );
  +            throw new RuntimeException( "PrimaryGenerator Impl jar not in m_classpath" );
           }
   
           try
           {
  -            proxyGenerator.setSrcGenDir( mSrcGenDir.getAbsolutePath() );
  -            proxyGenerator.setClassGenDir( mClassGenDir.getAbsolutePath() );
  -            proxyGenerator.setGenName( mGenName );
  -            proxyGenerator.verbose( Boolean.valueOf( mVerbose ).booleanValue() );
  -            proxyGenerator.setClasspath( mClasspath.concatSystemClasspath( "ignore" ).toString() );
  +            proxyGenerator.setSrcGenDir( m_srcGenDir.getAbsolutePath() );
  +            proxyGenerator.setClassGenDir( m_classGenDir.getAbsolutePath() );
  +            proxyGenerator.setGenName( m_genName );
  +            proxyGenerator.verbose( Boolean.valueOf( m_verbose ).booleanValue() );
  +            proxyGenerator.setClasspath( m_classpath.concatSystemClasspath( "ignore" ).toString() );
   
  -            PublicationDescriptionItem[] interfacesToExpose = new PublicationDescriptionItem[ mInterfacesToExpose.length ];
  -            ClassLoader classLoader = new AntClassLoader( getProject(), mClasspath );
  +            PublicationDescriptionItem[] interfacesToExpose = new PublicationDescriptionItem[ m_interfacesToExpose.length ];
  +            ClassLoader classLoader = new AntClassLoader( getProject(), m_classpath );
   
  -            for( int i = 0; i < mInterfacesToExpose.length; i++ )
  +            for( int i = 0; i < m_interfacesToExpose.length; i++ )
               {
  -                String cn = mInterfacesToExpose[ i ];
  +                String cn = m_interfacesToExpose[ i ];
   
                   interfacesToExpose[ i ] = new PublicationDescriptionItem(classLoader.loadClass( cn ));
               }
   
               proxyGenerator.setInterfacesToExpose( interfacesToExpose );
   
  -            if( mAdditionalFacades != null )
  +            if( m_additionalFacades != null )
               {
  -                PublicationDescriptionItem[] additionalFacades = new PublicationDescriptionItem[ mAdditionalFacades.length ];
  +                PublicationDescriptionItem[] additionalFacades = new PublicationDescriptionItem[ m_additionalFacades.length ];
   
  -                for( int i = 0; i < mAdditionalFacades.length; i++ )
  +                for( int i = 0; i < m_additionalFacades.length; i++ )
                   {
  -                    String cn = mAdditionalFacades[ i ];
  +                    String cn = m_additionalFacades[ i ];
   
                       additionalFacades[ i ] = new PublicationDescriptionItem(classLoader.loadClass( cn ));
                   }
  @@ -282,9 +282,9 @@
   
               ClassLoader classLoader2 = null;
   
  -            if( mClasspath != null )
  +            if( m_classpath != null )
               {
  -                classLoader2 = new AntClassLoader( project, mClasspath );
  +                classLoader2 = new AntClassLoader( project, m_classpath );
               }
               else
               {
  
  
  
  1.5       +16 -16    jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/javacompiler/JavaCompiler.java
  
  Index: JavaCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/javacompiler/JavaCompiler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JavaCompiler.java	5 Sep 2002 22:22:37 -0000	1.4
  +++ JavaCompiler.java	4 Jan 2003 22:17:19 -0000	1.5
  @@ -73,11 +73,11 @@
   {
   
       static String CPSEP = System.getProperty( "path.separator" );
  -    protected String classpath;
  -    protected String compilerPath = "jikes";
  -    protected String outdir;
  -    protected ByteArrayOutputStream out;
  -    protected boolean classDebugInfo = false;
  +    protected String m_classpath;
  +    protected String m_compilerPath = "jikes";
  +    protected String m_outdir;
  +    protected ByteArrayOutputStream m_out;
  +    protected boolean m_classDebugInfo = false;
   
       protected JavaCompiler()
       {
  @@ -87,21 +87,21 @@
       /**
        * Specify where the compiler can be found
        */
  -    public void setCompilerPath( String compilerPath )
  +    public void setCompilerPath( String m_compilerPath )
       {
   
  -        if( compilerPath != null )
  +        if( m_compilerPath != null )
           {
  -            this.compilerPath = compilerPath;
  +            this.m_compilerPath = m_compilerPath;
           }
       }
   
       /**
        * Set the class path for the compiler
        */
  -    public void setClasspath( String classpath )
  +    public void setClasspath( String m_classpath )
       {
  -        this.classpath = classpath;
  +        this.m_classpath = m_classpath;
       }
   
       /**
  @@ -115,7 +115,7 @@
       {
   
           // XXX use StringBuffer
  -        classpath = classpath + CPSEP + path;
  +        m_classpath = m_classpath + CPSEP + path;
       }
   
       /**
  @@ -133,7 +133,7 @@
        */
       public void setOutputDir( String outdir )
       {
  -        this.outdir = outdir;
  +        this.m_outdir = outdir;
       }
   
       /**
  @@ -145,7 +145,7 @@
        */
       public String getCompilerMessage()
       {
  -        return out.toString();
  +        return m_out.toString();
       }
   
       /**
  @@ -153,7 +153,7 @@
        */
       public void setClassDebugInfo( boolean classDebugInfo )
       {
  -        this.classDebugInfo = classDebugInfo;
  +        this.m_classDebugInfo = classDebugInfo;
       }
   
       /**
  @@ -170,7 +170,7 @@
        */
       public void reset()
       {
  -        out = new ByteArrayOutputStream( 256 );
  +        m_out = new ByteArrayOutputStream( 256 );
       }
   
       // -------------------- Compile method --------------------
  @@ -240,7 +240,7 @@
   
       //-------------------- Class path utils --------------------
   
  -    /** Create a classpath string from a URL[] ( used in URLClassLoader )
  +    /** Create a m_classpath string from a URL[] ( used in URLClassLoader )
        */
       public static String extractClassPath( URL urls[] )
       {
  
  
  
  1.4       +4 -4      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/javacompiler/SunJavaCompiler.java
  
  Index: SunJavaCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/javacompiler/SunJavaCompiler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SunJavaCompiler.java	24 Apr 2002 12:43:00 -0000	1.3
  +++ SunJavaCompiler.java	4 Jan 2003 22:17:19 -0000	1.4
  @@ -82,19 +82,19 @@
       public boolean doCompile( String source )
       {
   
  -        Main compiler = new Main( out, "jsp->javac" );
  +        Main compiler = new Main( m_out, "jsp->javac" );
           String[] args;
   
  -        if( classDebugInfo )
  +        if( m_classDebugInfo )
           {
               args = new String[]
               {
  -                "-g", "-classpath", classpath, "-d", outdir, source
  +                "-g", "-classpath", m_classpath, "-d", m_outdir, source
               };
           }
           else
           {
  -            args = new String[]{"-classpath", classpath, "-d", outdir, source};
  +            args = new String[]{"-classpath", m_classpath, "-d", m_outdir, source};
           }
   
           return compiler.compile( args );
  
  
  
  1.4       +2 -2      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/ClassRetriever.java
  
  Index: ClassRetriever.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/ClassRetriever.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClassRetriever.java	24 Aug 2002 11:39:05 -0000	1.3
  +++ ClassRetriever.java	4 Jan 2003 22:17:19 -0000	1.4
  @@ -10,7 +10,7 @@
   /**
    * A ClassRetriever is a thing that allows the serverside AltRMI deployer to choose
    * how class defs for proxies are retrieved. They may not want them in the normal
  - * classpath.
  + * m_classpath.
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  
  
  
  1.5       +4 -4      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket/CallbackServerClientReadWriter.java
  
  Index: CallbackServerClientReadWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/callback/socket/CallbackServerClientReadWriter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CallbackServerClientReadWriter.java	13 Dec 2002 00:09:14 -0000	1.4
  +++ CallbackServerClientReadWriter.java	4 Jan 2003 22:17:19 -0000	1.5
  @@ -23,7 +23,7 @@
   public class CallbackServerClientReadWriter implements ClientStreamReadWriter
   {
   
  -    private CallbackEnabledSocketCustomStreamReadWriter mCallbackEnabledCustomSocketStreamReadWriter;
  +    private CallbackEnabledSocketCustomStreamReadWriter m_callbackEnabledCustomSocketStreamReadWriter;
   
       /**
        * Constructor CallbackServerClientReadWriter
  @@ -35,7 +35,7 @@
       CallbackServerClientReadWriter(
           CallbackEnabledSocketCustomStreamReadWriter callbackEnabledCustomSocketStreamReadWriter )
       {
  -        this.mCallbackEnabledCustomSocketStreamReadWriter =
  +        this.m_callbackEnabledCustomSocketStreamReadWriter =
               callbackEnabledCustomSocketStreamReadWriter;
       }
   
  @@ -44,7 +44,7 @@
       {
   
           AltrmiReply altrmiReply =
  -            mCallbackEnabledCustomSocketStreamReadWriter.postRequest( altrmiRequest );
  +            m_callbackEnabledCustomSocketStreamReadWriter.postRequest( altrmiRequest );
   
           return altrmiReply;
       }
  
  
  
  1.8       +6 -6      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractDynamicGeneratorClassRetriever.java	4 Jan 2003 21:31:46 -0000	1.7
  +++ AbstractDynamicGeneratorClassRetriever.java	4 Jan 2003 22:17:20 -0000	1.8
  @@ -109,10 +109,10 @@
       }
   
       /**
  -     * Use this classpath during retrieval.
  +     * Use this m_classpath during retrieval.
        *
        *
  -     * @param altrmiClasspath the classpath
  +     * @param altrmiClasspath the m_classpath
        *
        */
       public void setAltrmiClasspath( String altrmiClasspath )
  @@ -124,7 +124,7 @@
        * Method addToAltrmiClasspath
        *
        *
  -     * @param classpathElement an element for the classpath
  +     * @param classpathElement an element for the m_classpath
        *
        */
       public void addToAltrmiClasspath( String classpathElement )
  @@ -323,13 +323,13 @@
                       System.err.println( "*                                     *" );
                       System.err.println( "* AltRMI problem......                *" );
                       System.err.println( "* Please copy JAVA_HOME/lib/tools.jar *" );
  -                    System.err.println( "* to your applications classpath so   *" );
  +                    System.err.println( "* to your applications m_classpath so   *" );
                       System.err.println( "* that proxys can be compiled.        *" );
                       System.err.println( "*                                     *" );
                       System.err.println( "***************************************" );
   
                       throw new ProxyGenerationEnvironmentException(
  -                        "tools.jar not found in classpath." );
  +                        "tools.jar not found in m_classpath." );
                   }
   
                   System.err.println( "******" );
  
  
  
  1.4       +6 -6      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/direct/DirectMarshalledServer.java
  
  Index: DirectMarshalledServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/direct/DirectMarshalledServer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DirectMarshalledServer.java	21 Sep 2002 15:52:57 -0000	1.3
  +++ DirectMarshalledServer.java	4 Jan 2003 22:17:20 -0000	1.4
  @@ -26,7 +26,7 @@
       implements AltrmiMarshalledInvocationHandler
   {
   
  -    MarshalledInvocationHandlerAdapter mMarshalledInovcationHandlerAdapter;
  +    MarshalledInvocationHandlerAdapter m_marshalledInovcationHandlerAdapter;
   
       /**
        * Constructor DirectMarshalledServer makes a new InvocationHandlerAdapter.
  @@ -35,7 +35,7 @@
        */
       public DirectMarshalledServer()
       {
  -        mMarshalledInovcationHandlerAdapter = new MarshalledInvocationHandlerAdapter( this );
  +        m_marshalledInovcationHandlerAdapter = new MarshalledInvocationHandlerAdapter( this );
       }
   
       /**
  @@ -50,7 +50,7 @@
   
           super( inovcationHandlerAdapter );
   
  -        mMarshalledInovcationHandlerAdapter = new MarshalledInvocationHandlerAdapter( this );
  +        m_marshalledInovcationHandlerAdapter = new MarshalledInvocationHandlerAdapter( this );
       }
   
       /**
  @@ -68,7 +68,7 @@
   
           super( inovcationHandlerAdapter );
   
  -        mMarshalledInovcationHandlerAdapter = marshalledInovcationHandlerAdapter;
  +        m_marshalledInovcationHandlerAdapter = marshalledInovcationHandlerAdapter;
       }
   
       /**
  @@ -105,7 +105,7 @@
        */
       public byte[] handleInvocation( byte[] request )
       {
  -        return mMarshalledInovcationHandlerAdapter.handleInvocation( request );
  +        return m_marshalledInovcationHandlerAdapter.handleInvocation( request );
       }
   
       /**
  
  
  
  1.4       +5 -5      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/http/CustomHttpServlet.java
  
  Index: CustomHttpServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/http/CustomHttpServlet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CustomHttpServlet.java	27 Dec 2002 00:07:27 -0000	1.3
  +++ CustomHttpServlet.java	4 Jan 2003 22:17:20 -0000	1.4
  @@ -32,14 +32,14 @@
   public class CustomHttpServlet extends HttpServlet
   {
   
  -    CustomHttpServer customHttpServer;
  +    CustomHttpServer m_customHttpServer;
   
   
       public CustomHttpServlet()
       {
           try
           {
  -            customHttpServer = new CustomHttpServer();
  +            m_customHttpServer = new CustomHttpServer();
           }
           catch (AltrmiServerException e)
           {
  @@ -67,7 +67,7 @@
                   outputWriter.write(b);
               }
           };
  -        customHttpServer.processRequest(in,out);
  +        m_customHttpServer.processRequest(in,out);
       }
   
       public void doPost(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException
  @@ -78,7 +78,7 @@
   
       public AltrmiPublisher getPublisher()
       {
  -        return customHttpServer;
  +        return m_customHttpServer;
   
       }
   
  
  
  
  1.4       +7 -7      jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped/PipedStreamServerConnection.java
  
  Index: PipedStreamServerConnection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/piped/PipedStreamServerConnection.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PipedStreamServerConnection.java	21 Sep 2002 15:52:57 -0000	1.3
  +++ PipedStreamServerConnection.java	4 Jan 2003 22:17:20 -0000	1.4
  @@ -27,12 +27,12 @@
       /**
        * The piped input stream.
        */
  -    private PipedInputStream mPipedIn;
  +    private PipedInputStream m_pipedIn;
   
       /**
        * The piped output stream.
        */
  -    private PipedOutputStream mPipedOut;
  +    private PipedOutputStream m_pipedOut;
   
       /**
        * Construct a PipedStreamServerConnection
  @@ -51,8 +51,8 @@
   
           super( abstractServer, readWriter );
   
  -        mPipedIn = pipedIn;
  -        mPipedOut = pipedOut;
  +        m_pipedIn = pipedIn;
  +        m_pipedOut = pipedOut;
       }
   
       /**
  @@ -63,7 +63,7 @@
   
           try
           {
  -            mPipedIn.close();
  +            m_pipedIn.close();
           }
           catch( IOException e )
           {
  @@ -72,7 +72,7 @@
   
           try
           {
  -            mPipedOut.close();
  +            m_pipedOut.close();
           }
           catch( IOException e )
           {
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BCELProxyGeneratorTestCase.java	14 Nov 2002 23:49:29 -0000	1.5
  +++ BCELProxyGeneratorTestCase.java	4 Jan 2003 22:17:20 -0000	1.6
  @@ -76,7 +76,7 @@
           {
               e.printStackTrace();
   
  -            throw new RuntimeException("PrimaryGenerator Impl jar not in classpath");
  +            throw new RuntimeException("PrimaryGenerator Impl jar not in m_classpath");
           }
           //create the Proxy Class using the BCEL Generator
           _createNewClass();    
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message