Hi,

Attached you can find a set of patches to 

1/ openejb.bat
2/ bin/launch_client.bat
3/ bin/launch_jndi.bat
4/ bin/launch_server.bat

These changes let the tests to be performed. Otherwise, the tests finished
mostly with ClassNotFoundExceptions.

In order to start up Tyrex I had to upgrade to Tyrex 1.0. See the patch to
launch_server.bat for more info.

-Jacek

Index: bin/launch_client.bat
===================================================================
RCS file: /cvsroot/openejb/openejb/bin/launch_client.bat,v
retrieving revision 1.6
diff -u -r1.6 launch_client.bat
--- bin/launch_client.bat       3 Aug 2002 15:57:32 -0000       1.6
+++ bin/launch_client.bat       4 Aug 2002 02:17:41 -0000
@@ -23,6 +23,8 @@
 set CP=%OPENEJB_HOME%\lib\log4j-1.2.1.jar;%CP%
 set CP=%OPENEJB_HOME%\lib\xercesImpl-2.0.2.jar;%CP%
 set CP=%OPENEJB_HOME%\lib\xmlParserAPIs-2.0.2.jar;%CP%
+set CP=%OPENEJB_HOME%\lib\openorb-1.2.1.jar;%CP%
+set CP=%OPENEJB_HOME%\lib\openorb_rmi-1.2.1.jar;%CP%
 
 set CP=%JAVA_HOME%\lib\tools.jar;%CP%
 
Index: bin/launch_server.bat
===================================================================
RCS file: /cvsroot/openejb/openejb/bin/launch_server.bat,v
retrieving revision 1.6
diff -u -r1.6 launch_server.bat
--- bin/launch_server.bat       3 Aug 2002 15:57:32 -0000       1.6
+++ bin/launch_server.bat       4 Aug 2002 02:18:39 -0000
@@ -20,6 +20,11 @@
 set CP=%OPENEJB_HOME%\lib\log4j-1.2.1.jar;%CP%
 set CP=%OPENEJB_HOME%\lib\xercesImpl-2.0.2.jar;%CP%
 set CP=%OPENEJB_HOME%\lib\xmlParserAPIs-2.0.2.jar;%CP%
+set CP=%OPENEJB_HOME%\lib\openorb-1.2.1.jar;%CP%
+set CP=%OPENEJB_HOME%\lib\openorb_rmi-1.2.1.jar;%CP%
+set CP=%OPENEJB_HOME%\lib\tyrex-1.0.jar;%CP%
+set CP=%OPENEJB_HOME%\lib\tyrex-0.9.8-iiop.jar;%CP%
+set CP=%OPENEJB_HOME%\lib\ots-jts_1.0.jar;%CP%
 
 set CP=%JAVA_HOME%\lib\tools.jar;%CP%
 
Index: bin/launch_jndi.bat
===================================================================
RCS file: /cvsroot/openejb/openejb/bin/launch_jndi.bat,v
retrieving revision 1.4
diff -u -r1.4 launch_jndi.bat
--- bin/launch_jndi.bat 3 Aug 2002 15:57:32 -0000       1.4
+++ bin/launch_jndi.bat 4 Aug 2002 02:18:48 -0000
@@ -20,6 +20,8 @@
 set CP=%OPENEJB_HOME%\lib\log4j-1.2.1.jar;%CP%
 set CP=%OPENEJB_HOME%\lib\xercesImpl-2.0.2.jar;%CP%
 set CP=%OPENEJB_HOME%\lib\xmlParserAPIs-2.0.2.jar;%CP%
+set CP=%OPENEJB_HOME%\lib\ots-jts_1.0.jar;%CP%
+set CP=%OPENEJB_HOME%\lib\openorb-1.2.1.jar;%CP%
 
 set CP=%JAVA_HOME%\lib\tools.jar;%CP%
 
Index: openejb.bat
===================================================================
RCS file: /cvsroot/openejb/openejb/openejb.bat,v
retrieving revision 1.8
diff -u -r1.8 openejb.bat
--- openejb.bat 18 Jul 2002 01:16:27 -0000      1.8
+++ openejb.bat 4 Aug 2002 02:16:59 -0000
@@ -103,7 +103,9 @@
    echo "_________________________________________________"
    echo " 1. Starting OpenEJB Server..."
    start "OpenEJB Server" .\bin\ejbserver.bat > ejb.server.log 2>&1
-   sleep 4
+   :WAIT_UNTIL_EJB_SERVER_START
+      netstat -an | find "4200" | find "LISTENING" > nul
+   if errorlevel 1 goto WAIT_UNTIL_EJB_SERVER_START
    echo " 2. Starting test EJB client..."
    call .\bin\ejbclient.bat
 REM   echo "_________________________________________________"
@@ -140,7 +142,9 @@
    echo "_________________________________________________"
    echo " 1. Starting OpenEJB Server..."
    start "OpenEJB Server" .\bin\ejbserver.bat > ejb.server.log 2>&1
-   sleep 4
+   :WAIT_UNTIL_EJB_SERVER_START
+      netstat -an | find "4200" | find "LISTENING" > nul
+   if errorlevel 1 goto WAIT_UNTIL_EJB_SERVER_START
    echo " 2. Starting test EJB client..."
    call .\bin\ejbclient.bat
 
@@ -154,10 +158,13 @@
    echo "_________________________________________________"
    echo " 1. Starting OpenORB JNDI Server..."
    start "OpenORB JNDI Server" .\bin\launch_jndi.bat -default > corba.jndi.log 2>&1
-   sleep 2
+   :WAIT_UNTIL_JNDI_SERVER_START
+      netstat -an | find "2001" | find "LISTENING" > nul
+   if errorlevel 1 goto WAIT_UNTIL_JNDI_SERVER_START
    echo " 2. Starting OpenEJB CORBA Server with OpenORB..."
    start "OpenEJB CORBA Server with OpenORB" .\bin\launch_server.bat > 
corba.server.log 2>&1
-   sleep 15
+   rem don't know what port the server is to be attached to, so wait differently
+   ping 127.0.0.1 -n 15 -w 1000 > nul
    echo " 3. Starting test client..."
    .\bin\launch_client.bat
 

Reply via email to