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/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/altrmi InstrumentManagerAltrmiServer.java
Date Wed, 03 Apr 2002 11:36:10 GMT
hammant     02/04/03 03:36:10

  Modified:    instrument-client altrmi.xml ant.properties.sample build.xml
               instrument-client/example ant.properties.sample build.xml
               instrument-client/src/java/org/apache/avalon/excalibur/instrument/client
                        InstrumentManagerConnection.java
                        InstrumentSampleFrame.java MenuBar.java
               instrument-manager ant.properties.sample build.xml
               instrument-manager/example ant.properties.sample build.xml
               instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/altrmi
                        InstrumentManagerAltrmiServer.java
  Log:
  AltRMI now in Excalibur
  
  Revision  Changes    Path
  1.2       +1 -1      jakarta-avalon-excalibur/instrument-client/altrmi.xml
  
  Index: altrmi.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/altrmi.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- altrmi.xml	3 Apr 2002 08:15:13 -0000	1.1
  +++ altrmi.xml	3 Apr 2002 11:36:09 -0000	1.2
  @@ -17,7 +17,7 @@
       </path>
   
       <taskdef name="altrmiproxies"
  -        classname="org.apache.commons.altrmi.generator.ant.AltrmiProxyTask">
  +        classname="org.apache.excalibur.altrmi.generator.ant.AltrmiProxyTask">
           <classpath refid="project.class.path" />
       </taskdef>
           
  
  
  
  1.3       +6 -6      jakarta-avalon-excalibur/instrument-client/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	28 Mar 2002 04:06:18 -0000	1.2
  +++ ant.properties.sample	3 Apr 2002 11:36:09 -0000	1.3
  @@ -9,7 +9,7 @@
   # The ant.properties values in this directory apply only to this component, and
   # override the defaults in ../ant.properties.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/28 04:06:18 leif Exp $
  +# $Id: ant.properties.sample,v 1.3 2002/04/03 11:36:09 hammant Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -38,11 +38,11 @@
   excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-interfaces-0.1.jar
   
   # ----- Altrmi -----
  -commons-altrmi.home=../../jakarta-commons-sandbox/altrmi/dist
  -commons-altrmi-client-impl.jar=${commons-altrmi.home}/commons-altrmi-client-impl.jar
  -commons-altrmi-client-interfaces.jar=${commons-altrmi.home}/commons-altrmi-client-interfaces.jar
  -commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
  -commons-altrmi-generator.jar=${commons-altrmi.home}/commons-altrmi-generator.jar
  +excalibur-altrmi.home=../../../altrmi/build/lib
  +excalibur-altrmi-client-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-impl.jar
  +excalibur-altrmi-client-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-interfaces.jar
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-generator.jar=${excalibur-altrmi.home}/excalibur-altrmi-generator.jar
   
   # ----- JUnit Unit Test Suite, version 3.7 or later -----
   junit.home=${base.path}/junit3.7
  
  
  
  1.11      +4 -4      jakarta-avalon-excalibur/instrument-client/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	3 Apr 2002 08:15:13 -0000	1.10
  +++ build.xml	3 Apr 2002 11:36:09 -0000	1.11
  @@ -54,10 +54,10 @@
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
  -        <pathelement location="${commons-altrmi-client-impl.jar}"/>
  -        <pathelement location="${commons-altrmi-client-interfaces.jar}"/>
  -        <pathelement location="${commons-altrmi-common.jar}"/>
  -        <pathelement location="${commons-altrmi-generator.jar}"/>
  +        <pathelement location="${excalibur-altrmi-client-impl.jar}"/>
  +        <pathelement location="${excalibur-altrmi-client-interfaces.jar}"/>
  +        <pathelement location="${excalibur-altrmi-common.jar}"/>
  +        <pathelement location="${excalibur-altrmi-generator.jar}"/>
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  
  
  
  1.3       +6 -6      jakarta-avalon-excalibur/instrument-client/example/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/example/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	28 Mar 2002 04:06:18 -0000	1.2
  +++ ant.properties.sample	3 Apr 2002 11:36:09 -0000	1.3
  @@ -9,7 +9,7 @@
   # The ant.properties values in this directory apply only to this component, and
   # override the defaults in ../ant.properties.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/28 04:06:18 leif Exp $
  +# $Id: ant.properties.sample,v 1.3 2002/04/03 11:36:09 hammant Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -38,11 +38,11 @@
   excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-interfaces-0.1.jar
   
   # ----- Altrmi -----
  -commons-altrmi.home=../../../jakarta-commons-sandbox/altrmi/dist
  -commons-altrmi-client-impl.jar=${commons-altrmi.home}/commons-altrmi-client-impl.jar
  -commons-altrmi-client-interfaces.jar=${commons-altrmi.home}/commons-altrmi-client-interfaces.jar
  -commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
  -commons-altrmi-generator.jar=${commons-altrmi.home}/commons-altrmi-generator.jar
  +excalibur-altrmi.home=../altrmi/build/lib
  +excalibur-altrmi-client-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-impl.jar
  +excalibur-altrmi-client-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-interfaces.jar
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-generator.jar=${excalibur-altrmi.home}/excalibur-altrmi-generator.jar
   
   # ----- JUnit Unit Test Suite, version 3.7 or later -----
   junit.home=${base.path}/junit3.7
  
  
  
  1.4       +3 -3      jakarta-avalon-excalibur/instrument-client/example/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/example/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	28 Mar 2002 04:06:18 -0000	1.3
  +++ build.xml	3 Apr 2002 11:36:09 -0000	1.4
  @@ -38,11 +38,11 @@
               todir="${lib.dir}" preservelastmodified="yes"/>
           
           <!-- Altrmi Jars -->
  -        <copy file="${commons-altrmi-client-impl.jar}"
  +        <copy file="${excalibur-altrmi-client-impl.jar}"
               todir="${lib.dir}" preservelastmodified="yes"/>
  -        <copy file="${commons-altrmi-client-interfaces.jar}"
  +        <copy file="${excalibur-altrmi-client-interfaces.jar}"
               todir="${lib.dir}" preservelastmodified="yes"/>
  -        <copy file="${commons-altrmi-common.jar}"
  +        <copy file="${excalibur-altrmi-common.jar}"
               todir="${lib.dir}" preservelastmodified="yes"/>
           
           <!-- Instrument Client Jar -->
  
  
  
  1.6       +7 -7      jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentManagerConnection.java
  
  Index: InstrumentManagerConnection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentManagerConnection.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InstrumentManagerConnection.java	1 Apr 2002 09:21:52 -0000	1.5
  +++ InstrumentManagerConnection.java	3 Apr 2002 11:36:09 -0000	1.6
  @@ -12,17 +12,17 @@
   
   import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
   
  -import org.apache.commons.altrmi.client.AltrmiHostContext;
  -import org.apache.commons.altrmi.client.AltrmiFactory;
  -import org.apache.commons.altrmi.client.impl.socket.SocketCustomStreamHostContext;
  -import org.apache.commons.altrmi.client.impl.ClientClassAltrmiFactory;
  -import org.apache.commons.altrmi.common.AltrmiConnectionException;
  -import org.apache.commons.altrmi.common.AltrmiInvocationException;
  +import org.apache.excalibur.altrmi.client.AltrmiHostContext;
  +import org.apache.excalibur.altrmi.client.AltrmiFactory;
  +import org.apache.excalibur.altrmi.client.impl.socket.SocketCustomStreamHostContext;
  +import org.apache.excalibur.altrmi.client.impl.ClientClassAltrmiFactory;
  +import org.apache.excalibur.altrmi.common.AltrmiConnectionException;
  +import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
   
   /**
    *
    * @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2002/04/01 09:21:52 $
  + * @version CVS $Revision: 1.6 $ $Date: 2002/04/03 11:36:09 $
    * @since 4.1
    */
   class InstrumentManagerConnection
  
  
  
  1.4       +2 -2      jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentSampleFrame.java
  
  Index: InstrumentSampleFrame.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/InstrumentSampleFrame.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InstrumentSampleFrame.java	30 Mar 2002 01:30:49 -0000	1.3
  +++ InstrumentSampleFrame.java	3 Apr 2002 11:36:09 -0000	1.4
  @@ -26,12 +26,12 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.configuration.DefaultConfiguration;
   
  -import org.apache.commons.altrmi.common.AltrmiInvocationException;
  +import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
   
   /**
    *
    * @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2002/03/30 01:30:49 $
  + * @version CVS $Revision: 1.4 $ $Date: 2002/04/03 11:36:09 $
    * @since 4.1
    */
   class InstrumentSampleFrame
  
  
  
  1.5       +2 -2      jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/MenuBar.java
  
  Index: MenuBar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/src/java/org/apache/avalon/excalibur/instrument/client/MenuBar.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MenuBar.java	30 Mar 2002 01:30:49 -0000	1.4
  +++ MenuBar.java	3 Apr 2002 11:36:09 -0000	1.5
  @@ -25,12 +25,12 @@
   import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient;
   import org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentSampleDescriptor;
   
  -import org.apache.commons.altrmi.common.AltrmiInvocationException;
  +import org.apache.excalibur.altrmi.common.AltrmiInvocationException;
   
   /**
    *
    * @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2002/03/30 01:30:49 $
  + * @version CVS $Revision: 1.5 $ $Date: 2002/04/03 11:36:09 $
    * @since 4.1
    */
   public class MenuBar
  
  
  
  1.3       +5 -5      jakarta-avalon-excalibur/instrument-manager/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	30 Mar 2002 08:46:04 -0000	1.2
  +++ ant.properties.sample	3 Apr 2002 11:36:10 -0000	1.3
  @@ -9,7 +9,7 @@
   # The ant.properties values in this directory apply only to this component, and
   # override the defaults in ../ant.properties.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/30 08:46:04 jefft Exp $
  +# $Id: ant.properties.sample,v 1.3 2002/04/03 11:36:10 hammant Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -50,10 +50,10 @@
   excalibur-instrument.jar=${excalibur-instrument.home}/excalibur-instrument-0.1.jar
   
   # ----- Altrmi -----
  -commons-altrmi.home=../../jakarta-commons-sandbox/altrmi/dist
  -commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
  -commons-altrmi-server-impl.jar=${commons-altrmi.home}/commons-altrmi-server-impl.jar
  -commons-altrmi-server-interfaces.jar=${commons-altrmi.home}/commons-altrmi-server-interfaces.jar
  +excalibur-altrmi.home=../../../altrmi/build/lib
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl.jar
  +excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces.jar
   
   # ----- JUnit Unit Test Suite, version 3.7 or later -----
   junit.home=${base.path}/junit3.7
  
  
  
  1.11      +3 -3      jakarta-avalon-excalibur/instrument-manager/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.10
  +++ build.xml	3 Apr 2002 11:36:10 -0000	1.11
  @@ -56,9 +56,9 @@
           <pathelement location="${avalon-excalibur.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-instrument.jar}"/>
  -        <pathelement location="${commons-altrmi-common.jar}"/>
  -        <pathelement location="${commons-altrmi-server-impl.jar}"/>
  -        <pathelement location="${commons-altrmi-server-interfaces.jar}"/>
  +        <pathelement location="${excalibur-altrmi-common.jar}"/>
  +        <pathelement location="${excalibur-altrmi-server-impl.jar}"/>
  +        <pathelement location="${excalibur-altrmi-server-interfaces.jar}"/>
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  
  
  
  1.2       +5 -5      jakarta-avalon-excalibur/instrument-manager/example/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/example/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	26 Mar 2002 11:56:15 -0000	1.1
  +++ ant.properties.sample	3 Apr 2002 11:36:10 -0000	1.2
  @@ -9,7 +9,7 @@
   # The ant.properties values in this directory apply only to this component, and
   # override the defaults in ../ant.properties.
   #
  -# $Id: ant.properties.sample,v 1.1 2002/03/26 11:56:15 leif Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/03 11:36:10 hammant Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -58,10 +58,10 @@
   excalibur-instrument.jar=${excalibur-instrument.home}/excalibur-instrument-0.1.jar
   
   # ----- Altrmi -----
  -commons-altrmi.home=../../../jakarta-commons-sandbox/altrmi/dist
  -commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
  -commons-altrmi-server-impl.jar=${commons-altrmi.home}/commons-altrmi-server-impl.jar
  -commons-altrmi-server-interfaces.jar=${commons-altrmi.home}/commons-altrmi-server-interfaces.jar
  +excalibur-altrmi.home=../altrmi/build/lib
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl.jar
  +excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces.jar
   
   # ----- JUnit Unit Test Suite, version 3.7 or later -----
   junit.home=${base.path}/junit3.7
  
  
  
  1.3       +3 -3      jakarta-avalon-excalibur/instrument-manager/example/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/example/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	27 Mar 2002 11:38:05 -0000	1.2
  +++ build.xml	3 Apr 2002 11:36:10 -0000	1.3
  @@ -73,11 +73,11 @@
               todir="${lib.dir}" preservelastmodified="yes"/>
           
           <!-- Altrmi Jars -->
  -        <copy file="${commons-altrmi-common.jar}"
  +        <copy file="${excalibur-altrmi-common.jar}"
               todir="${lib.dir}" preservelastmodified="yes"/>
  -        <copy file="${commons-altrmi-server-impl.jar}"
  +        <copy file="${excalibur-altrmi-server-impl.jar}"
               todir="${lib.dir}" preservelastmodified="yes"/>
  -        <copy file="${commons-altrmi-server-interfaces.jar}"
  +        <copy file="${excalibur-altrmi-server-interfaces.jar}"
               todir="${lib.dir}" preservelastmodified="yes"/>
       </target>
   
  
  
  
  1.4       +6 -6      jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/altrmi/InstrumentManagerAltrmiServer.java
  
  Index: InstrumentManagerAltrmiServer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/src/java/org/apache/avalon/excalibur/instrument/manager/altrmi/InstrumentManagerAltrmiServer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InstrumentManagerAltrmiServer.java	28 Mar 2002 04:06:18 -0000	1.3
  +++ InstrumentManagerAltrmiServer.java	3 Apr 2002 11:36:10 -0000	1.4
  @@ -16,16 +16,16 @@
   
   import org.apache.avalon.framework.activity.Disposable;
   
  -import org.apache.commons.altrmi.server.AltrmiServerException;
  -import org.apache.commons.altrmi.server.PublicationDescription;
  -import org.apache.commons.altrmi.server.PublicationException;
  -import org.apache.commons.altrmi.server.impl.AbstractServer;
  -import org.apache.commons.altrmi.server.impl.socket.CompleteSocketCustomStreamServer;
  +import org.apache.excalibur.altrmi.server.AltrmiServerException;
  +import org.apache.excalibur.altrmi.server.PublicationDescription;
  +import org.apache.excalibur.altrmi.server.PublicationException;
  +import org.apache.excalibur.altrmi.server.impl.AbstractServer;
  +import org.apache.excalibur.altrmi.server.impl.socket.CompleteSocketCustomStreamServer;
   
   /**
    *
    * @author <a href="mailto:leif@silveregg.co.jp">Leif Mortenson</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2002/03/28 04:06:18 $
  + * @version CVS $Revision: 1.4 $ $Date: 2002/04/03 11:36:10 $
    * @since 4.1
    */
   public class InstrumentManagerAltrmiServer
  
  
  

--
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