commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test DirectTest.java PipeTest.java RmiClientTest.java RmiServerTest.java SocketClientTest.java SocketServerTest.java TestClient.java
Date Sun, 30 Dec 2001 01:12:04 GMT
hammant     01/12/29 17:12:04

  Modified:    armi     test.xml
               armi/src/java/org/apache/commons/armi/client/impl
                        ServerClassArmiFactory.java
               armi/src/java/org/apache/commons/armi/test DirectTest.java
                        PipeTest.java RmiClientTest.java RmiServerTest.java
                        SocketClientTest.java SocketServerTest.java
                        TestClient.java
  Log:
  Small fixes to script and output
  
  Revision  Changes    Path
  1.3       +5 -1      jakarta-commons-sandbox/armi/test.xml
  
  Index: test.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/armi/test.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- test.xml	30 Dec 2001 00:42:10 -0000	1.2
  +++ test.xml	30 Dec 2001 01:12:04 -0000	1.3
  @@ -3,7 +3,7 @@
   
   <!--
           "Alt (to) RMI" component of the Jakarta Commons Subproject
  -        $Id: test.xml,v 1.2 2001/12/30 00:42:10 hammant Exp $
  +        $Id: test.xml,v 1.3 2001/12/30 01:12:04 hammant Exp $
   -->
   
   
  @@ -124,12 +124,14 @@
     <target name="test1a-client" depends="generate">
       <java classname="org.apache.commons.armi.test.SocketClientTest" fork="true">
         <classpath refid="testA.classpath"/>
  +      <arg value="C"/>
       </java>      
     </target>
   
     <target name="test2a" depends="generate">
       <java classname="org.apache.commons.armi.test.PipeTest" fork="true">
         <classpath refid="testA.classpath"/>
  +      <arg value="C"/>
       </java>      
     </target>
   
  @@ -142,12 +144,14 @@
     <target name="test3a-client" depends="generate">
       <java classname="org.apache.commons.armi.test.RmiClientTest" fork="true">
         <classpath refid="testA.classpath"/>
  +      <arg value="C"/>
       </java>      
     </target>
   
     <target name="test4a" depends="generate">
       <java classname="org.apache.commons.armi.test.DirectTest" fork="true">
         <classpath refid="testA.classpath"/>
  +      <arg value="C"/>
       </java>      
     </target>
   
  
  
  
  1.2       +2 -3      jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/client/impl/ServerClassArmiFactory.java
  
  Index: ServerClassArmiFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/client/impl/ServerClassArmiFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServerClassArmiFactory.java	30 Dec 2001 00:42:10 -0000	1.1
  +++ ServerClassArmiFactory.java	30 Dec 2001 01:12:04 -0000	1.2
  @@ -1,8 +1,8 @@
   
   /*
  - * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/client/impl/ServerClassArmiFactory.java,v
1.1 2001/12/30 00:42:10 hammant Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/12/30 00:42:10 $
  + * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/client/impl/ServerClassArmiFactory.java,v
1.2 2001/12/30 01:12:04 hammant Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/12/30 01:12:04 $
    *
    * ====================================================================
    *
  @@ -76,7 +76,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class ServerClassArmiFactory extends ArmiFactory {
   
  @@ -107,7 +107,6 @@
                   mPublishedServiceClassLoaders.put(publishedServiceName, tcl);
               }
               BaseServedObject bo = (BaseServedObject) tcl.loadClass("ArmiGenerated" + publishedServiceName).newInstance();
  -            System.out.println("CL=" + bo.getClass().getClassLoader().getClass().getName());
               bo.armiSetInvocationHandler(hostContext.getInvocationHandler());
               bo.armiSetPublishedObjectName(publishedServiceName);
               return bo;
  
  
  
  1.3       +7 -5      jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/DirectTest.java
  
  Index: DirectTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/DirectTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DirectTest.java	30 Dec 2001 00:42:10 -0000	1.2
  +++ DirectTest.java	30 Dec 2001 01:12:04 -0000	1.3
  @@ -1,8 +1,8 @@
   
   /*
  - * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/DirectTest.java,v
1.2 2001/12/30 00:42:10 hammant Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/12/30 00:42:10 $
  + * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/DirectTest.java,v
1.3 2001/12/30 01:12:04 hammant Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/12/30 01:12:04 $
    *
    * ====================================================================
    *
  @@ -78,7 +78,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class DirectTest {
   
  @@ -93,6 +93,8 @@
        */
       public static void main(String[] args) throws Exception {
   
  +        System.out.println("Direct Test");
  +
           if (args[0].equals("S")) {
               ArmiFactory.setDefaultArmiFactory(new ServerClassArmiFactory());
           }
  @@ -113,7 +115,7 @@
        *
        *
        * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  -     * @version $Revision: 1.2 $
  +     * @version $Revision: 1.3 $
        */
       static class DirectTestClient implements Runnable {
   
  
  
  
  1.3       +7 -5      jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/PipeTest.java
  
  Index: PipeTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/PipeTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PipeTest.java	30 Dec 2001 00:42:10 -0000	1.2
  +++ PipeTest.java	30 Dec 2001 01:12:04 -0000	1.3
  @@ -1,8 +1,8 @@
   
   /*
  - * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/PipeTest.java,v
1.2 2001/12/30 00:42:10 hammant Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/12/30 00:42:10 $
  + * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/PipeTest.java,v
1.3 2001/12/30 01:12:04 hammant Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/12/30 01:12:04 $
    *
    * ====================================================================
    *
  @@ -79,7 +79,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class PipeTest {
   
  @@ -94,6 +94,8 @@
        */
       public static void main(String[] args) throws Exception {
   
  +        System.out.println("Piped Test");
  +
           if (args[0].equals("S")) {
               ArmiFactory.setDefaultArmiFactory(new ServerClassArmiFactory());
           }
  @@ -114,7 +116,7 @@
        *
        *
        * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  -     * @version $Revision: 1.2 $
  +     * @version $Revision: 1.3 $
        */
       static class PipedTestClient implements Runnable {
   
  
  
  
  1.3       +6 -4      jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiClientTest.java
  
  Index: RmiClientTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiClientTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RmiClientTest.java	30 Dec 2001 00:42:10 -0000	1.2
  +++ RmiClientTest.java	30 Dec 2001 01:12:04 -0000	1.3
  @@ -1,8 +1,8 @@
   
   /*
  - * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiClientTest.java,v
1.2 2001/12/30 00:42:10 hammant Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/12/30 00:42:10 $
  + * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiClientTest.java,v
1.3 2001/12/30 01:12:04 hammant Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/12/30 01:12:04 $
    *
    * ====================================================================
    *
  @@ -74,7 +74,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class RmiClientTest {
   
  @@ -88,6 +88,8 @@
        *
        */
       public static void main(String[] args) throws Exception {
  +
  +        System.out.println("ARMI over RMI Client");
   
           if (args[0].equals("S")) {
               ArmiFactory.setDefaultArmiFactory(new ServerClassArmiFactory());
  
  
  
  1.2       +6 -4      jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiServerTest.java
  
  Index: RmiServerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiServerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RmiServerTest.java	28 Dec 2001 18:08:39 -0000	1.1
  +++ RmiServerTest.java	30 Dec 2001 01:12:04 -0000	1.2
  @@ -1,8 +1,8 @@
   
   /*
  - * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiServerTest.java,v
1.1 2001/12/28 18:08:39 hammant Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/12/28 18:08:39 $
  + * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/RmiServerTest.java,v
1.2 2001/12/30 01:12:04 hammant Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/12/30 01:12:04 $
    *
    * ====================================================================
    *
  @@ -73,7 +73,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class RmiServerTest {
   
  @@ -87,6 +87,8 @@
        *
        */
       public static void main(String[] args) throws Exception {
  +
  +        System.out.println("ARMI over RMI Server");
   
           RmiServer rs = new RmiServer("127.0.0.1", 4321);
           TestInterfaceImpl ti = new TestInterfaceImpl();
  
  
  
  1.3       +6 -4      jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketClientTest.java
  
  Index: SocketClientTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketClientTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SocketClientTest.java	30 Dec 2001 00:42:10 -0000	1.2
  +++ SocketClientTest.java	30 Dec 2001 01:12:04 -0000	1.3
  @@ -1,8 +1,8 @@
   
   /*
  - * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketClientTest.java,v
1.2 2001/12/30 00:42:10 hammant Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/12/30 00:42:10 $
  + * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketClientTest.java,v
1.3 2001/12/30 01:12:04 hammant Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/12/30 01:12:04 $
    *
    * ====================================================================
    *
  @@ -77,7 +77,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class SocketClientTest {
   
  @@ -91,6 +91,8 @@
        *
        */
       public static void main(String[] args) throws Exception {
  +
  +        System.out.println("Stream over Socket Client");
   
           if (args[0].equals("S")) {
               ArmiFactory.setDefaultArmiFactory(new ServerClassArmiFactory());
  
  
  
  1.2       +6 -4      jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketServerTest.java
  
  Index: SocketServerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketServerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SocketServerTest.java	28 Dec 2001 18:08:39 -0000	1.1
  +++ SocketServerTest.java	30 Dec 2001 01:12:04 -0000	1.2
  @@ -1,8 +1,8 @@
   
   /*
  - * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketServerTest.java,v
1.1 2001/12/28 18:08:39 hammant Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/12/28 18:08:39 $
  + * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/SocketServerTest.java,v
1.2 2001/12/30 01:12:04 hammant Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/12/30 01:12:04 $
    *
    * ====================================================================
    *
  @@ -73,7 +73,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class SocketServerTest {
   
  @@ -87,6 +87,8 @@
        *
        */
       public static void main(String[] args) throws Exception {
  +
  +        System.out.println("Stream over Socket Server");
   
           PlainSocketServer ds = new PlainSocketServer(1234);
           TestInterfaceImpl ti = new TestInterfaceImpl();
  
  
  
  1.3       +6 -4      jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/TestClient.java
  
  Index: TestClient.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/TestClient.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestClient.java	29 Dec 2001 01:35:22 -0000	1.2
  +++ TestClient.java	30 Dec 2001 01:12:04 -0000	1.3
  @@ -1,8 +1,8 @@
   
   /*
  - * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/TestClient.java,v
1.2 2001/12/29 01:35:22 hammant Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/12/29 01:35:22 $
  + * $Header: /home/cvs/jakarta-commons-sandbox/armi/src/java/org/apache/commons/armi/test/TestClient.java,v
1.3 2001/12/30 01:12:04 hammant Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/12/30 01:12:04 $
    *
    * ====================================================================
    *
  @@ -77,7 +77,7 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class TestClient {
   
  @@ -109,6 +109,8 @@
           }
   
           System.out.println("CLT: " + ti.hello4((float) 1.3, 2.1));
  +
  +        System.out.println("Two timings about to start, please stand by...");
   
           ti.testSpeed(); // to ignore for timing
           long start = System.currentTimeMillis();
  
  
  

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


Mime
View raw message